Skip to content

Commit e2d1976

Browse files
authored
Remove grid manager stack from base/ (#4707)
Deletes the legacy MAPL2 grid manager stack and all associated grid factory files from base/. The MAPL3 geom manager supersedes this entire stack. Files deleted: - MAPL_GridManager.F90 - MAPL_AbstractGridFactory.F90 - MAPL_StringGridFactoryMap.F90 - MAPL_Integer64GridFactoryMap.F90 - MAPL_LatLonGridFactory.F90 - MAPL_CubedSphereGridFactory.F90 - MAPL_TripolarGridFactory.F90 - MAPL_XYGridFactory.F90 - MAPL_LlcGridFactory.F90 - MAPL_SwathGridFactory.F90 - MAPL_EASEGridFactory.F90 - MAPL_ExternalGridFactory.F90 - MAPL_ObsUtil.F90 + MAPL_ObsUtil.c - Plain_netCDF_Time.F90 - MAPL_NetCDF.F90 - Regrid_Functions_Mod.F90 - MAPL_DefGridName.F90 - Grid_Use_Cases.txt + regridding_methods.md - Tests for deleted modules Files modified: - base/Base.F90: removed grid manager use statements - base/ESMFL_Mod.F90: removed cubed-sphere halo branch - base/FileMetadataUtilities.F90: removed dead use statements - generic/MAPL_Generic.F90: stubbed grid_is_consistent Ports for EASE, LLC, Swath, External grid factories tracked in GH #4700, #4696, #4697, #4698 respectively. Closes #4706
1 parent 22155f3 commit e2d1976

30 files changed

Lines changed: 17 additions & 16794 deletions

base/Base.F90

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ module MAPLBase_Mod
2323
use MAPL_MemUtilsMod
2424
use MAPL_HashMod
2525
use MAPL_LoadBalanceMod
26-
use MAPL_AbstractGridFactoryMod
27-
use MAPL_GridManagerMod
28-
use MAPL_LatLonGridFactoryMod
29-
use MAPL_EASEGridFactoryMod
30-
use MAPL_CubedSphereGridFactoryMod
31-
use MAPL_ExternalGridFactoryMod
26+
3227
use MAPL_ShmemMod
3328
use MAPL_MaxMinMod
3429
use MAPL_SimpleBundleMod

base/CMakeLists.txt

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,31 @@ set (srcs
44
MAPL_Profiler.F90
55
ESMFL_Mod.F90 MAPL_SatVapor.F90
66
FileMetadataUtilities.F90 MAPL_SimpleAlarm.F90
7-
FileMetadataUtilitiesVector.F90 MAPL_GridManager.F90 MAPL_SimpleBundleMod.F90
8-
MAPL_AbstractGridFactory.F90 MAPL_StringGridFactoryMap.F90
7+
FileMetadataUtilitiesVector.F90 MAPL_SimpleBundleMod.F90
98
MaplGrid.F90
109
MAPL_stubs.F90
11-
MAPL_Integer64GridFactoryMap.F90 MAPL_sun_uc.F90
10+
MAPL_sun_uc.F90
1211
MAPL_TimeMethods.F90
1312
FileIOShared.F90 BinIO.F90 NCIO.F90
1413
MAPL_IO.F90
15-
MAPL_LatLonGridFactory.F90
16-
MAPL_Comms.F90 MAPL_TripolarGridFactory.F90
17-
MAPL_LlcGridFactory.F90 MAPL_SwathGridFactory.F90
14+
MAPL_Comms.F90
1815
MAPL_Config.F90 MAPL_LocStreamMod.F90
1916
MAPL_MaxMinMod.F90 MAPL_VerticalInterpMod.F90
20-
MAPL_CubedSphereGridFactory.F90 MAPL_MemUtils.F90 MAPL_VerticalMethods.F90
21-
MAPL_DefGridName.F90 Base.F90
22-
MAPL_ESMFTimeVectorMod.F90 Regrid_Functions_Mod.F90
17+
MAPL_MemUtils.F90 MAPL_VerticalMethods.F90
18+
Base.F90
19+
MAPL_ESMFTimeVectorMod.F90
2320
MAPL_NominalOrbitsMod.F90
2421
MAPL_LocStreamFactoryMod.F90 MAPL_LocstreamRegridder.F90
25-
MAPL_ExternalGridFactory.F90
2622
ServerManager.F90 ApplicationSupport.F90
2723
regex_module.F90 StringTemplate.F90 MAPL_SphericalGeometry.F90
28-
regex_F.c MAPL_ObsUtil.c
24+
regex_F.c
2925
c_mapl_locstream_F.c getrss.c memuse.c
3026
Base/Base_Base.F90 Base/Base_Base_implementation.F90
3127
TimeStringConversion.F90
3228
MAPL_ISO8601_DateTime_ESMF.F90
3329
MAPL_Resource.F90
34-
MAPL_XYGridFactory.F90
35-
MAPL_NetCDF.F90 Plain_netCDF_Time.F90
36-
MAPL_DateTime_Parsing_ESMF.F90 MAPL_ObsUtil.F90
30+
MAPL_DateTime_Parsing_ESMF.F90
3731
MAPL_EASEConversion.F90
38-
MAPL_EASEGridFactory.F90
3932
LDE.F90
4033
# Orphaned program: should not be in this library.
4134
# tstqsat.F90

base/ESMFL_Mod.F90

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3730,10 +3730,8 @@ subroutine ESMFL_FailedRC(mype, name)
37303730
end subroutine ESMFL_FailedRC
37313731

37323732
!-------------------------------------------------------------------------
3733-
SUBROUTINE ESMFL_HALO_R4_2D(GRID, INPUT, RC)
3733+
SUBROUTINE ESMFL_HALO_R4_2D(GRID, INPUT, RC)
37343734
!-------------------------------------------------------------------------
3735-
use MAPL_GridManagerMod, only: get_factory
3736-
use MAPL_AbstractGridFactoryMod
37373735
TYPE(ESMF_Grid), INTENT(INout) :: GRID
37383736
REAL, INTENT(INOUT) :: INPUT(:,:)
37393737
integer, optional, intent(OUT) :: RC
@@ -3761,7 +3759,6 @@ SUBROUTINE ESMFL_HALO_R4_2D(GRID, INPUT, RC)
37613759
integer, pointer :: jms(:) => null()
37623760
type (ESMF_VM) :: VM
37633761
type (ESMF_DistGrid) :: distGrid
3764-
integer :: IM, JM, DIMS(3)
37653762

37663763
#define MAX_HALOTYPES 8
37673764
type HaloType
@@ -3771,18 +3768,14 @@ SUBROUTINE ESMFL_HALO_R4_2D(GRID, INPUT, RC)
37713768
integer :: NY = -1
37723769
integer :: domainIdx = -1
37733770
integer :: myId
3774-
logical :: isCube = .false.
37753771
logical :: inUse = .false.
37763772
end type HaloType
37773773

37783774
type(HaloType), save :: myHaloTypes(MAX_HALOTYPES)
37793775
type(HaloType) :: thisHaloType
37803776
logical :: found
37813777
integer :: I
3782-
integer :: isd, ied
3783-
integer :: jsd, jed
37843778
character(len=ESMF_MAXSTR) :: gridname
3785-
class (AbstractGridFactory), pointer :: factory
37863779
call ESMF_GridGet (GRID, name=gridname, RC=STATUS)
37873780
_VERIFY(STATUS)
37883781

@@ -3854,38 +3847,10 @@ SUBROUTINE ESMFL_HALO_R4_2D(GRID, INPUT, RC)
38543847
thisHaloType%NY = NY
38553848
thisHaloType%layout = layout
38563849

3857-
call MAPL_GridGet(grid, globalCellCountPerDim=DIMS, RC=status)
3858-
_VERIFY(STATUS)
3859-
IM = DIMS(1)
3860-
JM = DIMS(2)
3861-
if (JM == 6*IM) then
3862-
thisHaloType%isCube = .true.
3863-
else
3864-
thisHaloType%isCube = .false.
3865-
end if
3866-
38673850
myHaloTypes(thisHaloType%domainIdx) = thisHaloType
38683851

38693852
end if
38703853

3871-
if (thisHaloType%isCube) then
3872-
factory => get_factory(grid, rc=status)
3873-
_VERIFY(status)
3874-
isd = lbound(input,1)
3875-
ied = ubound(input,1)
3876-
jsd = lbound(input,2)
3877-
jed = ubound(input,2)
3878-
! fill the corners with MAPL_UNDEF, they will be overwritten
3879-
! by the CubeHalo, unless these are the actual cube corners
3880-
input(isd,jsd) = MAPL_UNDEF
3881-
input(ied,jsd) = MAPL_UNDEF
3882-
input(isd,jed) = MAPL_UNDEF
3883-
input(ied,jed) = MAPL_UNDEF
3884-
call factory%halo(input, rc=status)
3885-
_VERIFY(status)
3886-
_RETURN(ESMF_SUCCESS)
3887-
end if
3888-
38893854
! This is section of the code is valid ONLY for rectilinear grids!
38903855

38913856
NX = thisHaloType%NX

base/FileMetadataUtilities.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
module MAPL_FileMetadataUtilsMod
44
use pFIO
5-
use MAPL_GridManagerMod
6-
use MAPL_AbstractGridFactoryMod
75
use Mapl_keywordenforcermod
86
use gFTL2_StringIntegerMap
97
use ESMF

base/Grid_Use_Cases.txt

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

0 commit comments

Comments
 (0)