Skip to content

Commit 09d8074

Browse files
authored
Delete dead/superseded modules from base/ (#4775) (#4777)
* Delete dead/superseded modules from base/ (#4775) - Delete MAPL_Profiler.F90 (MAPL_ProfMod stub; distinct from profiler/ package) - Delete MAPL_Resource.F90 and associated header files (no callers in MAPL) - Delete MAPL_stubs.F90 (empty file) - Delete UnusableArgument_type.inc (unreferenced; superseded by MAPL_KeywordEnforcer) - Delete MAPL_EASEConversion.F90 (was already a thin re-export shim of mapl3g_EASEConversion) - Update NCIO.F90 and MAPL_LocStreamMod.F90 to use mapl3g_EASEConversion directly - Remove use MAPL_ProfMod and use MAPL_EASEConversion from Base.F90 - Remove all deleted files from base/CMakeLists.txt * Delete Test_MAPL_Resource.pf along with MAPL_ResourceMod The test directly tests MAPL_ResourceMod which was deleted in the previous commit. Remove the test file and its entry in CMakeLists.txt.
1 parent 8cdc65e commit 09d8074

14 files changed

Lines changed: 2 additions & 1315 deletions

base/Base.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ module MAPLBase_Mod
1414
use MAPL_Constants, only: MAPL_PI_R8
1515
use MAPL_ConfigMod
1616
use MAPL_SortMod
17-
use MAPL_ProfMod
1817
use MAPL_SunMod
1918
use MAPL_LocStreamMod
2019
use MAPL_InterpMod
@@ -34,7 +33,6 @@ module MAPLBase_Mod
3433
use MAPL_FileMetadataUtilsMod
3534
use MAPL_VerticalDataMod
3635
use MAPL_SphericalGeometry
37-
use MAPL_EASEConversion
3836
use mapl_LocalDisplacementEnsemble
3937

4038
logical, save, private :: mapl_is_initialized = .false.

base/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
esma_set_this (OVERRIDE MAPL.base)
22

33
set (srcs
4-
MAPL_Profiler.F90
54
ESMFL_Mod.F90
65
FileMetadataUtilities.F90
76
FileMetadataUtilitiesVector.F90 MAPL_SimpleBundleMod.F90
87
MaplGrid.F90
9-
MAPL_stubs.F90
108
MAPL_ESMFTimeVectorMod.F90
119
MAPL_TimeMethods.F90
1210
FileIOShared.F90 BinIO.F90 NCIO.F90
@@ -21,9 +19,7 @@ set (srcs
2119
c_mapl_locstream_F.c getrss.c memuse.c
2220
Base/Base_Base.F90 Base/Base_Base_implementation.F90
2321
TimeStringConversion.F90
24-
MAPL_Resource.F90
2522
MAPL_DateTime_Parsing_ESMF.F90
26-
MAPL_EASEConversion.F90
2723
# Orphaned program: should not be in this library.
2824
# tstqsat.F90
2925
)

base/MAPL_EASEConversion.F90

Lines changed: 0 additions & 20 deletions
This file was deleted.

base/MAPL_LocStreamMod.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module MAPL_LocStreamMod
3131
use MAPL_HashMod
3232
use MAPL_ShmemMod
3333
use MAPL_ExceptionHandling
34-
use MAPL_EASEConversion
34+
use mapl3g_EASEConversion, only: MAPL_ease_extent => ease_extent
3535
use, intrinsic :: iso_fortran_env, only: REAL64, INT64
3636
use mpi
3737

base/MAPL_Profiler.F90

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)