Skip to content

Fix regression test key and GWD/held-suarez regression cleanup #1497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pchakraborty merged 4 commits into from
Aug 11, 2026
Merged

Fix regression test key and GWD/held-suarez regression cleanup #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f796ca4
Fix regression test key: setservice -> setservices
pchakraborty Aug 8, 2026
1ceb49e
Fix regression test key: setservice -> setservices
pchakraborty Aug 8, 2026
e2f00fe
fix(gwd/regression): use copy_restarts helper and enable expdir cleanup
pchakraborty Aug 11, 2026
f7b7a91
held-suarez regression: replace execute_process with file(REMOVE_RECU…
pchakraborty Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
run_case(${TEST_CASE} ${REGRESSION_DATA_DIR})
2 changes: 1 addition & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cap:
Root:
dso: libconfigurable_gridcomp
config_file: root.yaml
setservice: setservices_
setservices: setservices_

checkpointing:
enabled: true
Expand Down
4 changes: 2 additions & 2 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,19 @@ 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})
message(STATUS "Regression data not found for ${case_name}: ${root_dir} -- skipping")
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})
Loading