From 175d87d2ad4dad9f80d984dd0e3dbc5afdc9cfc6 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Fri, 12 Jun 2026 10:00:30 -0400 Subject: [PATCH] MAPL 3 renames --- CHANGELOG.md | 1 + .../DU2G_GridComp/DU2G_GridCompMod.F90 | 22 ++++++------ .../GOCART2G_GridCompMod.F90 | 22 ++++++------ .../SS2G_GridComp/SS2G_GridCompMod.F90 | 36 +++++++++---------- ESMF/Shared/Chem_AeroGeneric.F90 | 11 +++--- 5 files changed, 47 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79ef42f6..f5cad5e2 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 +- MAPL3 renames - Updated MAPL\_GridCompAddCHild to new interface that just takes a procedure - Updated MAPL\_GridCompAddSpec calls to new interface - Pushed rename of MAPL entities down into MAPL. diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 index 7de8c438..5aad426c 100644 --- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 @@ -15,9 +15,9 @@ module DU2G_GridCompMod MAPL_GridCompGetInternalState, MAPL_GridCompSetEntryPoint, MAPL_GridCompAddSpec, & MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, MAPL_ClockGet, & MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState, & - VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, & - MAPL_RESTART_SKIP, MAPL_StateGetPointer, MAPL_GeomGetHorzIJIndex, UngriddedDim, & - StrTemplate + MAPL_VERTICAL_STAGGER_NONE, MAPL_VERTICAL_STAGGER_CENTER, MAPL_VERTICAL_STAGGER_EDGE, & + MAPL_RESTART_SKIP, MAPL_StateGetPointer, MAPL_GeomGetHorzIJIndex, mapl_UngriddedDim, & + mapl_StrTemplate use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_GRAV, MAPL_KARMAN, MAPL_RADIANS_TO_DEGREES use MAPL, only: MAPL_PackedDateCreate, & MAPL_PackedTimeCreate @@ -111,8 +111,8 @@ subroutine SetServices(gc, rc) real :: DEFVAL logical :: data_driven = .true. integer :: num_threads - type(UngriddedDim) :: ungrd_nbins - type(UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint + type(mapl_UngriddedDim) :: ungrd_nbins + type(mapl_UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint integer :: status call MAPL_GridCompGet(gc, name=comp_name, _RC) @@ -130,12 +130,12 @@ subroutine SetServices(gc, rc) call self%GA_Environment%load_from_config(gc, _RC) ! Defined UngriddedDim items - ungrd_nbins = UngriddedDim(self%nbins, name="nbins", units="1") - ungrd_wavelengths_profile = UngriddedDim( & + ungrd_nbins = mapl_UngriddedDim(self%nbins, name="nbins", units="1") + ungrd_wavelengths_profile = mapl_UngriddedDim( & size(self%wavelengths_profile), & name="wavelengths_profile", & units="nm") - ungrd_wavelengths_vertint = UngriddedDim( & + ungrd_wavelengths_vertint = mapl_UngriddedDim( & size(self%wavelengths_vertint), & name="wavelengths_vertint", & units="nm") @@ -295,7 +295,7 @@ subroutine SetServices(gc, rc) standard_name="aerosols_from_"//trim(comp_name), & units="kg kg-1", & dims="xyz", & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_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", & - vertical_stagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, & units="kg m-2 s-1", & itemtype=MAPL_STATEITEM_FIELDBUNDLE, _RC) @@ -705,7 +705,7 @@ subroutine Run1(gc, import, export, clock, RC) if (self%doing_point_emissions) then if (workspace%day_save /= idd) then workspace%day_save = idd - call StrTemplate( & + call mapl_StrTemplate( & fname, self%point_emissions_srcfilen, xid='unknown', & nymd=nymd, nhms=120000 ) inquire(file=fname, exist=file_exists) diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 index 76860c3e..c5bc7e62 100644 --- a/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90 @@ -13,8 +13,8 @@ module GOCART2G_GridCompMod use MAPL, only: MAPL_GridCompAddConnection, MAPL_GridCompGetResource, MAPL_GridCompReexport use MAPL, only: MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE use MAPL, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState - use MAPL, only: MAPL_RESTART_SKIP, VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE - use MAPL, only: MAPL_FieldBundleAdd, MAPL_FieldBundleGet, MAPL_StateGetPointer, MAPL_GridGet, UngriddedDim + use MAPL, only: MAPL_RESTART_SKIP, MAPL_VERTICAL_STAGGER_NONE, MAPL_VERTICAL_STAGGER_CENTER, MAPL_VERTICAL_STAGGER_EDGE + use MAPL, only: MAPL_FieldBundleAdd, MAPL_FieldBundleGet, MAPL_StateGetPointer, MAPL_GridGet, mapl_UngriddedDim use MAPL_Constants, only: MAPL_GRAV, MAPL_PI use Chem_AeroGeneric @@ -96,7 +96,7 @@ subroutine SetServices(gc, rc) ! logical :: use_threads type(Instance), allocatable :: child character(len=:), allocatable :: child_items - type(UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint + type(mapl_UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint integer :: iter, status ! Wrap gridcomp's private state and store in gc @@ -117,11 +117,11 @@ subroutine SetServices(gc, rc) ! call MAPL_GridCompGetResource(gc, "use_threads", use_threads, default=.false., _RC) ! Defined UngriddedDim items - ungrd_wavelengths_profile = UngriddedDim( & + ungrd_wavelengths_profile = mapl_UngriddedDim( & size(self%wavelengths_profile), & name="wavelengths_profile", & units="nm") - ungrd_wavelengths_vertint = UngriddedDim( & + ungrd_wavelengths_vertint = mapl_UngriddedDim( & size(self%wavelengths_vertint), & name="wavelengths_vertint", & units="nm") @@ -153,7 +153,7 @@ subroutine SetServices(gc, rc) short_name=child%name//"_AERO", & standard_name="aerosol_mass_mixing_ratios_ng", & dims="xyz", & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_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", & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_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", & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_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", & - vertical_stagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=MAPL_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", & - vertical_stagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=MAPL_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", & - vertical_stagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=MAPL_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 ba9cb784..25e46c6c 100644 --- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90 @@ -16,8 +16,8 @@ module SS2G_GridCompMod MAPL_GridCompGetResource, MAPL_GridCompGetInternalState, & MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, MAPL_ClockGet, & MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState, & - VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, & - MAPL_RESTART_SKIP, MAPL_StateGetPointer, UngriddedDim + MAPL_VERTICAL_STAGGER_NONE, MAPL_VERTICAL_STAGGER_CENTER, MAPL_VERTICAL_STAGGER_EDGE, & + MAPL_RESTART_SKIP, MAPL_StateGetPointer, mapl_UngriddedDim use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES, MAPL_PI, MAPL_GRAV, MAPL_KARMAN use GOCART2G_MieMod use Chem_AeroGeneric @@ -92,8 +92,8 @@ subroutine SetServices(gc, rc) logical :: data_driven=.true. real, allocatable :: emission_scale_res(:) class(Logger_t), pointer :: logger - type(UngriddedDim) :: ungrd_nbins - type(UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint + type(mapl_UngriddedDim) :: ungrd_nbins + type(mapl_UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint integer :: i, status call MAPL_GridCompGet(gc, logger=logger, name=comp_name, _RC) @@ -108,12 +108,12 @@ subroutine SetServices(gc, rc) call self%GA_Environment%load_from_config(gc, _RC) ! Defined UngriddedDim items - ungrd_nbins = UngriddedDim(self%nbins, name="nbins", units="1") - ungrd_wavelengths_profile = UngriddedDim( & + ungrd_nbins = mapl_UngriddedDim(self%nbins, name="nbins", units="1") + ungrd_wavelengths_profile = mapl_UngriddedDim( & size(self%wavelengths_profile), & name="wavelengths_profile", & units="nm") - ungrd_wavelengths_vertint = UngriddedDim( & + ungrd_wavelengths_vertint = mapl_UngriddedDim( & size(self%wavelengths_vertint), & name="wavelengths_vertint", & units="nm") @@ -154,7 +154,7 @@ subroutine SetServices(gc, rc) standard_name='Sea Salt Mixing Ratio all bins', & units='kg kg-1', & dims='xyz', & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, & ! restart_mode=MAPL_RestartOptional, & ungridded_dim_array=[ungrd_nbins], & ! friendlyto='DYNAMICS:TURBULENCE:MOIST', & @@ -165,7 +165,7 @@ subroutine SetServices(gc, rc) short_name='DEEP_LAKES_MASK', & units='1', & dims='xy', & - vertical_stagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, & add_to_export=.false., & standard_name='Deep Lakes Mask', & _RC) @@ -177,7 +177,7 @@ subroutine SetServices(gc, rc) STANDARD_NAME='air_pressure', & UNITS='Pa', & DIMS='xyz', & - vertical_stagger=VERTICAL_STAGGER_EDGE, & + vertical_stagger=MAPL_VERTICAL_STAGGER_EDGE, & restart_mode=MAPL_RESTART_SKIP, & _RC) @@ -188,7 +188,7 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Rel_Hum_after_moist', & UNITS='1', & DIMS = 'xyz', & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, & restart_mode=MAPL_RESTART_SKIP, & _RC) @@ -201,7 +201,7 @@ subroutine SetServices(gc, rc) UNITS='kg kg-1 s-1', & restart_mode=MAPL_RESTART_SKIP, & DIMS='xyz', & - vertical_stagger=VERTICAL_STAGGER_CENTER, _RC) + vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, _RC) ! dry deposition call MAPL_GridCompAddSpec(gc, & @@ -210,7 +210,7 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, & restart_mode=MAPL_RESTART_SKIP, & _RC) @@ -221,7 +221,7 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt wet removal (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, & restart_mode=MAPL_RESTART_SKIP, & _RC) @@ -232,7 +232,7 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, & restart_mode=MAPL_RESTART_SKIP, & _RC) @@ -243,7 +243,7 @@ subroutine SetServices(gc, rc) STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', & UNITS='kg kg-1 s-1', & DIMS='xy', & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, & restart_mode=MAPL_RESTART_SKIP, & _RC) end do @@ -263,7 +263,7 @@ subroutine SetServices(gc, rc) SHORT_NAME=trim(comp_name)//"_AERO", & STANDARD_NAME="aerosols_from_"//trim(comp_name), & DIMS="xyz", & - vertical_stagger=VERTICAL_STAGGER_CENTER, & + vertical_stagger=MAPL_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", & - vertical_stagger=VERTICAL_STAGGER_NONE, & + vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, & UNITS="kg m-2 s-1", & ITEMTYPE=MAPL_STATEITEM_FIELDBUNDLE, & _RC) diff --git a/ESMF/Shared/Chem_AeroGeneric.F90 b/ESMF/Shared/Chem_AeroGeneric.F90 index d305738d..a7b9de72 100644 --- a/ESMF/Shared/Chem_AeroGeneric.F90 +++ b/ESMF/Shared/Chem_AeroGeneric.F90 @@ -13,7 +13,8 @@ module Chem_AeroGeneric use ESMF use MAPL, only: MAPL_Verify, MAPL_Assert, MAPL_Return, & MAPL_StateGetPointer, MAPL_FieldGet, MAPL_FieldCreate, MAPL_FieldBundleAdd, & - VerticalStaggerLoc, VERTICAL_STAGGER_EDGE, VERTICAL_STAGGER_CENTER, UngriddedDims + MAPL_VerticalStaggerLoc, MAPL_VERTICAL_STAGGER_EDGE, MAPL_VERTICAL_STAGGER_CENTER, & + mapl_UngriddedDims ! USE Chem_MieMod2G implicit none @@ -71,7 +72,7 @@ subroutine add_aero(state, label, label2, geom, km, typekind, ptr, rc) geom, typekind_, & name=field_name, & num_levels=km+1, & - vert_staggerloc=VERTICAL_STAGGER_EDGE, _RC) + vert_staggerloc=MAPL_VERTICAL_STAGGER_EDGE, _RC) else if ((trim(field_name) == "FRLAND") .or. (trim(field_name) == "monochromatic_EXT")) then field = MAPL_FieldCreate(geom, typekind_, name=field_name, _RC) else @@ -80,7 +81,7 @@ subroutine add_aero(state, label, label2, geom, km, typekind, ptr, rc) geom, typekind_, & name=field_name, & num_levels=km, & - vert_staggerloc=VERTICAL_STAGGER_CENTER, _RC) + vert_staggerloc=MAPL_VERTICAL_STAGGER_CENTER, _RC) end if call ESMF_StateAdd(state, [field], _RC) end if @@ -131,7 +132,7 @@ subroutine append_to_bundle(varname, provider_state, prefix, bundle, rc) real, pointer :: ptr2d(:,:) character(len=ESMF_MAXSTR) :: bin_index character(:), allocatable :: units, stdname - type(VerticalStaggerLoc) :: vert_stagger + type(mapl_VerticalStaggerLoc) :: vert_stagger integer :: dim_count, iter, status ! Description: Adds deposition variables to deposition bundle @@ -163,7 +164,7 @@ subroutine append_to_bundle(varname, provider_state, prefix, bundle, rc) field2d = MAPL_FieldCreate( & geom, typekind, & name=trim(varname)//trim(bin_index), & - ungridded_dims=UngriddedDims(), & + ungridded_dims=mapl_UngriddedDims(), & vert_staggerloc=vert_stagger, & units=units, & standard_name=stdname//' Bin '//trim(bin_index), &