Skip to content

Updates to MG3 #1217

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
sdrabenh merged 2 commits into from
Apr 14, 2026
Merged

Updates to MG3 #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37878b7
Updates to MG3
dbarahon Mar 6, 2026
4caf90e
Set fail-fast false
mathomp4 Mar 6, 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
1 change: 1 addition & 0 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ concurrency:
jobs:
build_gcm:
strategy:
fail-fast: false
matrix:
compiler: [ifort, gfortran-14, gfortran-15]
build-type: [Debug]
Expand Down
2 changes: 1 addition & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddConnectivity ( GC, &
SHORT_NAME = (/'ALH'/), &
SHORT_NAME = (/'ALH', 'KM', 'RI'/), &
DST_ID = MOIST, &
SRC_ID = TURBL, &
RC=STATUS )
Expand Down
4 changes: 2 additions & 2 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 @@ -13,7 +13,7 @@ set (srcs
GEOS_GF_InterfaceMod.F90 ConvPar_GF_GEOS5.F90 ConvPar_GF2020.F90 ConvPar_GF_Shared.F90 module_gate.F90
GEOS_UW_InterfaceMod.F90 uwshcu.F90
aer_actv_single_moment.F90
GEOS_MoistGridComp.F90
GEOS_MoistGridComp.F90 Wnet.F90
# files that are sometimes present?
# ras00.F90 cloud.F90
)
Expand Down Expand Up @@ -65,7 +65,7 @@ endif ()

esma_add_library (${this}
SRCS ${srcs}
DEPENDENCIES GEOS_Shared GMAO_mpeu MAPL Chem_Shared Chem_Base ESMF::ESMF)
DEPENDENCIES GEOS_Shared GMAO_mpeu MAPL Chem_Shared Chem_Base ESMF::ESMF BLAS::BLAS LAPACK::LAPACK)

get_target_property (extra_incs FMS::fms_r4 INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(${this} PRIVATE
Expand Down
692 changes: 479 additions & 213 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MGB2_2M_InterfaceMod.F90
View file
Open in desktop

Large diffs are not rendered by default.

212 changes: 139 additions & 73 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module GEOS_MoistGridCompMod
real :: CCN_OCN
real :: CCN_LND
logical :: MOVE_CN_TO_LS
logical :: USE_NCLOUD_CLIM

! !PUBLIC MEMBER FUNCTIONS:

Expand Down Expand Up @@ -108,6 +109,8 @@ subroutine SetServices ( GC, RC )
logical :: LSHALLOW
logical :: LCLDMICR

integer ::PDFSHAPE, WSUB_OPTION

!=============================================================================

! Begin...
Expand Down Expand Up @@ -174,9 +177,19 @@ subroutine SetServices ( GC, RC )
adjustl(CLDMICR_OPTION)=="MGB2_2M"
_ASSERT( LCLDMICR, 'Unsupported Cloud Microphysics Option' )

call MAPL_GetResource( CF, DEBUG_MST, Label="DEBUG_MST:", default=.false., RC=STATUS) ; VERIFY_(STATUS)

call MAPL_GetResource( CF, DEBUG_TQ_ERRORS, Label="DEBUG_TQ_ERRORS:", default=.false., RC=STATUS) ; VERIFY_(STATUS)
call MAPL_GetResource( CF, PDFSHAPE, Label="PDFSHAPE:", default=1, RC=STATUS) ; VERIFY_(STATUS)

call MAPL_GetResource( CF, DEBUG_MST, Label="DEBUG_MST:", default=.false., RC=STATUS) ; VERIFY_(STATUS)


!***********Aerosol-Cloud related

call ESMF_ConfigGetAttribute( CF, USE_NCLOUD_CLIM, Label='USE_NCLOUD_CLIM:', default=.FALSE., RC=STATUS)
VERIFY_(STATUS)
call ESMF_ConfigGetAttribute( CF, WSUB_OPTION, Label='WSUB_OPTION:', default= 1, RC=STATUS) !0- param 1- Use Wsub climatology 2-USE WNET`
VERIFY_(STATUS)


! NOTE: Binary restarts expect Q to be the first field in the moist_internal_rst. Thus,
! the first MAPL_AddInternalSpec call must be from the microphysics
Expand Down Expand Up @@ -508,23 +521,7 @@ subroutine SetServices ( GC, RC )
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'TAUOROX', &
LONG_NAME = 'surface_eastward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'TAUOROY', &
LONG_NAME = 'surface_northward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)



call MAPL_AddImportSpec ( gc, &
Expand All @@ -536,15 +533,11 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC, &
LONG_NAME = 'Blackadar_length_scale_for_scalars', &
UNITS = 'm', &
SHORT_NAME = 'ALH', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationEdge, &
RC=STATUS )
VERIFY_(STATUS)





call MAPL_AddImportSpec ( GC, &
SHORT_NAME = 'AREA', &
LONG_NAME = 'agrid_cell_area', &
Expand All @@ -555,14 +548,96 @@ subroutine SetServices ( GC, RC )
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec ( GC, &
SHORT_NAME = 'WSUB_CLIM', &
LONG_NAME = 'stdev in vertical velocity', &
UNITS = 'm s-1', &
RESTART = MAPL_RestartSkip, & ! Read WSUB from a climatology
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

if ((adjustl(CLDMICR_OPTION)=="MGB2_2M")) then ! subgrid scale vertical velocity options

if (WSUB_OPTION .eq. 0) then

call MAPL_AddImportSpec(GC, &
LONG_NAME = 'Blackadar_length_scale_for_scalars', &
UNITS = 'm', &
SHORT_NAME = 'ALH', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationEdge, &
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'TAUOROX', &
LONG_NAME = 'surface_eastward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'TAUOROY', &
LONG_NAME = 'surface_northward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)



elseif (WSUB_OPTION .eq. 1) then

call MAPL_AddImportSpec ( GC, &
SHORT_NAME = 'WSUB_CLIM', &
LONG_NAME = 'stdev in vertical velocity', &
UNITS = 'm s-1', &
RESTART = MAPL_RestartSkip, & ! Read WSUB from a climatology
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

else

call MAPL_AddImportSpec ( GC, &
LONG_NAME = 'total_momentum_diffusivity', &
UNITS = 'm+2 s-1', &
SHORT_NAME = 'KM', &
DIMS = MAPL_DimsHorzVert, &
RESTART = MAPL_RestartSkip, &
VLOCATION = MAPL_VLocationEdge, &
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec ( GC, &
LONG_NAME = 'Richardson_number_from_Louis', &
UNITS = '1', &
SHORT_NAME = 'RI', &
DIMS = MAPL_DimsHorzVert, &
RESTART = MAPL_RestartSkip, &
VLOCATION = MAPL_VLocationEdge, &
RC=STATUS )
VERIFY_(STATUS)

end if
end if

IF (USE_NCLOUD_CLIM) then
call MAPL_AddImportSpec ( GC, &
SHORT_NAME = 'NCPL_CLIM', &
LONG_NAME = 'In-Cloud NCPL climatology', &
UNITS = 'm-3', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec ( GC, &
SHORT_NAME = 'NCPI_CLIM', &
LONG_NAME = 'In-Cloud NCPI climatology', &
UNITS = 'm-3', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
end if


call MAPL_AddImportSpec ( gc, &
SHORT_NAME = 'DTDTDYN', &
Expand Down Expand Up @@ -4004,8 +4079,8 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME='CCN04', &
LONG_NAME ='CCN conc at 0.4 % supersaturation (grid_avg)', &
SHORT_NAME='CCN02', &
LONG_NAME ='CCN conc at 0.2 % supersaturation (grid_avg)', &
UNITS ='m-3', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
Expand Down Expand Up @@ -5507,10 +5582,7 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )

call MAPL_GetResource( MAPL, USE_AEROSOL_NN , 'USE_AEROSOL_NN:' , DEFAULT=.TRUE. , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetResource( MAPL, USE_BERGERON , 'USE_BERGERON:' , DEFAULT=USE_AEROSOL_NN, RC=STATUS); VERIFY_(STATUS)
if (USE_AEROSOL_NN) then
call aer_cloud_init()
call WRITE_PARALLEL ("INITIALIZED aer_cloud_init")
endif

! MAT These have to be defined as they are passed into Aer_Activate below and are intent(in)
! Note: It's possible these aren't *used* if USE_AEROSOL_NN=.TRUE. but they are still passed
! in so they have to be defined
Expand Down Expand Up @@ -5592,6 +5664,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
real, pointer, dimension(:,:) :: FRLAND, FRLANDICE, FRACI, SNOMAS
real, pointer, dimension(:,:) :: SH, TS, EVAP, KPBL
real, pointer, dimension(:,:,:) :: KH, TKE, OMEGA
real, pointer, dimension(:,:,:) :: NCPL_CLIM, NCPI_CLIM
integer :: n_modes
type(ESMF_State) :: AERO
type(ESMF_FieldBundle) :: TR
Expand Down Expand Up @@ -5686,6 +5759,11 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_GetPointer(IMPORT, FRACI, 'FRACI' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SNOMAS, 'SNOMAS' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, SRF_TYPE, 'SRF_TYPE' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)

if (USE_NCLOUD_CLIM) then
call MAPL_GetPointer(IMPORT, NCPL_CLIM, 'NCPL_CLIM' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, NCPI_CLIM, 'NCPI_CLIM' , RC=STATUS); VERIFY_(STATUS)
end if

where ( (FRLANDICE > 0.5) .OR. (FRACI > 0.5) )
SRF_TYPE = 3.0 ! Ice
Expand Down Expand Up @@ -5869,7 +5947,9 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )

! Get aerosol activation properties
call MAPL_TimerOn (MAPL,"---AERO_ACTIVATE")
if (USE_AEROSOL_NN) then


if ((USE_AEROSOL_NN) .and. not (USE_NCLOUD_CLIM)) then
! get veritical velocity
if (all(W == 0.0)) then
TMP3D = -OMEGA/(MAPL_GRAV*PLmb*100.0/(MAPL_RGAS*T))
Expand All @@ -5885,35 +5965,25 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
! call MAPL_MaxMin('MST: NACTL ', NACTL*1.e-6)
! call MAPL_MaxMin('MST: NACTI ', NACTI*1.e-6)
! Temporary
if (adjustl(CLDMICR_OPTION)=="MGB2_2M") then
call MAPL_TimerOn (MAPL,"----AERO_ACTIVATE_MGB2_2M")
call ESMF_AttributeGet(AERO, name='number_of_aerosol_modes', value=n_modes, RC=STATUS); VERIFY_(STATUS)
allocate ( AeroProps(IM,JM,LM) )
do L=1,LM
do J=1,JM
do I=1,IM
AeroProps(I,J,L)%nmods = n_modes
do n=1,n_modes
AeroProps(I,J,L)%num(n) = AeroPropsNew(n)%num(I,J,L)
AeroProps(I,J,L)%dpg(n) = AeroPropsNew(n)%dpg(I,J,L)
AeroProps(I,J,L)%sig(n) = AeroPropsNew(n)%sig(I,J,L)
AeroProps(I,J,L)%den(n) = AeroPropsNew(n)%den(I,J,L)
AeroProps(I,J,L)%kap(n) = AeroPropsNew(n)%kap(I,J,L)
AeroProps(I,J,L)%fdust(n) = AeroPropsNew(n)%fdust(I,J,L)
AeroProps(I,J,L)%fsoot(n) = AeroPropsNew(n)%fsoot(I,J,L)
AeroProps(I,J,L)%forg(n) = AeroPropsNew(n)%forg(I,J,L)
enddo
enddo
enddo
enddo
call MAPL_TimerOff (MAPL,"----AERO_ACTIVATE_MGB2_2M")
endif

else
do L=1,LM
NACTL(:,:,L) = (CCN_LND*FRLAND + CCN_OCN*(1.0-FRLAND))*1.e6 ! #/m^3
NACTI(:,:,L) = (CCN_LND*FRLAND + CCN_OCN*(1.0-FRLAND))*1.e6 ! #/m^3
end do


if (USE_NCLOUD_CLIM) then !Setup ND/NI climatology from GiOcean

NACTL = NCPL_CLIM
NACTI = NCPI_CLIM
else
do L=1,LM
NACTL(:,:,L) = (CCN_LND*FRLAND + CCN_OCN*(1.0-FRLAND))*1.e6 ! #/m^3
NACTI(:,:,L) = (CCN_LND*FRLAND + CCN_OCN*(1.0-FRLAND))*1.e6 ! #/m^3
end do

end if
endif



call MAPL_GetPointer(EXPORT, PTR3D, 'NCCN_LIQ', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = NACTL*1.e-6
call MAPL_GetPointer(EXPORT, PTR3D, 'NCCN_ICE', RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -6079,10 +6149,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
DTDT_ER = (T - DTDT_ER)/DT_MOIST
DQVDT_ER = (Q - DQVDT_ER)/DT_MOIST

if (USE_AEROSOL_NN .and. adjustl(CLDMICR_OPTION)=="MGB2_2M") then
deallocate ( AeroProps )
endif

! Export Total Moist Tendencies

call MAPL_GetPointer(EXPORT, DUDT, 'DUDT', RC=STATUS); VERIFY_(STATUS)
Expand Down
Loading
Loading