Skip to content

Commit ddf7786

Browse files
tclunetclune
authored
Merge pull request #446 from GEOS-ESM/feature/replace-mapl3g-with-use-MAPL
Replace mapl3g_ uses with use MAPL in GOCART2G components
2 parents 4ec5741 + 4e855af commit ddf7786

6 files changed

Lines changed: 31 additions & 42 deletions

File tree

‎CHANGELOG.md‎

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

1212
### Changed
1313

14+
- Replace all `use mapl3g_*` statements with `use MAPL` (umbrella) or
15+
`use mapl_*` (for symbols not yet re-exported by the umbrella) following
16+
the MAPL Phase 9 `mapl3g_` → `mapl_` module rename. `UngriddedDim` is
17+
accessed directly via `use mapl_UngriddedDim` since it is not re-exported
18+
by the MAPL umbrella. Affected files: `DU2G_GridCompMod.F90`,
19+
`SS2G_GridCompMod.F90`, `GOCART2G_GridCompMod.F90`,
20+
`Chem_AeroGeneric.F90`, `GA_EnvironmentMod.F90`
1421
- Remove `MAPL2` from `Chem_Shared2G` and `DU2G_GridComp` CMake dependencies; replace with `MAPL` (#437)
1522
- Migrate `SS2G_GridCompMod.F90` from `use MAPL_MaplGrid` to `use MAPL` for `mapl_GridGetGlobalCellCountPerDim`; `dims` made allocatable (MAPL#4875)
1623
- Migrate `DU2G_GridCompMod.F90` from `use MAPL_BaseMod`/`use mapl_MaplGrid` to `use MAPL` for `mapl_GridGetGlobalCellCountPerDim` (MAPL#4857)

‎ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,17 @@ module DU2G_GridCompMod
1111
use pflogger, only: logger_t => logger
1212
use mapl_ErrorHandling, only: MAPL_Verify, MAPL_Assert, MAPL_Return
1313
! use MAPL
14-
use MAPL, only: MAPL_get_num_threads => get_num_threads, MAPL_get_current_thread => get_current_thread
15-
use MAPL, only: mapl_GridGetGlobalCellCountPerDim
16-
use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_GRAV, MAPL_KARMAN, MAPL_RADIANS_TO_DEGREES
17-
use mapl3g_generic, only: MAPL_GridCompGet, MAPL_GridCompGetResource, MAPL_GridCompGetInternalState
18-
use mapl3g_generic, only: MAPL_GridCompSetEntryPoint
19-
use mapl3g_generic, only: MAPL_GridCompAddSpec
20-
use mapl3g_generic, only: MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE
21-
use mapl3g_generic, only: MAPL_ClockGet
22-
use mapl3g_generic, only: MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState
23-
use mapl3g_VerticalStaggerLoc, only: VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE
24-
use mapl3g_RestartModes, only: MAPL_RESTART_SKIP
14+
use MAPL, only: MAPL_get_num_threads => get_num_threads, MAPL_get_current_thread => get_current_thread, &
15+
mapl_GridGetGlobalCellCountPerDim, MAPL_GridCompGet, MAPL_GridCompGetResource, &
16+
MAPL_GridCompGetInternalState, MAPL_GridCompSetEntryPoint, MAPL_GridCompAddSpec, &
17+
MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, MAPL_ClockGet, &
18+
MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState, &
19+
VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, &
20+
MAPL_RESTART_SKIP, MAPL_StateGetPointer, MAPL_GeomGetHorzIJIndex
2521
use mapl3g_UngriddedDim, only: UngriddedDim
26-
use mapl3g_State_API, only: MAPL_StateGetPointer
22+
use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_GRAV, MAPL_KARMAN, MAPL_RADIANS_TO_DEGREES
2723
use MAPL_PackedTimeMod, only: MAPL_PackedDateCreate => PackedDateCreate, &
2824
MAPL_PackedTimeCreate => PackedTimeCreate
29-
use mapl3g_Geom_API, only: MAPL_GeomGetHorzIJIndex
3025
use GOCART2G_MieMod
3126
use Chem_AeroGeneric
3227
use iso_c_binding, only: c_loc, c_f_pointer, c_ptr

‎ESMF/GOCART2G_GridComp/GA_Environment/GA_EnvironmentMod.F90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module GA_EnvironmentMod
55
use ESMF
66
use MAPL
77
use GOCART2G_MieMod
8-
use mapl3g_generic, only: MAPL_GridCompGetResource
98

109
implicit none
1110
private

‎ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@ module GOCART2G_GridCompMod
1010
use mapl_ErrorHandling, only: MAPL_Verify, MAPL_Return, MAPL_Assert
1111
use MAPL_Constants, only: MAPL_GRAV, MAPL_PI
1212

13-
use mapl3g_generic, only: MAPL_GridCompSetEntryPoint, MAPL_GridCompGet, MAPL_GridCompAddSpec
14-
use mapl3g_generic, only: MAPL_GridCompAddChild, MAPL_GridCompGetChildName, MAPL_GridCompRunChild
15-
use mapl3g_generic, only: MAPL_GridCompAddConnectivity
16-
use mapl3g_generic, only: MAPL_GridCompGetResource, MAPL_GridCompReexport
17-
use mapl3g_generic, only: MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE
18-
use mapl3g_generic, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState
19-
use mapl3g_RestartModes, only: MAPL_RESTART_SKIP
20-
use mapl3g_VerticalStaggerLoc, only: VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE
21-
use mapl3g_FieldBundle_API, only: MAPL_FieldBundleAdd, MAPL_FieldBundleGet
22-
use mapl3g_State_API, only: MAPL_StateGetPointer
23-
use mapl3g_Geom_API, only: MAPL_GridGet
13+
use MAPL, only: MAPL_GridCompSetEntryPoint, MAPL_GridCompGet, MAPL_GridCompAddSpec, &
14+
MAPL_GridCompAddChild, MAPL_GridCompGetChildName, MAPL_GridCompRunChild, &
15+
MAPL_GridCompAddConnectivity, MAPL_GridCompGetResource, MAPL_GridCompReexport, &
16+
MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, &
17+
MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState, &
18+
MAPL_RESTART_SKIP, VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, &
19+
MAPL_FieldBundleAdd, MAPL_FieldBundleGet, MAPL_StateGetPointer, MAPL_GridGet
2420
use mapl3g_UngriddedDim, only: UngriddedDim
2521

2622
use Chem_AeroGeneric

‎ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,13 @@ module SS2G_GridCompMod
1212
use pflogger, only: logger_t => logger
1313
use mapl_ErrorHandling, only: MAPL_Verify, MAPL_Assert, MAPL_Return
1414
use MAPL_Constants, only: MAPL_RADIANS_TO_DEGREES, MAPL_PI, MAPL_GRAV, MAPL_KARMAN
15-
use mapl3g_generic, only: MAPL_GridCompSetEntryPoint
16-
use mapl3g_generic, only: MAPL_GridCompAddSpec
17-
use mapl3g_generic, only: MAPL_GridCompGet
18-
use mapl3g_generic, only: MAPL_GridCompGetResource
19-
use mapl3g_generic, only: MAPL_GridCompGetInternalState
20-
use mapl3g_generic, only: MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE
21-
use mapl3g_generic, only: MAPL_ClockGet
22-
use mapl3g_generic, only: MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState
23-
use mapl3g_VerticalStaggerLoc, only: VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE
24-
use mapl3g_RestartModes, only: MAPL_RESTART_SKIP
25-
use MAPL, only: MAPL_GridGet, MAPL_GridGetCoordinates, mapl_GridGetGlobalCellCountPerDim
26-
use mapl3g_State_API, only: MAPL_StateGetPointer
15+
use MAPL, only: MAPL_GridGet, MAPL_GridGetCoordinates, mapl_GridGetGlobalCellCountPerDim, &
16+
MAPL_GridCompSetEntryPoint, MAPL_GridCompAddSpec, MAPL_GridCompGet, &
17+
MAPL_GridCompGetResource, MAPL_GridCompGetInternalState, &
18+
MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, MAPL_ClockGet, &
19+
MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState, &
20+
VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, &
21+
MAPL_RESTART_SKIP, MAPL_StateGetPointer
2722
use mapl3g_UngriddedDim, only: UngriddedDim
2823
use GOCART2G_MieMod
2924
use Chem_AeroGeneric

‎ESMF/Shared/Chem_AeroGeneric.F90‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ module Chem_AeroGeneric
1212
!USES:
1313
use ESMF
1414
use mapl_ErrorHandling, only: MAPL_Verify, MAPL_Assert, MAPL_Return
15-
use mapl3g_State_API, only: MAPL_StateGetPointer
16-
use mapl3g_Field_API, only: MAPL_FieldGet, MAPL_FieldCreate
17-
use mapl3g_FieldBundle_API, only: MAPL_FieldBundleAdd
18-
use mapl3g_VerticalStaggerLoc, only: VerticalStaggerLoc, VERTICAL_STAGGER_EDGE, VERTICAL_STAGGER_CENTER
19-
use mapl3g_UngriddedDims, only: UngriddedDims
15+
use MAPL, only: MAPL_StateGetPointer, MAPL_FieldGet, MAPL_FieldCreate, MAPL_FieldBundleAdd, &
16+
VerticalStaggerLoc, VERTICAL_STAGGER_EDGE, VERTICAL_STAGGER_CENTER, UngriddedDims
2017
! USE Chem_MieMod2G
2118

2219
implicit none

0 commit comments

Comments
 (0)