Skip to content

Dev/aoloso/use moist gfdl mp #119

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.

Sign up for GitHub

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

Open
aoloso wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Dev/aoloso/use moist gfdl mp #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56fa2b5
Changes to eliminate duplicate gfdl_cloud_microphysics. Both moist an…
aoloso Jun 15, 2021
803ce5c
Merge branch 'develop' into dev/aoloso/use_moist_gfdlMP
mathomp4 Jun 16, 2021
d2a643d
Merge branch 'develop' into dev/aoloso/use_moist_gfdlMP
mathomp4 Jun 16, 2021
e420721
Add option to allow building with either Moist or FV microphysics
mathomp4 Jun 16, 2021
bd6f1d6
Merge branch 'develop' into dev/aoloso/use_moist_gfdlMP
mathomp4 Oct 29, 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
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ set (srcs
)

if (ESMA_USE_GFE_NAMESPACE)
set(dependencies MAPL GFTL_SHARED::gftl-shared GMAO_hermes GEOS_Shared)
set(dependencies MAPL GFTL_SHARED::gftl-shared GMAO_hermes GEOS_Shared
$<$<NOT:$<BOOL:${USE_GFDL_MP_FROM_FV}>>:GEOSmoist_GridComp>)
else ()
set(dependencies MAPL gftl-shared GMAO_hermes GEOS_Shared)
set(dependencies MAPL gftl-shared GMAO_hermes GEOS_Shared
$<$<NOT:$<BOOL:${USE_GFDL_MP_FROM_FV}>>:GEOSmoist_GridComp>)
endif ()

esma_add_library (${this}
Expand Down Expand Up @@ -49,6 +51,9 @@ elseif (FV_PRECISION MATCHES R4R8) # FV is R4 but FMS is R8
target_compile_definitions (${this} PRIVATE -DSINGLE_FV -DOVERLOAD_R4)
endif ()

if (USE_GFDL_MP_FROM_FV)
target_compile_definitions (${this} PRIVATE USE_GFDL_MP_FROM_FV)
endif ()

set (CMAKE_Fortran_FLAGS_RELEASE "${GEOS_Fortran_FLAGS_VECT}")

Expand Down
4 changes: 4 additions & 0 deletions FV_StateMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ module FV_StateMod
use fv_update_phys_mod, only: fv_update_phys
use sw_core_mod, only: d2a2c_vect
use fv_sg_mod, only: fv_subgrid_z
#ifdef USE_GFDL_MP_FROM_FV
use gfdl_cloud_microphys_mod, only: gfdl_cloud_microphys_init
#else
use gfdl2_cloud_microphys_mod, only: gfdl_cloud_microphys_init ! gfdl_cloud_microphys_mod as gfdl2_cloud_microphysics from moist
#endif

use fv_diagnostics_mod, only: prt_maxmin, prt_minmax

Expand Down