Skip to content

Commit 175d87d

Browse files
tclunetclune
committed
MAPL 3 renames
1 parent d120ad0 commit 175d87d

5 files changed

Lines changed: 47 additions & 45 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Removed
1111

1212
### Changed
13+
- MAPL3 renames
1314
- Updated MAPL\_GridCompAddCHild to new interface that just takes a procedure
1415
- Updated MAPL\_GridCompAddSpec calls to new interface
1516
- Pushed rename of MAPL entities down into MAPL.

‎ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ module DU2G_GridCompMod
1515
MAPL_GridCompGetInternalState, MAPL_GridCompSetEntryPoint, MAPL_GridCompAddSpec, &
1616
MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, MAPL_ClockGet, &
1717
MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState, &
18-
VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, &
19-
MAPL_RESTART_SKIP, MAPL_StateGetPointer, MAPL_GeomGetHorzIJIndex, UngriddedDim, &
20-
StrTemplate
18+
MAPL_VERTICAL_STAGGER_NONE, MAPL_VERTICAL_STAGGER_CENTER, MAPL_VERTICAL_STAGGER_EDGE, &
19+
MAPL_RESTART_SKIP, MAPL_StateGetPointer, MAPL_GeomGetHorzIJIndex, mapl_UngriddedDim, &
20+
mapl_StrTemplate
2121
use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_GRAV, MAPL_KARMAN, MAPL_RADIANS_TO_DEGREES
2222
use MAPL, only: MAPL_PackedDateCreate, &
2323
MAPL_PackedTimeCreate
@@ -111,8 +111,8 @@ subroutine SetServices(gc, rc)
111111
real :: DEFVAL
112112
logical :: data_driven = .true.
113113
integer :: num_threads
114-
type(UngriddedDim) :: ungrd_nbins
115-
type(UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint
114+
type(mapl_UngriddedDim) :: ungrd_nbins
115+
type(mapl_UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint
116116
integer :: status
117117

118118
call MAPL_GridCompGet(gc, name=comp_name, _RC)
@@ -130,12 +130,12 @@ subroutine SetServices(gc, rc)
130130
call self%GA_Environment%load_from_config(gc, _RC)
131131

132132
! Defined UngriddedDim items
133-
ungrd_nbins = UngriddedDim(self%nbins, name="nbins", units="1")
134-
ungrd_wavelengths_profile = UngriddedDim( &
133+
ungrd_nbins = mapl_UngriddedDim(self%nbins, name="nbins", units="1")
134+
ungrd_wavelengths_profile = mapl_UngriddedDim( &
135135
size(self%wavelengths_profile), &
136136
name="wavelengths_profile", &
137137
units="nm")
138-
ungrd_wavelengths_vertint = UngriddedDim( &
138+
ungrd_wavelengths_vertint = mapl_UngriddedDim( &
139139
size(self%wavelengths_vertint), &
140140
name="wavelengths_vertint", &
141141
units="nm")
@@ -295,7 +295,7 @@ subroutine SetServices(gc, rc)
295295
standard_name="aerosols_from_"//trim(comp_name), &
296296
units="kg kg-1", &
297297
dims="xyz", &
298-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
298+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
299299
itemtype=MAPL_STATEITEM_STATE, _RC)
300300

301301
! This bundle is needed by surface for snow albedo modification
@@ -306,7 +306,7 @@ subroutine SetServices(gc, rc)
306306
short_name=trim(comp_name)//"_AERO_DP", &
307307
standard_name="aerosol_deposition_from_"//trim(comp_name), &
308308
dims="xy", &
309-
vertical_stagger=VERTICAL_STAGGER_NONE, &
309+
vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, &
310310
units="kg m-2 s-1", &
311311
itemtype=MAPL_STATEITEM_FIELDBUNDLE, _RC)
312312

@@ -705,7 +705,7 @@ subroutine Run1(gc, import, export, clock, RC)
705705
if (self%doing_point_emissions) then
706706
if (workspace%day_save /= idd) then
707707
workspace%day_save = idd
708-
call StrTemplate( &
708+
call mapl_StrTemplate( &
709709
fname, self%point_emissions_srcfilen, xid='unknown', &
710710
nymd=nymd, nhms=120000 )
711711
inquire(file=fname, exist=file_exists)

‎ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ module GOCART2G_GridCompMod
1313
use MAPL, only: MAPL_GridCompAddConnection, MAPL_GridCompGetResource, MAPL_GridCompReexport
1414
use MAPL, only: MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE
1515
use MAPL, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState
16-
use MAPL, only: MAPL_RESTART_SKIP, VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE
17-
use MAPL, only: MAPL_FieldBundleAdd, MAPL_FieldBundleGet, MAPL_StateGetPointer, MAPL_GridGet, UngriddedDim
16+
use MAPL, only: MAPL_RESTART_SKIP, MAPL_VERTICAL_STAGGER_NONE, MAPL_VERTICAL_STAGGER_CENTER, MAPL_VERTICAL_STAGGER_EDGE
17+
use MAPL, only: MAPL_FieldBundleAdd, MAPL_FieldBundleGet, MAPL_StateGetPointer, MAPL_GridGet, mapl_UngriddedDim
1818
use MAPL_Constants, only: MAPL_GRAV, MAPL_PI
1919

2020
use Chem_AeroGeneric
@@ -96,7 +96,7 @@ subroutine SetServices(gc, rc)
9696
! logical :: use_threads
9797
type(Instance), allocatable :: child
9898
character(len=:), allocatable :: child_items
99-
type(UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint
99+
type(mapl_UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint
100100
integer :: iter, status
101101

102102
! Wrap gridcomp's private state and store in gc
@@ -117,11 +117,11 @@ subroutine SetServices(gc, rc)
117117
! call MAPL_GridCompGetResource(gc, "use_threads", use_threads, default=.false., _RC)
118118

119119
! Defined UngriddedDim items
120-
ungrd_wavelengths_profile = UngriddedDim( &
120+
ungrd_wavelengths_profile = mapl_UngriddedDim( &
121121
size(self%wavelengths_profile), &
122122
name="wavelengths_profile", &
123123
units="nm")
124-
ungrd_wavelengths_vertint = UngriddedDim( &
124+
ungrd_wavelengths_vertint = mapl_UngriddedDim( &
125125
size(self%wavelengths_vertint), &
126126
name="wavelengths_vertint", &
127127
units="nm")
@@ -153,7 +153,7 @@ subroutine SetServices(gc, rc)
153153
short_name=child%name//"_AERO", &
154154
standard_name="aerosol_mass_mixing_ratios_ng", &
155155
dims="xyz", &
156-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
156+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
157157
units="kg kg-1", &
158158
itemtype=MAPL_STATEITEM_STATE, &
159159
_RC)
@@ -166,7 +166,7 @@ subroutine SetServices(gc, rc)
166166
short_name=child%name//"_AERO", &
167167
standard_name="aerosol_mass_mixing_ratios_ng", &
168168
dims="xyz", &
169-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
169+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
170170
units="kg kg-1", &
171171
itemtype=MAPL_STATEITEM_STATE, &
172172
_RC)
@@ -177,7 +177,7 @@ subroutine SetServices(gc, rc)
177177
short_name="AERO", &
178178
standard_name="aerosol_mass_mixing_ratios_ng", &
179179
dims="xyz", &
180-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
180+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
181181
units="kg kg-1", &
182182
itemtype=MAPL_STATEITEM_STATE, &
183183
_RC)
@@ -193,7 +193,7 @@ subroutine SetServices(gc, rc)
193193
short_name=child%name//"_AERO_DP", &
194194
standard_name="aerosol_deposition_ng", &
195195
dims="xy", &
196-
vertical_stagger=VERTICAL_STAGGER_NONE, &
196+
vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, &
197197
units="kg m-2 s-1", &
198198
itemtype=MAPL_STATEITEM_FIELDBUNDLE, &
199199
_RC)
@@ -206,7 +206,7 @@ subroutine SetServices(gc, rc)
206206
short_name=child%name//"_AERO_DP", &
207207
standard_name="aerosol_deposition_ng", &
208208
dims="xy", &
209-
vertical_stagger=VERTICAL_STAGGER_NONE, &
209+
vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, &
210210
units="kg m-2 s-1", &
211211
itemtype=MAPL_STATEITEM_FIELDBUNDLE, &
212212
_RC)
@@ -217,7 +217,7 @@ subroutine SetServices(gc, rc)
217217
short_name="AERO_DP", &
218218
standard_name="aerosol_deposition_ng", &
219219
dims="xy", &
220-
vertical_stagger=VERTICAL_STAGGER_NONE, &
220+
vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, &
221221
units="kg m-2 s-1", &
222222
itemtype=MAPL_STATEITEM_FIELDBUNDLE, &
223223
_RC)

‎ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ module SS2G_GridCompMod
1616
MAPL_GridCompGetResource, MAPL_GridCompGetInternalState, &
1717
MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, MAPL_ClockGet, &
1818
MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState, &
19-
VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, &
20-
MAPL_RESTART_SKIP, MAPL_StateGetPointer, UngriddedDim
19+
MAPL_VERTICAL_STAGGER_NONE, MAPL_VERTICAL_STAGGER_CENTER, MAPL_VERTICAL_STAGGER_EDGE, &
20+
MAPL_RESTART_SKIP, MAPL_StateGetPointer, mapl_UngriddedDim
2121
use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES, MAPL_PI, MAPL_GRAV, MAPL_KARMAN
2222
use GOCART2G_MieMod
2323
use Chem_AeroGeneric
@@ -92,8 +92,8 @@ subroutine SetServices(gc, rc)
9292
logical :: data_driven=.true.
9393
real, allocatable :: emission_scale_res(:)
9494
class(Logger_t), pointer :: logger
95-
type(UngriddedDim) :: ungrd_nbins
96-
type(UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint
95+
type(mapl_UngriddedDim) :: ungrd_nbins
96+
type(mapl_UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint
9797
integer :: i, status
9898

9999
call MAPL_GridCompGet(gc, logger=logger, name=comp_name, _RC)
@@ -108,12 +108,12 @@ subroutine SetServices(gc, rc)
108108
call self%GA_Environment%load_from_config(gc, _RC)
109109

110110
! Defined UngriddedDim items
111-
ungrd_nbins = UngriddedDim(self%nbins, name="nbins", units="1")
112-
ungrd_wavelengths_profile = UngriddedDim( &
111+
ungrd_nbins = mapl_UngriddedDim(self%nbins, name="nbins", units="1")
112+
ungrd_wavelengths_profile = mapl_UngriddedDim( &
113113
size(self%wavelengths_profile), &
114114
name="wavelengths_profile", &
115115
units="nm")
116-
ungrd_wavelengths_vertint = UngriddedDim( &
116+
ungrd_wavelengths_vertint = mapl_UngriddedDim( &
117117
size(self%wavelengths_vertint), &
118118
name="wavelengths_vertint", &
119119
units="nm")
@@ -154,7 +154,7 @@ subroutine SetServices(gc, rc)
154154
standard_name='Sea Salt Mixing Ratio all bins', &
155155
units='kg kg-1', &
156156
dims='xyz', &
157-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
157+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
158158
! restart_mode=MAPL_RestartOptional, &
159159
ungridded_dim_array=[ungrd_nbins], &
160160
! friendlyto='DYNAMICS:TURBULENCE:MOIST', &
@@ -165,7 +165,7 @@ subroutine SetServices(gc, rc)
165165
short_name='DEEP_LAKES_MASK', &
166166
units='1', &
167167
dims='xy', &
168-
vertical_stagger=VERTICAL_STAGGER_NONE, &
168+
vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, &
169169
add_to_export=.false., &
170170
standard_name='Deep Lakes Mask', &
171171
_RC)
@@ -177,7 +177,7 @@ subroutine SetServices(gc, rc)
177177
STANDARD_NAME='air_pressure', &
178178
UNITS='Pa', &
179179
DIMS='xyz', &
180-
vertical_stagger=VERTICAL_STAGGER_EDGE, &
180+
vertical_stagger=MAPL_VERTICAL_STAGGER_EDGE, &
181181
restart_mode=MAPL_RESTART_SKIP, &
182182
_RC)
183183

@@ -188,7 +188,7 @@ subroutine SetServices(gc, rc)
188188
STANDARD_NAME='Rel_Hum_after_moist', &
189189
UNITS='1', &
190190
DIMS = 'xyz', &
191-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
191+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
192192
restart_mode=MAPL_RESTART_SKIP, &
193193
_RC)
194194

@@ -201,7 +201,7 @@ subroutine SetServices(gc, rc)
201201
UNITS='kg kg-1 s-1', &
202202
restart_mode=MAPL_RESTART_SKIP, &
203203
DIMS='xyz', &
204-
vertical_stagger=VERTICAL_STAGGER_CENTER, _RC)
204+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, _RC)
205205

206206
! dry deposition
207207
call MAPL_GridCompAddSpec(gc, &
@@ -210,7 +210,7 @@ subroutine SetServices(gc, rc)
210210
STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', &
211211
UNITS='kg kg-1 s-1', &
212212
DIMS='xy', &
213-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
213+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
214214
restart_mode=MAPL_RESTART_SKIP, &
215215
_RC)
216216

@@ -221,7 +221,7 @@ subroutine SetServices(gc, rc)
221221
STANDARD_NAME='Sea Salt wet removal (bin '//trim(field_name)//')', &
222222
UNITS='kg kg-1 s-1', &
223223
DIMS='xy', &
224-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
224+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
225225
restart_mode=MAPL_RESTART_SKIP, &
226226
_RC)
227227

@@ -232,7 +232,7 @@ subroutine SetServices(gc, rc)
232232
STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', &
233233
UNITS='kg kg-1 s-1', &
234234
DIMS='xy', &
235-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
235+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
236236
restart_mode=MAPL_RESTART_SKIP, &
237237
_RC)
238238

@@ -243,7 +243,7 @@ subroutine SetServices(gc, rc)
243243
STANDARD_NAME='Sea Salt Mixing Ratio (bin '//trim(field_name)//')', &
244244
UNITS='kg kg-1 s-1', &
245245
DIMS='xy', &
246-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
246+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
247247
restart_mode=MAPL_RESTART_SKIP, &
248248
_RC)
249249
end do
@@ -263,7 +263,7 @@ subroutine SetServices(gc, rc)
263263
SHORT_NAME=trim(comp_name)//"_AERO", &
264264
STANDARD_NAME="aerosols_from_"//trim(comp_name), &
265265
DIMS="xyz", &
266-
vertical_stagger=VERTICAL_STAGGER_CENTER, &
266+
vertical_stagger=MAPL_VERTICAL_STAGGER_CENTER, &
267267
UNITS="kg kg-1", &
268268
ITEMTYPE=MAPL_STATEITEM_STATE, &
269269
_RC)
@@ -276,7 +276,7 @@ subroutine SetServices(gc, rc)
276276
SHORT_NAME=trim(comp_name)//"_AERO_DP", &
277277
STANDARD_NAME="aerosol_deposition_from_"//trim(comp_name), &
278278
DIMS="xy", &
279-
vertical_stagger=VERTICAL_STAGGER_NONE, &
279+
vertical_stagger=MAPL_VERTICAL_STAGGER_NONE, &
280280
UNITS="kg m-2 s-1", &
281281
ITEMTYPE=MAPL_STATEITEM_FIELDBUNDLE, &
282282
_RC)

‎ESMF/Shared/Chem_AeroGeneric.F90‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ module Chem_AeroGeneric
1313
use ESMF
1414
use MAPL, only: MAPL_Verify, MAPL_Assert, MAPL_Return, &
1515
MAPL_StateGetPointer, MAPL_FieldGet, MAPL_FieldCreate, MAPL_FieldBundleAdd, &
16-
VerticalStaggerLoc, VERTICAL_STAGGER_EDGE, VERTICAL_STAGGER_CENTER, UngriddedDims
16+
MAPL_VerticalStaggerLoc, MAPL_VERTICAL_STAGGER_EDGE, MAPL_VERTICAL_STAGGER_CENTER, &
17+
mapl_UngriddedDims
1718
! USE Chem_MieMod2G
1819

1920
implicit none
@@ -71,7 +72,7 @@ subroutine add_aero(state, label, label2, geom, km, typekind, ptr, rc)
7172
geom, typekind_, &
7273
name=field_name, &
7374
num_levels=km+1, &
74-
vert_staggerloc=VERTICAL_STAGGER_EDGE, _RC)
75+
vert_staggerloc=MAPL_VERTICAL_STAGGER_EDGE, _RC)
7576
else if ((trim(field_name) == "FRLAND") .or. (trim(field_name) == "monochromatic_EXT")) then
7677
field = MAPL_FieldCreate(geom, typekind_, name=field_name, _RC)
7778
else
@@ -80,7 +81,7 @@ subroutine add_aero(state, label, label2, geom, km, typekind, ptr, rc)
8081
geom, typekind_, &
8182
name=field_name, &
8283
num_levels=km, &
83-
vert_staggerloc=VERTICAL_STAGGER_CENTER, _RC)
84+
vert_staggerloc=MAPL_VERTICAL_STAGGER_CENTER, _RC)
8485
end if
8586
call ESMF_StateAdd(state, [field], _RC)
8687
end if
@@ -131,7 +132,7 @@ subroutine append_to_bundle(varname, provider_state, prefix, bundle, rc)
131132
real, pointer :: ptr2d(:,:)
132133
character(len=ESMF_MAXSTR) :: bin_index
133134
character(:), allocatable :: units, stdname
134-
type(VerticalStaggerLoc) :: vert_stagger
135+
type(mapl_VerticalStaggerLoc) :: vert_stagger
135136
integer :: dim_count, iter, status
136137

137138
! Description: Adds deposition variables to deposition bundle
@@ -163,7 +164,7 @@ subroutine append_to_bundle(varname, provider_state, prefix, bundle, rc)
163164
field2d = MAPL_FieldCreate( &
164165
geom, typekind, &
165166
name=trim(varname)//trim(bin_index), &
166-
ungridded_dims=UngriddedDims(), &
167+
ungridded_dims=mapl_UngriddedDims(), &
167168
vert_staggerloc=vert_stagger, &
168169
units=units, &
169170
standard_name=stdname//' Bin '//trim(bin_index), &

0 commit comments

Comments
 (0)