Skip to content

Commit ed0ca76

Browse files
authored
Clean up base/: delete dead code, migrate FileMetadataUtils to base3g, fix stale tests (refs #4884) (#4885)
* Delete TimeStringConversion; replace callers with ESMF_TimeSet/mapl_HConfigAsTimeInterval (refs #4884) * Delete getrss.c, memuse.c, ServerManager.F90; move Python files to Apps/; remove obsolete OS guards (refs #4884) * Delete MAPL_ESMFTimeVectorMod, MAPL_VerticalInterpMod, MAPL_VerticalMethods; remove dead imports (refs #4884) * Remove vestigial MAPL.base dependency from MAPL.gridcomps (refs #4884) * Move FileMetadataUtilities and FileMetadataUtilitiesVector from base/ to base3g/ (refs #4884) * Replace MAPL.base with MAPL.base3g in GeomIO, vertical, ExtData3G, Regrid_Util.x; use mapl_base3g in MAPL2 (refs #4884) * Migrate base/tests: move sort/DirPath to shared/tests, delete stale/deleted tests (refs #4884) * Add HConfigAsTimeRange and string_to_esmf_time; fix valid_range/source_time parsing in ExtData3G (refs #4884) - Add private string_to_esmf_time helper: robustly parses YYYY-MM-DD and YYYY-MM-DDThh:mm:ss without relying on ESMF_TimeSet(timeString=) - Fix as_time/iter_as_time to use string_to_esmf_time (fixes date-only strings) - Add HConfigAsTimeRange interface (as_timerange/iter_as_timerange): reads HConfig string, splits on '/' using scan(), returns ESMF_Time array of size 2 - Use scan() instead of index() intrinsic to avoid shadowing by dummy arg 'index' - Export mapl_HConfigAsTimeRange from hconfig/API.F90 - ExtDataCollection: use mapl_HConfigAsTimeRange for valid_range key - ExtDataSample: use mapl_HConfigAsTimeRange for source_time key - Add unit tests for HConfigAsTime (with T, date-only) and HConfigAsTimeRange * Fix Test_HConfigAs: split semicolon-separated @assertEqual onto separate lines (refs #4884) pFUnit preprocessor does not support multiple @Assert macros on one line separated by semicolons. * Store ExtDataRule%start_time as ESMF_Time; parse via mapl_HConfigAsTime (refs #4884) - Change ExtDataRule%start_time from character(:) to type(ESMF_Time), allocatable - Parse 'starting' key with mapl_HConfigAsTime in new_ExtDataRule, which robustly handles date-only strings like '2008-01-01' (valid ISO 8601 but rejected by ESMF_TimeSet(timeString=)) - ExtDataConfig/sort_rules_by_start: use mapl_HConfigAsTime directly, drop string intermediary and ESMF_TimeSet(timeString=) call - ExtDataConfig/get_time_range: work with ESMF_Time array instead of StringVector, drop ESMF_TimeSet(timeString=) calls - Add MAPL.hconfig to ExtData3G link dependencies - string_to_esmf_time remains private to mapl3g_HConfigAs
1 parent a6d5ead commit ed0ca76

41 files changed

Lines changed: 245 additions & 2033 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Apps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ install(
3333
DESTINATION bin/forcing_converter)
3434

3535
ecbuild_add_executable (TARGET Regrid_Util.x SOURCES Regrid_Util/Regrid_Util.F90)
36-
target_link_libraries (Regrid_Util.x PRIVATE MAPL MAPL.base MAPL.profiler MPI::MPI_Fortran ESMF::ESMF OpenMP::OpenMP_Fortran)
36+
target_link_libraries (Regrid_Util.x PRIVATE MAPL MAPL.base3g MAPL.profiler MPI::MPI_Fortran ESMF::ESMF OpenMP::OpenMP_Fortran)
3737
target_include_directories (Regrid_Util.x PRIVATE $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
3838

3939
if (PFUNIT_FOUND)
File renamed without changes.
File renamed without changes.

GeomIO/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(srcs
1717

1818
esma_add_library(${this}
1919
SRCS ${srcs}
20-
DEPENDENCIES MAPL.field MAPL.field_bundle MAPL.geom MAPL.pfio MAPL.base MAPL.shared MAPL.esmf_utils MAPL.hconfig_utils MAPL.regridder_mgr GFTL::gftl-v2 MAPL.base
20+
DEPENDENCIES MAPL.field MAPL.field_bundle MAPL.geom MAPL.pfio MAPL.base3g MAPL.shared MAPL.esmf_utils MAPL.hconfig_utils MAPL.regridder_mgr GFTL::gftl-v2
2121
TYPE SHARED
2222
)
2323

GeomIO/FieldBundleWrite.F90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
module mapl3g_FieldBundleWrite
33
use ESMF
44
use pFIO
5-
use MAPL_VerticalDataMod
65
use pFIO_ClientManagerMod, only: o_Clients
76
use MAPL_ExceptionHandling
87
use mapl3g_GeomPFIO

MAPL/MAPL.F90

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
module MAPL2
44
use MAPL_ExceptionHandling
55
use MAPL_ShmemMod
6-
use MAPL_MemUtilsMod
6+
use mapl_base3g
77
use MAPL_SimpleBundleMod
8-
use MAPL_ServerManager
9-
use MAPL_FileMetadataUtilsMod
10-
use MAPL_VerticalDataMod
118
use pFIO
129
use MAPL_GridCompsMod
1310
use mapl3g_OpenMP_Support, only : MAPL_get_current_thread => get_current_thread

base/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
esma_set_this (OVERRIDE MAPL.base)
22

33
set (srcs
4-
FileMetadataUtilities.F90
5-
FileMetadataUtilitiesVector.F90 SimpleBundleMod.F90
6-
MAPL_ESMFTimeVectorMod.F90
7-
MAPL_VerticalInterpMod.F90
8-
MAPL_VerticalMethods.F90
9-
ServerManager.F90
10-
getrss.c memuse.c
11-
TimeStringConversion.F90
4+
SimpleBundleMod.F90
125
)
136

147
# Comms.F90, StringTemplate.F90, SatVapor.F90 have been moved to base3g/

base/MAPL_ESMFTimeVectorMod.F90

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

0 commit comments

Comments
 (0)