Skip to content

Remove FMS dependence in Moist #13

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

Merged
FlorianDeconinck merged 5 commits into from
Apr 22, 2026
Merged

Remove FMS dependence in Moist #13

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
60502c6
v11: Remove FMS dependence in Moist
mathomp4 Mar 26, 2026
b01a500
Fix call to gfdl
mathomp4 Mar 26, 2026
30ad8f2
Merge branch 'develop' into feature/remove-fms-moist
mathomp4 Apr 16, 2026
fc7fe39
Merge branch 'feature/remove-fms-moist' into dsl/feature/moist/UW_and…
mathomp4 Apr 22, 2026
6441d23
One last fms
mathomp4 Apr 22, 2026
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
13 changes: 1 addition & 12 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,7 @@ endif ()

esma_add_library (${this}
SRCS ${srcs}
DEPENDENCIES GEOS_Shared GMAO_mpeu MAPL fms_r4 Chem_Shared Chem_Base ESMF::ESMF TYPE SHARED)

# We need to add_dependencies for fms_r4 because CMake doesn't know we
# need it for include purposes. In R4R8, we only ever link against
# fms_r8, so it doesn't know to build the target fms_r4
# NOTE NOTE NOTE: This should *not* be included in GEOSgcm v12
# because FMS is pre-built library in that case.
add_dependencies (${this} fms_r4)
get_target_property (extra_incs fms_r4 INCLUDE_DIRECTORIES)
target_include_directories(${this} PRIVATE
$<BUILD_INTERFACE:${extra_incs}>
)
DEPENDENCIES GEOS_Shared GMAO_mpeu MAPL Chem_Shared Chem_Base ESMF::ESMF TYPE SHARED)

file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
foreach ( file ${rc_files} )
Expand Down
12 changes: 3 additions & 9 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GFDL_1M_InterfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,7 @@ subroutine GFDL_1M_Initialize (MAPL, CF, IMPORT, EXPORT, RC)

real, pointer, dimension(:,:,:) :: Q, QLLS, QLCN, QILS, QICN, QRAIN, QSNOW, QGRAUPEL

type(ESMF_VM) :: VM
integer :: comm

call MAPL_GetResource( MAPL, LHYDROSTATIC, Label='HYDROSTATIC:', default=.TRUE., RC=STATUS)
call MAPL_GetResource( MAPL, LHYDROSTATIC, Label="HYDROSTATIC:", default=.TRUE., RC=STATUS)
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, LPHYS_HYDROSTATIC, Label='PHYS_HYDROSTATIC:', default=.TRUE., RC=STATUS)
VERIFY_(STATUS)
Expand Down Expand Up @@ -256,10 +253,7 @@ subroutine GFDL_1M_Initialize (MAPL, CF, IMPORT, EXPORT, RC)
call MAPL_GetPointer(INTERNAL, QILS, 'QILS' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(INTERNAL, QICN, 'QICN' , RC=STATUS); VERIFY_(STATUS)

call ESMF_VMGetCurrent(VM, _RC)
call ESMF_VMGet(VM, mpiCommunicator=comm, _RC)

call gfdl_cloud_microphys_init(comm)
call gfdl_cloud_microphys_init()
call WRITE_PARALLEL ("INITIALIZED GFDL_1M microphysics in non-generic GC INIT")

call MAPL_GetResource(MAPL, USE_PYMOIST_GFDL1M, 'USE_PYMOIST_GFDL1M:', default=.FALSE., RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -587,7 +581,7 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
QRAIN = QRAIN + PTR3D*DT_MOIST
endif
call MAPL_GetPointer(EXPORT, PTR3D, 'SHLW_SNO3', ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) then
if (associated(PTR3D)) then
QSNOW = QSNOW + PTR3D*DT_MOIST
endif
! evap/subl/pdf
Expand Down
Loading
Loading