Skip to content

Update to new MAPL_GridCompAddSpec call #458

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
tclune merged 2 commits into from
Jun 9, 2026
Merged

Update to new MAPL_GridCompAddSpec call #458

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
a225ede
update to the new MAPL_GridCompAddSpec call
bena-nasa Jun 9, 2026
a4a49f0
update changelog
bena-nasa Jun 9, 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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
40 changes: 20 additions & 20 deletions ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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, &
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
Loading