Skip to content

Commit 140d95a

Browse files
committed
Replace internal MAPL module references with USE MAPL (fixes #449)
Remove direct dependencies on MAPL_LatLonGridFactoryMod, MAPL_StringTemplate, and MAPL_PackedTimeMod. All MAPL symbols now accessed via the public MAPL or MAPL_Constants wrapper modules. Requires MAPL PR #4964 (re-export of PackedDateCreate, PackedTimeCreate, and StrTemplate via the MAPL umbrella).
1 parent bee5bae commit 140d95a

5 files changed

Lines changed: 9 additions & 11 deletions

File tree

CHANGELOG.md

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

1212
### Changed
1313

14+
- Replace internal MAPL module references with `USE MAPL` in `aop_calculator.F90`
15+
(`MAPL_LatLonGridFactoryMod`), `CA2G_GridCompMod.F90`, `DU2G_GridCompMod.F90`,
16+
and `SU2G_GridCompMod.F90` (`MAPL_StringTemplate`, `MAPL_PackedTimeMod`). All
17+
MAPL symbols now accessed via the public `MAPL` or `MAPL_Constants` wrapper
18+
modules (closes #449).
1419
- Replace all `use mapl3g_*` statements with `use MAPL` (umbrella) or
1520
`use mapl_*` (for symbols not yet re-exported by the umbrella) following
1621
the MAPL Phase 9 `mapl3g_``mapl_` module rename. `UngriddedDim` is

ESMF/Apps/aop_calculator.F90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ program ext_calculator
1717
!
1818
use ESMF
1919
use MAPL
20-
use MAPL_LatLonGridFactoryMod
2120
use GOCART2G_SimpleBundleMod
2221
use GOCART2G_MieMod
2322
use GOCART2G_AopMod

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridCompMod.F90

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ module CA2G_GridCompMod
1717

1818
use GOCART2G_Process ! GOCART2G process library
1919
use GA_EnvironmentMod
20-
use MAPL_StringTemplate, only: StrTemplate
21-
use MAPL_PackedTimeMod, only: MAPL_PackedDateCreate => PackedDateCreate, &
22-
MAPL_PackedTimeCreate => PackedTimeCreate
2320
!$ use omp_lib
2421

2522
implicit none

ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ module DU2G_GridCompMod
1616
MAPL_STATEITEM_STATE, MAPL_STATEITEM_FIELDBUNDLE, MAPL_ClockGet, &
1717
MAPL_UserCompSetInternalState, MAPL_UserCompGetInternalState, &
1818
VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE, &
19-
MAPL_RESTART_SKIP, MAPL_StateGetPointer, MAPL_GeomGetHorzIJIndex, UngriddedDim
19+
MAPL_RESTART_SKIP, MAPL_StateGetPointer, MAPL_GeomGetHorzIJIndex, UngriddedDim, &
20+
StrTemplate
2021
use MAPL_Constants, only: MAPL_UNDEFINED_REAL, MAPL_GRAV, MAPL_KARMAN, MAPL_RADIANS_TO_DEGREES
21-
use MAPL_PackedTimeMod, only: MAPL_PackedDateCreate => PackedDateCreate, &
22-
MAPL_PackedTimeCreate => PackedTimeCreate
22+
use MAPL, only: MAPL_PackedDateCreate => PackedDateCreate, &
23+
MAPL_PackedTimeCreate => PackedTimeCreate
2324
use GOCART2G_MieMod
2425
use Chem_AeroGeneric
2526
use iso_c_binding, only: c_loc, c_f_pointer, c_ptr
2627

2728
use GOCART2G_Process ! GOCART2G process library
2829
use GA_EnvironmentMod
29-
use MAPL_StringTemplate, only: StrTemplate
3030
!$ use omp_lib
3131

3232
implicit none

ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ module SU2G_GridCompMod
1818

1919
use GOCART2G_Process ! GOCART2G process library
2020
use GA_EnvironmentMod
21-
use MAPL_StringTemplate, only: StrTemplate
22-
use MAPL_PackedTimeMod, only: MAPL_PackedDateCreate => PackedDateCreate, &
23-
MAPL_PackedTimeCreate => PackedTimeCreate
2421
!$ use omp_lib
2522

2623
implicit none

0 commit comments

Comments
 (0)