From f796ca4391d9983c71fa175e8c4bc4e71db0407a Mon Sep 17 00:00:00 2001 From: Purnendu Chakraborty Date: Sat, 8 Aug 2026 08:25:11 -0400 Subject: [PATCH 1/4] Fix regression test key: setservice -> setservices parse_child in MAPL's ComponentSpecParser previously matched a truncated 'SetService' key due to a string-length bug (fixed in GEOS-ESM/MAPL#5307). These regression yamls were written to match that truncated key and need the trailing 's' restored now that the parser correctly requires the full 'setservices' key. --- .../GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml | 2 +- .../GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml index 08ba71087..4748f9ad7 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml @@ -17,7 +17,7 @@ cap: Root: dso: libconfigurable_gridcomp config_file: root.yaml - setservice: setservices_ + setservices: setservices_ checkpointing: enabled: true diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml index 352716730..3a5976ff6 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml @@ -19,12 +19,12 @@ mapl: GWD: dso: libGEOSgwd_GridComp.so config_file: gwd.yaml - setservice: gwd_setservices_ + setservices: gwd_setservices_ DataGwdImports: dso: libconfigurable_gridcomp config_file: data-gwd-imports.yaml - setservice: setservices_ + setservices: setservices_ connections: - src_name: PLE From 1ceb49e67138096969a4a3f51f0fcd3d73934893 Mon Sep 17 00:00:00 2001 From: Purnendu Chakraborty Date: Sat, 8 Aug 2026 08:32:08 -0400 Subject: [PATCH 2/4] Fix regression test key: setservice -> setservices parse_child in MAPL's ComponentSpecParser previously matched a truncated 'SetService' key due to a string-length bug (fixed in GEOS-ESM/MAPL#5307). These regression yamls were written to match that truncated key and need the trailing 's' restored now that the parser correctly requires the full 'setservices' key. --- .../GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml index 7195ad6ba..1dc400958 100644 --- a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml +++ b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml @@ -8,12 +8,12 @@ mapl: DataMoist: dso: libconfigurable_gridcomp config_file: data-moist.yaml - setservice: setservices_ + setservices: setservices_ DataAna: dso: libconfigurable_gridcomp config_file: data-ana.yaml - setservice: setservices_ + setservices: setservices_ connections: - src_name: TRADV From e2f00fea6683b67404debf6f9dc16be2d8eaa947 Mon Sep 17 00:00:00 2001 From: Purnendu Chakraborty Date: Tue, 11 Aug 2026 13:34:17 -0400 Subject: [PATCH 3/4] fix(gwd/regression): use copy_restarts helper and enable expdir cleanup --- .../GEOSgwd_GridComp/regression/run_case.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake index 0c7683f60..8c495a6d6 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake @@ -9,8 +9,6 @@ function(run_case case_name regression_data_dir) set(root_dir ${regression_data_dir}/${case_name}) set(num_procs "6") - set(start_date_time "1891-03-01T00:00:00") - set(restart_dir ${root_dir}/checkpoints/${start_date_time}) set(checkpoints_dir ${root_dir}/checkpoints/last) if(NOT EXISTS ${root_dir}) @@ -18,14 +16,12 @@ function(run_case case_name regression_data_dir) return() endif() - copy_directory(${restart_dir} ${expdir}/checkpoints/${start_date_time}) + copy_restarts(${root_dir} ${expdir}) copy_file(${regression_data_dir}/newmfspectra40_dc25.nc ${expdir}) run_geos(${num_procs} ${case_name} ${expdir}) compare_results(${checkpoints_dir} ${expdir}/checkpoints/last) - # execute_process( - # COMMAND ${CMAKE_COMMAND} -E rm -rf ${expdir} - # ) + file(REMOVE_RECURSE ${expdir}) endfunction() run_case(${TEST_CASE} ${REGRESSION_DATA_DIR}) From f7b7a9189a8eb3bb07b72c73c0034549cfcc5a00 Mon Sep 17 00:00:00 2001 From: Purnendu Chakraborty Date: Tue, 11 Aug 2026 13:40:38 -0400 Subject: [PATCH 4/4] held-suarez regression: replace execute_process with file(REMOVE_RECURSE) --- GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake b/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake index 6db4c1d92..451268710 100644 --- a/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake +++ b/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake @@ -17,9 +17,7 @@ function(run_case case_name regression_data_dir) compare_results(${checkpoints_dir} ${expdir}/checkpoints/last) endif() - # execute_process( - # COMMAND ${CMAKE_COMMAND} -E rm -rf ${expdir} - # ) + file(REMOVE_RECURSE ${expdir}) endfunction() -run_case(${TEST_CASE} ${REGRESSION_DATA_DIR}) \ No newline at end of file +run_case(${TEST_CASE} ${REGRESSION_DATA_DIR})