From a225eded47c6debc0df860b067f7a7bf9ec6fb67 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Tue, 9 Jun 2026 14:38:19 -0400 Subject: [PATCH 1/2] update to the new MAPL_GridCompAddSpec call --- .../DU2G_GridComp/DU2G_GridCompMod.F90 | 4 +- .../GOCART2G_GridCompMod.F90 | 12 +++--- .../SS2G_GridComp/SS2G_GridCompMod.F90 | 40 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 index dd023566..7de8c438 100644 --- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 @@ -295,7 +295,7 @@ subroutine SetServices(gc, rc) standard_name="aerosols_from_"//trim(comp_name), & units="kg kg-1", & dims="xyz", & - vstagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & itemtype=MAPL_STATEITEM_STATE, _RC) ! This bundle is needed by surface for snow albedo modification @@ -306,7 +306,7 @@ subroutine SetServices(gc, rc) short_name=trim(comp_name)//"_AERO_DP", & standard_name="aerosol_deposition_from_"//trim(comp_name), & dims="xy", & - vstagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=VERTICAL_STAGGER_NONE, & units="kg m-2 s-1", & itemtype=MAPL_STATEITEM_FIELDBUNDLE, _RC) diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 index 52841616..accc67ac 100644 --- a/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 @@ -153,7 +153,7 @@ subroutine SetServices(gc, rc) short_name=child%name//"_AERO", & standard_name="aerosol_mass_mixing_ratios_ng", & dims="xyz", & - vstagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & units="kg kg-1", & itemtype=MAPL_STATEITEM_STATE, & _RC) @@ -166,7 +166,7 @@ subroutine SetServices(gc, rc) short_name=child%name//"_AERO", & standard_name="aerosol_mass_mixing_ratios_ng", & dims="xyz", & - vstagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & units="kg kg-1", & itemtype=MAPL_STATEITEM_STATE, & _RC) @@ -177,7 +177,7 @@ subroutine SetServices(gc, rc) short_name="AERO", & standard_name="aerosol_mass_mixing_ratios_ng", & dims="xyz", & - vstagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & units="kg kg-1", & itemtype=MAPL_STATEITEM_STATE, & _RC) @@ -193,7 +193,7 @@ subroutine SetServices(gc, rc) short_name=child%name//"_AERO_DP", & standard_name="aerosol_deposition_ng", & dims="xy", & - vstagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=VERTICAL_STAGGER_NONE, & units="kg m-2 s-1", & itemtype=MAPL_STATEITEM_FIELDBUNDLE, & _RC) @@ -206,7 +206,7 @@ subroutine SetServices(gc, rc) short_name=child%name//"_AERO_DP", & standard_name="aerosol_deposition_ng", & dims="xy", & - vstagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=VERTICAL_STAGGER_NONE, & units="kg m-2 s-1", & itemtype=MAPL_STATEITEM_FIELDBUNDLE, & _RC) @@ -217,7 +217,7 @@ subroutine SetServices(gc, rc) short_name="AERO_DP", & standard_name="aerosol_deposition_ng", & dims="xy", & - vstagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=VERTICAL_STAGGER_NONE, & units="kg m-2 s-1", & itemtype=MAPL_STATEITEM_FIELDBUNDLE, & _RC) diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 index 5d0f8e27..ba9cb784 100644 --- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 @@ -154,9 +154,9 @@ subroutine SetServices(gc, rc) standard_name='Sea Salt Mixing Ratio all bins', & units='kg kg-1', & dims='xyz', & - vstagger=VERTICAL_STAGGER_CENTER, & - ! restart=MAPL_RestartOptional, & - ungridded_dims=[ungrd_nbins], & + vertical_stagger=VERTICAL_STAGGER_CENTER, & + ! restart_mode=MAPL_RestartOptional, & + ungridded_dim_array=[ungrd_nbins], & ! friendlyto='DYNAMICS:TURBULENCE:MOIST', & add_to_export=.true., _RC) @@ -165,7 +165,7 @@ subroutine SetServices(gc, rc) short_name='DEEP_LAKES_MASK', & units='1', & dims='xy', & - vstagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=VERTICAL_STAGGER_NONE, & add_to_export=.false., & standard_name='Deep Lakes Mask', & _RC) @@ -177,8 +177,8 @@ subroutine SetServices(gc, rc) STANDARD_NAME='air_pressure', & UNITS='Pa', & DIMS='xyz', & - vstagger=VERTICAL_STAGGER_EDGE, & - RESTART=MAPL_RESTART_SKIP, & + vertical_stagger=VERTICAL_STAGGER_EDGE, & + restart_mode=MAPL_RESTART_SKIP, & _RC) ! RH: is between 0 and 1 @@ -188,8 +188,8 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Rel_Hum_after_moist', & UNITS='1', & DIMS = 'xyz', & - VSTAGGER=VERTICAL_STAGGER_CENTER, & - RESTART=MAPL_RESTART_SKIP, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & + restart_mode=MAPL_RESTART_SKIP, & _RC) do i = 1, self%nbins @@ -199,9 +199,9 @@ subroutine SetServices(gc, rc) SHORT_NAME='climss'//trim(field_name), & STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & - RESTART=MAPL_RESTART_SKIP, & + restart_mode=MAPL_RESTART_SKIP, & DIMS='xyz', & - VSTAGGER=VERTICAL_STAGGER_CENTER, _RC) + vertical_stagger=VERTICAL_STAGGER_CENTER, _RC) ! dry deposition call MAPL_GridCompAddSpec(gc, & @@ -210,8 +210,8 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - VSTAGGER=VERTICAL_STAGGER_CENTER, & - RESTART=MAPL_RESTART_SKIP, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & + restart_mode=MAPL_RESTART_SKIP, & _RC) ! wet deposition @@ -221,8 +221,8 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt wet removal (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - VSTAGGER=VERTICAL_STAGGER_CENTER, & - RESTART=MAPL_RESTART_SKIP, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & + restart_mode=MAPL_RESTART_SKIP, & _RC) ! gravitational settling @@ -232,8 +232,8 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - VSTAGGER=VERTICAL_STAGGER_CENTER, & - RESTART=MAPL_RESTART_SKIP, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & + restart_mode=MAPL_RESTART_SKIP, & _RC) ! convective scavenging @@ -243,8 +243,8 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - VSTAGGER=VERTICAL_STAGGER_CENTER, & - RESTART=MAPL_RESTART_SKIP, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & + restart_mode=MAPL_RESTART_SKIP, & _RC) end do end if ! (data_driven) @@ -263,7 +263,7 @@ subroutine SetServices(gc, rc) SHORT_NAME=trim(comp_name)//"_AERO", & STANDARD_NAME="aerosols_from_"//trim(comp_name), & DIMS="xyz", & - VSTAGGER=VERTICAL_STAGGER_CENTER, & + vertical_stagger=VERTICAL_STAGGER_CENTER, & UNITS="kg kg-1", & ITEMTYPE=MAPL_STATEITEM_STATE, & _RC) @@ -276,7 +276,7 @@ subroutine SetServices(gc, rc) SHORT_NAME=trim(comp_name)//"_AERO_DP", & STANDARD_NAME="aerosol_deposition_from_"//trim(comp_name), & DIMS="xy", & - VSTAGGER=VERTICAL_STAGGER_NONE, & + vertical_stagger=VERTICAL_STAGGER_NONE, & UNITS="kg m-2 s-1", & ITEMTYPE=MAPL_STATEITEM_FIELDBUNDLE, & _RC) From a4a49f064d962e312c5482b83066c9d5c7808d06 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Tue, 9 Jun 2026 14:58:31 -0400 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88f469fa..72cea258 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Changed +- Updated MAPL\_GridCompAddSpec calls to new interface - Pushed rename of MAPL entities down into MAPL. - Remove direct `MAPL.generic3g` CMake link dependency from GA_Environment, SS2G_GridComp, and DU2G_GridComp (closes #451). The target has been renamed