Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NOAA UFS integration #24

Merged
merged 39 commits into from
Mar 4, 2021
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
f9cc26e
Remove dependency from GEOS_Shared.
rmontuoro Oct 8, 2020
ec617aa
Enable standalone build and install based on
rmontuoro Oct 8, 2020
e64858e
Add template file for UFS GOCART component.
rmontuoro Oct 8, 2020
ab8e8f6
Use proper name for CMake variable.
rmontuoro Oct 9, 2020
1c4f5d8
Ensure GOCART is built wih 32-bit REALs.
rmontuoro Oct 9, 2020
86d55e1
Remove unnecessary dependency.
rmontuoro Oct 9, 2020
c313483
Combined update featuring:
rmontuoro Oct 19, 2020
4eddcbc
Remove exported test field by aerosol gridded component.
rmontuoro Oct 19, 2020
4adfef4
Added initial pass at setting NUM_BANDS for UFS SS configuration
WilliamJamieson Oct 21, 2020
d9b860c
Use proper variable to check return code.
rmontuoro Nov 10, 2020
c506fd4
Update diagnostic output and replace undeclared variable.
rmontuoro Nov 10, 2020
a8d2559
Continue to connect available imported meteorological
rmontuoro Nov 10, 2020
0c9a48f
Update MAPL APIs to set grid and clock to NUOPC-provided objects.
rmontuoro Nov 17, 2020
f61984a
Remove unneded dependency on the FLAP package.
rmontuoro Nov 17, 2020
923c964
Check for proper field status and use more generic MAPL
rmontuoro Nov 20, 2020
5d04005
Improve MAPL field diagnostic.
rmontuoro Nov 21, 2020
780c0ca
Export sea salt diagnostic quantities.
rmontuoro Nov 21, 2020
11d3730
Improve mapping of imported 3D fields to GOCART internal
rmontuoro Jan 14, 2021
3ec5849
Import instantaneous 3D non-convective liquid and
rmontuoro Jan 14, 2021
d1d18c9
Use updated MAPL Cap set_grid() API available
rmontuoro Jan 15, 2021
58e78f9
Import instantaneous 3D cloud fraction.
rmontuoro Jan 31, 2021
99360c2
Merge branch 'feature/esherman/gocart2g_develop_MAPLconst' into featu…
rmontuoro Feb 2, 2021
b0454b8
Complete merge by adding missing CMakeLists.txt section.
rmontuoro Feb 3, 2021
c294f90
Connect advected tracer for GOCART CA (both oc and bc)
rmontuoro Feb 3, 2021
b3665b4
Use proper gas constant for dry air to compute air density.
rmontuoro Feb 4, 2021
5151fd9
Properly map imported instantaneous 3D non-convective
rmontuoro Feb 12, 2021
8f34104
Map imported lake fraction to GOCART variable.
rmontuoro Feb 12, 2021
21cfabc
Increase field map size.
rmontuoro Feb 12, 2021
4e8157c
Add missing MAPL dependency.
rmontuoro Feb 25, 2021
065b579
Update MAPL APIs according to current MAPL development
rmontuoro Feb 25, 2021
6630648
Merge branch 'develop' into feature/ufs_develop
rmontuoro Feb 26, 2021
b0e563f
Convert to Unix file format and remove trailing whitespaces.
rmontuoro Feb 26, 2021
1a17d0f
Move comment in GOCART2G GridComp resource file
rmontuoro Feb 28, 2021
f0c0ac6
Merge branch 'develop' into feature/rmontuoro/ufs-integration
rmontuoro Mar 1, 2021
f8c2208
Remove Apps.
rmontuoro Mar 2, 2021
195f02c
Remove AeroCinderella gridded component.
rmontuoro Mar 2, 2021
d06f07d
Build as 32-bit only within the UFS weather model.
rmontuoro Mar 2, 2021
a9c1314
Look for individual dependencies only if Baselibs is not found.
rmontuoro Mar 3, 2021
5f69e7c
Look for MAPL package only if building within the UFS.
rmontuoro Mar 3, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,54 @@ if (NOT CMAKE_BUILD_TYPE)
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif ()

# Set build options
option (BUILD_UFS "Build GOCART component for UFS" OFF)

set (DOING_GEOS5 YES)

# Should find a better place for this - used in Chem component
set (ACG_FLAGS -v)
set (FV_PRECISION R4R8)

if (BUILD_UFS)
# Ensure we build as 32-bit
message ("Force 32-bit build for GOCART")
if (CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
string (REPLACE "-real-size 64" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
elseif (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
string (REPLACE "-fdefault-real-8" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
endif()
endif()

if (NOT COMMAND esma)
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake@")
include (esma)
endif()

ecbuild_declare_project()

# Find dependencies
if (NOT NetCDF_Fortran_FOUND)
find_package (NetCDF REQUIRED Fortran)
WilliamJamieson marked this conversation as resolved.
Show resolved Hide resolved
endif ()
add_definitions(-DHAS_NETCDF3)

if (NOT ESMF_FOUND)
find_package (ESMF REQUIRED)
endif ()

find_package (GFTL REQUIRED)
find_package (GFTL_SHARED REQUIRED)
find_package (PFLOGGER REQUIRED)
find_package (YAFYAML REQUIRED)

if (IS_DIRECTORY "${PROJECT_SOURCE_DIR}/ESMF/Shared/MAPL@")
message (STATUS "Using local MAPL source tree: ${PROJECT_SOURCE_DIR}/ESMF/Shared/MAPL@")
else ()
WilliamJamieson marked this conversation as resolved.
Show resolved Hide resolved
find_package (MAPL REQUIRED)
include(mapl_acg)
endif ()

# This is a KLUDGE to emulate paths used in GEOSgcm so that GOCART Legacy code generation works
file (MAKE_DIRECTORY ${esma_include}/GEOSchem_GridComp)

Expand Down

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions ESMF/Aerosol_GridComp/AeroCinderella_GridComp/CMakeLists.txt

This file was deleted.

This file was deleted.

This file was deleted.

Loading