diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml
index 8cb7a530538..ac0465f1b22 100644
--- a/cime_config/config_archive.xml
+++ b/cime_config/config_archive.xml
@@ -26,10 +26,9 @@
- r\.(INSTANT|AVERAGE|MAX|MIN)\.n(step|sec|min|hour|day|month|year)s_x\d*
- rhist\.(INSTANT|AVERAGE|MAX|MIN)\.n(step|sec|min|hour|day|month|year)s_x\d*
-
- .*\.h\.(?!rhist\.).*\.nc$
+ r
+ rh
+ h
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/diags/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/diags/shell_commands
index 54bbf0aba64..39744f55920 100644
--- a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/diags/shell_commands
+++ b/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/diags/shell_commands
@@ -29,7 +29,7 @@ $YAML_EDIT_SCRIPT -g \
--avg-type INSTANT \
--freq HIST_N \
--freq-units HIST_OPTION \
- --prefix ${CASE}.scream.diags.h \
+ --prefix ${CASE}.scream.diags \
--grid "Physics ${PGTYPE}" \
--fields ${FIELDS}
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys/shell_commands
index e327f4d0336..973a271a451 100644
--- a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys/shell_commands
+++ b/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys/shell_commands
@@ -26,7 +26,7 @@ $YAML_EDIT_SCRIPT -g \
--avg-type INSTANT \
--freq HIST_N \
--freq-units HIST_OPTION \
- --prefix ${CASE}.scream.phys.h \
+ --prefix ${CASE}.scream.phys \
--grid "Physics ${PGTYPE}" \
--fields ${FIELDS}
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys_dyn/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys_dyn/shell_commands
index c20a77d30d5..445e1062f6f 100644
--- a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys_dyn/shell_commands
+++ b/components/eamxx/cime_config/testdefs/testmods_dirs/scream/output/phys_dyn/shell_commands
@@ -26,7 +26,7 @@ $YAML_EDIT_SCRIPT -g \
--avg-type INSTANT \
--freq HIST_N \
--freq-units HIST_OPTION \
- --prefix ${CASE}.scream.phys_dyn.h \
+ --prefix ${CASE}.scream.phys_dyn \
--grid Dynamics \
--io-grid 'Physics GLL' \
--fields ${FIELDS}
diff --git a/components/eamxx/src/share/io/scream_io_file_specs.hpp b/components/eamxx/src/share/io/scream_io_file_specs.hpp
index ec0e2f50d79..2b29521c175 100644
--- a/components/eamxx/src/share/io/scream_io_file_specs.hpp
+++ b/components/eamxx/src/share/io/scream_io_file_specs.hpp
@@ -100,11 +100,11 @@ struct IOFileSpecs {
std::string suffix () const {
if (ftype==FileType::HistoryRestart)
- return ".rhist";
+ return ".rh";
else if (ftype==FileType::ModelRestart)
return ".r";
else
- return "";
+ return ".h";
}
void close () {
diff --git a/components/eamxx/src/share/io/scream_io_utils.cpp b/components/eamxx/src/share/io/scream_io_utils.cpp
index 2d5e0a840d0..550d135a284 100644
--- a/components/eamxx/src/share/io/scream_io_utils.cpp
+++ b/components/eamxx/src/share/io/scream_io_utils.cpp
@@ -20,7 +20,7 @@ std::string find_filename_in_rpointer (
std::string filename;
bool found = false;
std::string content;
- std::string suffix = model_restart ? ".r." : ".rhist.";
+ std::string suffix = model_restart ? ".r." : ".rh.";
std::string pattern_str = filename_prefix + suffix;
// The AD will pass a default constructed control, since it doesn't know the values
diff --git a/components/eamxx/src/share/io/scream_output_manager.cpp b/components/eamxx/src/share/io/scream_output_manager.cpp
index 4f35827ba3f..547e6259dd3 100644
--- a/components/eamxx/src/share/io/scream_output_manager.cpp
+++ b/components/eamxx/src/share/io/scream_output_manager.cpp
@@ -394,7 +394,7 @@ void OutputManager::run(const util::TimeStamp& timestamp)
}
// If we are going to write an output checkpoint file, or a model restart file,
- // we need to append to the filename ".rhist" or ".r" respectively, and add
+ // we need to append to the filename ".rh" or ".r" respectively, and add
// the filename to the rpointer.atm file.
if (m_io_comm.am_i_root() and filespecs.is_restart_file()) {
std::ofstream rpointer;
diff --git a/components/eamxx/src/share/io/tests/CMakeLists.txt b/components/eamxx/src/share/io/tests/CMakeLists.txt
index 8c819f7896c..2b368c1b111 100644
--- a/components/eamxx/src/share/io/tests/CMakeLists.txt
+++ b/components/eamxx/src/share/io/tests/CMakeLists.txt
@@ -68,8 +68,8 @@ foreach (AVG_TYPE IN ITEMS INSTANT AVERAGE)
foreach (MPI_RANKS RANGE 1 ${SCREAM_TEST_MAX_RANKS})
CompareNCFiles (
TEST_NAME output_restart_check_${AVG_TYPE}_np${MPI_RANKS}
- SRC_FILE monolithic.${AVG_TYPE}.nsteps_x10.np${MPI_RANKS}.2000-01-01-00000.nc
- TGT_FILE restarted.${AVG_TYPE}.nsteps_x10.np${MPI_RANKS}.2000-01-01-00000.nc
+ SRC_FILE monolithic.h.${AVG_TYPE}.nsteps_x10.np${MPI_RANKS}.2000-01-01-00000.nc
+ TGT_FILE restarted.h.${AVG_TYPE}.nsteps_x10.np${MPI_RANKS}.2000-01-01-00000.nc
LABELS io
FIXTURES_REQUIRED restart_check_setup_np${MPI_RANKS}_omp1
)
diff --git a/components/eamxx/src/share/io/tests/io_basic.cpp b/components/eamxx/src/share/io/tests/io_basic.cpp
index 033705a4dd4..bbd7a6d78b1 100644
--- a/components/eamxx/src/share/io/tests/io_basic.cpp
+++ b/components/eamxx/src/share/io/tests/io_basic.cpp
@@ -211,7 +211,7 @@ void read (const std::string& avg_type, const std::string& freq_units,
// Create reader pl
ekat::ParameterList reader_pl;
std::string casename = "io_basic";
- auto filename = casename
+ auto filename = casename + ".h"
+ "." + avg_type
+ "." + freq_units
+ "_x" + std::to_string(freq)
diff --git a/components/eamxx/src/share/io/tests/io_diags.cpp b/components/eamxx/src/share/io/tests/io_diags.cpp
index f4658c8fdfa..1fcc584f6ef 100644
--- a/components/eamxx/src/share/io/tests/io_diags.cpp
+++ b/components/eamxx/src/share/io/tests/io_diags.cpp
@@ -246,7 +246,7 @@ void read (const int seed, const ekat::Comm& comm)
// Create reader pl
ekat::ParameterList reader_pl;
std::string casename = "io_diags";
- auto filename = casename
+ auto filename = casename + ".h"
+ ".INSTANT.nsteps_x1"
+ ".np" + std::to_string(comm.size())
+ "." + t0.to_string()
diff --git a/components/eamxx/src/share/io/tests/io_filled.cpp b/components/eamxx/src/share/io/tests/io_filled.cpp
index 5af906aba64..e078931c148 100644
--- a/components/eamxx/src/share/io/tests/io_filled.cpp
+++ b/components/eamxx/src/share/io/tests/io_filled.cpp
@@ -193,7 +193,7 @@ void read (const std::string& avg_type, const std::string& freq_units,
// Create reader pl
ekat::ParameterList reader_pl;
std::string casename = "io_filled";
- auto filename = casename
+ auto filename = casename + ".h"
+ "." + avg_type
+ "." + freq_units
+ "_x" + std::to_string(freq)
diff --git a/components/eamxx/src/share/io/tests/io_monthly.cpp b/components/eamxx/src/share/io/tests/io_monthly.cpp
index 225924f3c5f..9e9fd6f2638 100644
--- a/components/eamxx/src/share/io/tests/io_monthly.cpp
+++ b/components/eamxx/src/share/io/tests/io_monthly.cpp
@@ -178,7 +178,7 @@ void read (const int seed, const ekat::Comm& comm)
// Get filename from timestamp
std::string casename = "io_monthly";
auto get_filename = [&](const util::TimeStamp& t) {
- std::string fname = casename
+ std::string fname = casename + ".h"
+ ".INSTANT.nsteps_x1"
+ ".np" + std::to_string(comm.size())
+ "." + std::to_string(t.get_year())
diff --git a/components/eamxx/src/share/io/tests/io_packed.cpp b/components/eamxx/src/share/io/tests/io_packed.cpp
index 08182b8e6ac..c79f9dae2c2 100644
--- a/components/eamxx/src/share/io/tests/io_packed.cpp
+++ b/components/eamxx/src/share/io/tests/io_packed.cpp
@@ -155,7 +155,7 @@ void read (const int freq, const int seed, const int ps_write, const int ps_read
// Create reader pl
ekat::ParameterList reader_pl;
std::string casename = "io_packed_ps"+std::to_string(ps_write);
- auto filename = casename
+ auto filename = casename + ".h"
+ ".INSTANT.nsteps"
+ "_x" + std::to_string(freq)
+ ".np" + std::to_string(comm.size())
diff --git a/components/eamxx/src/share/io/tests/io_remap_test.cpp b/components/eamxx/src/share/io/tests/io_remap_test.cpp
index 96b2f3e2805..93126442a9d 100644
--- a/components/eamxx/src/share/io/tests/io_remap_test.cpp
+++ b/components/eamxx/src/share/io/tests/io_remap_test.cpp
@@ -707,7 +707,7 @@ ekat::ParameterList set_input_params(const std::string& name, ekat::Comm& comm,
{
using vos_type = std::vector;
ekat::ParameterList in_params("Input Parameters");
- std::string filename = name + ".INSTANT.nsteps_x1.np" + std::to_string(comm.size()) + "." + tstamp + ".nc";
+ std::string filename = name + ".h.INSTANT.nsteps_x1.np" + std::to_string(comm.size()) + "." + tstamp + ".nc";
in_params.set("Filename",filename);
vos_type fields_in = {"Y_flat", "Y_mid", "Y_int", "V_mid", "V_int"};
if (p_ref>=0) {
diff --git a/components/eamxx/src/share/io/tests/io_se_grid.cpp b/components/eamxx/src/share/io/tests/io_se_grid.cpp
index 36acf2a833c..f68f68f7d90 100644
--- a/components/eamxx/src/share/io/tests/io_se_grid.cpp
+++ b/components/eamxx/src/share/io/tests/io_se_grid.cpp
@@ -173,7 +173,7 @@ ekat::ParameterList get_in_params(const ekat::Comm& comm,
using vos_type = std::vector;
ekat::ParameterList in_params("Input Parameters");
- std::string filename = "io_se_grid.INSTANT.nsteps_x1.np"
+ std::string filename = "io_se_grid.h.INSTANT.nsteps_x1.np"
+ std::to_string(comm.size())
+ "." + t0.to_string() + ".nc";
diff --git a/components/eamxx/src/share/io/tests/io_utils.cpp b/components/eamxx/src/share/io/tests/io_utils.cpp
index 0c76210bb02..803e327ee74 100644
--- a/components/eamxx/src/share/io/tests/io_utils.cpp
+++ b/components/eamxx/src/share/io/tests/io_utils.cpp
@@ -27,8 +27,8 @@ TEST_CASE ("find_filename_in_rpointer") {
std::string suffix = ".np" + std::to_string(comm.size()) + "." + t0.to_string() + ".nc";
std::string foo_fname = "foo.r.INSTANT.nsteps_x3" + suffix;
- std::string bar_fname = "bar.h.r.AVERAGE.ndays_x1" + suffix;
- std::string bar2_fname = "bar.h.r.AVERAGE.nhours_x6" + suffix;
+ std::string bar_fname = "bar.rh.AVERAGE.ndays_x1" + suffix;
+ std::string bar2_fname = "bar.rh.AVERAGE.nhours_x6" + suffix;
rpointer << foo_fname<< "\n";
rpointer << bar_fname<< "\n";
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_mam4xx_pg2/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/homme_mam4xx_pg2/CMakeLists.txt
index 9463333ce39..ef69f1d4009 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/homme_mam4xx_pg2/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/homme_mam4xx_pg2/CMakeLists.txt
@@ -80,7 +80,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics mam4xx
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -89,6 +89,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp/CMakeLists.txt
index 22acf3d88a4..0df88d6001e 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp/CMakeLists.txt
@@ -74,7 +74,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics shoc cld p3 rrtmgp
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -83,6 +83,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/CMakeLists.txt
index 52dcc3a47ac..1642615537d 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/CMakeLists.txt
@@ -79,7 +79,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics tms shoc cld p3 rrtmgp pg2
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -88,6 +88,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp/CMakeLists.txt
index 6308e279411..c4b166fac97 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp/CMakeLists.txt
@@ -81,7 +81,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics shoc cld p3 rrtmgp spa
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -90,6 +90,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_128levels/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_128levels/CMakeLists.txt
index fe528226585..3970a434c33 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_128levels/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_128levels/CMakeLists.txt
@@ -80,7 +80,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics shoc cld p3 rrtmgp spa
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -89,7 +89,7 @@ CompareNCFilesFamilyMpi (
# Check tendency calculation
foreach (NRANKS RANGE ${TEST_RANK_START} ${TEST_RANK_END})
set (script ${SCREAM_BASE_DIR}/scripts/check-tendencies)
- set (fname ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${NRANKS}.${RUN_T0}.nc)
+ set (fname ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${NRANKS}.${RUN_T0}.nc)
set (tname ${TEST_BASE_NAME}_tend_check_np${NRANKS})
add_test (NAME ${tname}
COMMAND ${script} -f ${fname} -v qv T_mid -t EAMxx_qv_tend EAMxx_T_mid_tend
@@ -102,6 +102,6 @@ endforeach()
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/CMakeLists.txt
index f56d8beefa6..0f8461537ca 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/CMakeLists.txt
@@ -83,7 +83,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics tms shoc cld spa p3 rrtmgp dp pg2
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -92,6 +92,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/CMakeLists.txt
index e3c562cfcd1..4112765a23a 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/CMakeLists.txt
@@ -95,7 +95,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics shoc cld p3 rrtmgp mam4_optics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -104,6 +104,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/CMakeLists.txt
index 024aa833df3..8bfff289380 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/CMakeLists.txt
@@ -95,7 +95,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics shoc cld p3 rrtmgp mam4_optics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -104,6 +104,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt
index 41a915b9265..89da3f90adc 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt
@@ -81,7 +81,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics physics shoc cld p3 rrtmgp spa mam4_wetscav
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -90,6 +90,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/model_restart/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/model_restart/CMakeLists.txt
index 5645a9383a7..3d0a14eac83 100644
--- a/components/eamxx/tests/multi-process/dynamics_physics/model_restart/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/dynamics_physics/model_restart/CMakeLists.txt
@@ -45,8 +45,8 @@ CreateUnitTestFromExec(model_restart model_restart
# Finally, compare the nc outputs generated by the basline and restarted runs
# IMPORTANT: make sure these file names match what baseline/restarted runs produce
-set (SRC_FILE model_output_baseline.AVERAGE.nmins_x1.np${SCREAM_TEST_MAX_RANKS}.${CASE_T0}.nc)
-set (TGT_FILE model_output.AVERAGE.nmins_x1.np${SCREAM_TEST_MAX_RANKS}.${CASE_T0}.nc)
+set (SRC_FILE model_output_baseline.h.AVERAGE.nmins_x1.np${SCREAM_TEST_MAX_RANKS}.${CASE_T0}.nc)
+set (TGT_FILE model_output.h.AVERAGE.nmins_x1.np${SCREAM_TEST_MAX_RANKS}.${CASE_T0}.nc)
add_test (NAME restarted_vs_monolithic_check_np${SCREAM_TEST_MAX_RANKS}
COMMAND cmake -P ${CMAKE_BINARY_DIR}/bin/CprncTest.cmake ${SRC_FILE} ${TGT_FILE}
diff --git a/components/eamxx/tests/multi-process/physics_only/atm_proc_subcycling/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/atm_proc_subcycling/CMakeLists.txt
index 71fe2a5f43c..7e3c451cbf4 100644
--- a/components/eamxx/tests/multi-process/physics_only/atm_proc_subcycling/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/atm_proc_subcycling/CMakeLists.txt
@@ -45,8 +45,8 @@ CreateUnitTestFromExec (shoc_p3_monolithic shoc_p3
include (BuildCprnc)
BuildCprnc()
-set (SRC_FILE "shoc_p3_monolithic.INSTANT.nsteps_x3.np1.${RUN_T0}.nc")
-set (TGT_FILE "shoc_p3_subcycled.INSTANT.nsteps_x1.np1.${RUN_T0}.nc")
+set (SRC_FILE "shoc_p3_monolithic.h.INSTANT.nsteps_x3.np1.${RUN_T0}.nc")
+set (TGT_FILE "shoc_p3_subcycled.h.INSTANT.nsteps_x1.np1.${RUN_T0}.nc")
set (TEST_NAME check_subcycling)
add_test (NAME ${TEST_NAME}
COMMAND cmake -P ${CMAKE_BINARY_DIR}/bin/CprncTest.cmake ${SRC_FILE} ${TGT_FILE}
@@ -57,7 +57,7 @@ set_tests_properties(${TEST_NAME} PROPERTIES
# Check calculation of shoc tendencies when the parent group is subcycled
set (script ${SCREAM_BASE_DIR}/scripts/check-tendencies)
-set (fname shoc_p3_tend_subcycled.INSTANT.nsteps_x1.np1.${RUN_T0}.nc)
+set (fname shoc_p3_tend_subcycled.h.INSTANT.nsteps_x1.np1.${RUN_T0}.nc)
add_test (NAME ${TEST_NAME}_tend_check
COMMAND ${script} -f ${fname} -v tke -t shoc_tke_tend
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/mam4_srf_online_emiss_mam4_constituent_fluxes/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/mam4_srf_online_emiss_mam4_constituent_fluxes/CMakeLists.txt
index 886936ca084..b1f50a704bc 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/mam4_srf_online_emiss_mam4_constituent_fluxes/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/mam4_srf_online_emiss_mam4_constituent_fluxes/CMakeLists.txt
@@ -46,7 +46,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS physics mam4_srf_online_emiss mam4_constituent_fluxes
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/optics_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/optics_rrtmgp/CMakeLists.txt
index 14e7a94e5c2..279b829f4a7 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/optics_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/optics_rrtmgp/CMakeLists.txt
@@ -50,7 +50,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS rrtmgp mam4_optics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/p3_mam4_wetscav/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/p3_mam4_wetscav/CMakeLists.txt
index 7e13932e063..abd21a51f10 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/p3_mam4_wetscav/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/p3_mam4_wetscav/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS p3 physics mam4_wetscav
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3/CMakeLists.txt
index 856ef3ca162..ab2bb384816 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc cld p3 physics PEM mam4_aci
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_mam4_optics_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_mam4_optics_rrtmgp/CMakeLists.txt
index 3f9aeae73fd..51caa38af75 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_mam4_optics_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_mam4_optics_rrtmgp/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc cld p3 rrtmgp physics PEM mam4_aci
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_rrtmgp/CMakeLists.txt
index cdd564c73a8..f1cc9df3d49 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_rrtmgp/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc cld p3 rrtmgp physics PEM mam4_aci
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_p3_wetscav/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_p3_wetscav/CMakeLists.txt
index b5a6be819ce..a8fc4310933 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_p3_wetscav/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_p3_wetscav/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc cld p3 physics PEM mam4_wetscav
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_aci/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_aci/CMakeLists.txt
index 69a154223fd..c8107da5519 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_aci/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_aci/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc physics mam4_aci
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_drydep/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_drydep/CMakeLists.txt
index 9f6fb8733c2..93ccfab114e 100644
--- a/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_drydep/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_drydep/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc physics mam4_drydep
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/shoc_cld_p3_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/shoc_cld_p3_rrtmgp/CMakeLists.txt
index bb5f9c367d9..0cbd93b5d9b 100644
--- a/components/eamxx/tests/multi-process/physics_only/shoc_cld_p3_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/shoc_cld_p3_rrtmgp/CMakeLists.txt
@@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc cld p3 rrtmgp physics PEM
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/shoc_cld_spa_p3_rrtmgp/CMakeLists.txt b/components/eamxx/tests/multi-process/physics_only/shoc_cld_spa_p3_rrtmgp/CMakeLists.txt
index 799010ad10b..0831343c6a3 100644
--- a/components/eamxx/tests/multi-process/physics_only/shoc_cld_spa_p3_rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/multi-process/physics_only/shoc_cld_spa_p3_rrtmgp/CMakeLists.txt
@@ -41,7 +41,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS shoc cld p3 rrtmgp physics spa
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
diff --git a/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging.yaml b/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging.yaml
index 6a4c0003376..1627b133f1c 100644
--- a/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging.yaml
+++ b/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging.yaml
@@ -14,7 +14,7 @@ atmosphere_processes:
p3:
max_total_ni: 720.0e3
nudging:
- nudging_filenames_patterns: [shoc_p3_source_data_${POSTFIX}.INSTANT.nsteps_x${NUM_STEPS}.np1.${RUN_T0}.nc]
+ nudging_filenames_patterns: [shoc_p3_source_data_${POSTFIX}.h.INSTANT.nsteps_x${NUM_STEPS}.np1.${RUN_T0}.nc]
nudging_fields: ["T_mid", "qv"]
nudging_timescale: 1000
use_nudging_weights: true
diff --git a/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging_glob_novert.yaml b/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging_glob_novert.yaml
index 35d75015e2a..20c75b07c68 100644
--- a/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging_glob_novert.yaml
+++ b/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging_glob_novert.yaml
@@ -14,7 +14,7 @@ atmosphere_processes:
p3:
max_total_ni: 720.0e3
nudging:
- nudging_filenames_patterns: [./shoc_p3_source_data_nudged.INSTANT.nsteps_x*.nc]
+ nudging_filenames_patterns: [./shoc_p3_source_data_nudged.h.INSTANT.nsteps_x*.nc]
nudging_fields: ["T_mid", "qv"]
nudging_timescale: 1000
use_nudging_weights: true
diff --git a/components/eamxx/tests/single-process/cosp/CMakeLists.txt b/components/eamxx/tests/single-process/cosp/CMakeLists.txt
index 6de9f09b2cd..8b0625b35a5 100644
--- a/components/eamxx/tests/single-process/cosp/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/cosp/CMakeLists.txt
@@ -29,6 +29,6 @@ if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: for other tests we do np1-vs-npX bfb tests, which is why one is enough.
# COSP, is not bfb w.r.t. num ranks though. Still, we only check 1 output files against baselines
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/homme/CMakeLists.txt b/components/eamxx/tests/single-process/homme/CMakeLists.txt
index f1c28036782..6a2823f0471 100644
--- a/components/eamxx/tests/single-process/homme/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/homme/CMakeLists.txt
@@ -72,7 +72,7 @@ CreateRange(MpiRanks ${TEST_RANK_START} ${TEST_RANK_END})
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS dynamics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -81,6 +81,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt b/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt
index 490dc389d95..fd5249ebfe9 100644
--- a/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt
@@ -31,7 +31,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS mam4_aci physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -40,6 +40,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/mam/constituent_fluxes/CMakeLists.txt b/components/eamxx/tests/single-process/mam/constituent_fluxes/CMakeLists.txt
index 2615f152b26..f86380fbd94 100644
--- a/components/eamxx/tests/single-process/mam/constituent_fluxes/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/mam/constituent_fluxes/CMakeLists.txt
@@ -30,7 +30,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS mam4_constituent_fluxes physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -39,6 +39,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/mam/drydep/CMakeLists.txt b/components/eamxx/tests/single-process/mam/drydep/CMakeLists.txt
index d05e6823642..4932d83e4e5 100644
--- a/components/eamxx/tests/single-process/mam/drydep/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/mam/drydep/CMakeLists.txt
@@ -31,7 +31,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS mam4_drydep physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -40,7 +40,7 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/mam/emissions/CMakeLists.txt b/components/eamxx/tests/single-process/mam/emissions/CMakeLists.txt
index c8e690b929f..052ec159e3d 100644
--- a/components/eamxx/tests/single-process/mam/emissions/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/mam/emissions/CMakeLists.txt
@@ -46,7 +46,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS mam4_srf_online_emiss physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -55,6 +55,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/mam/optics/CMakeLists.txt b/components/eamxx/tests/single-process/mam/optics/CMakeLists.txt
index 0a3a0b877c5..be776a6d247 100644
--- a/components/eamxx/tests/single-process/mam/optics/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/mam/optics/CMakeLists.txt
@@ -51,7 +51,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x2.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x2.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS mam4_optics physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -60,6 +60,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x2.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x2.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/mam/wet_scav/CMakeLists.txt b/components/eamxx/tests/single-process/mam/wet_scav/CMakeLists.txt
index 3881df3e059..956b96b7e94 100644
--- a/components/eamxx/tests/single-process/mam/wet_scav/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/mam/wet_scav/CMakeLists.txt
@@ -29,7 +29,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS mam4_wetscav physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -38,6 +38,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/p3/CMakeLists.txt b/components/eamxx/tests/single-process/p3/CMakeLists.txt
index 969ed3a9da7..b2d02ad1c51 100644
--- a/components/eamxx/tests/single-process/p3/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/p3/CMakeLists.txt
@@ -30,7 +30,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS p3 physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -39,7 +39,7 @@ CompareNCFilesFamilyMpi (
# Check tendency calculation
foreach (NRANKS RANGE ${TEST_RANK_START} ${TEST_RANK_END})
set (script ${SCREAM_BASE_DIR}/scripts/check-tendencies)
- set (fname p3_standalone_output.INSTANT.nsteps_x1.np${NRANKS}.${RUN_T0}.nc)
+ set (fname p3_standalone_output.h.INSTANT.nsteps_x1.np${NRANKS}.${RUN_T0}.nc)
set (tname p3_tend_check_np${NRANKS})
add_test (NAME ${tname}
COMMAND ${script} -f ${fname} -v qc T_mid -t p3_qc_tend p3_T_mid_tend
@@ -52,6 +52,6 @@ endforeach()
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
diff --git a/components/eamxx/tests/single-process/rrtmgp/CMakeLists.txt b/components/eamxx/tests/single-process/rrtmgp/CMakeLists.txt
index 792d3946a4c..06809070934 100644
--- a/components/eamxx/tests/single-process/rrtmgp/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/rrtmgp/CMakeLists.txt
@@ -48,7 +48,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}_not_chunked
- FILE_META_NAME ${TEST_BASE_NAME}_output_not_chunked.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output_not_chunked.h.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS rrtmgp physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_not_chunked_npMPIRANKS_omp1
@@ -77,8 +77,8 @@ CreateUnitTestFromExec(
CompareNCFiles(
TEST_NAME ${TEST_BASE_NAME}_chunked_vs_not_chunked
- SRC_FILE ${TEST_BASE_NAME}_output_chunked.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc
- TGT_FILE ${TEST_BASE_NAME}_output_not_chunked.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc
+ SRC_FILE ${TEST_BASE_NAME}_output_chunked.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc
+ TGT_FILE ${TEST_BASE_NAME}_output_not_chunked.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc
LABELS rrtmgp physics
FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_chunked_np${TEST_RANK_END}_omp1
${FIXTURES_BASE_NAME}_not_chunked_np${TEST_RANK_END}_omp1)
@@ -87,6 +87,6 @@ if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX,
# and that chunked is bfb with not_chunked
- set (OUT_FILE ${TEST_BASE_NAME}_output_chunked.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output_chunked.h.INSTANT.nsteps_x${NUM_STEPS}.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME}_chunked ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME}_chunked)
endif()
diff --git a/components/eamxx/tests/single-process/shoc/CMakeLists.txt b/components/eamxx/tests/single-process/shoc/CMakeLists.txt
index bae7f719856..70ecf4ed7c7 100644
--- a/components/eamxx/tests/single-process/shoc/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/shoc/CMakeLists.txt
@@ -34,7 +34,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS spa physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -43,7 +43,7 @@ CompareNCFilesFamilyMpi (
# Check tendency calculation
foreach (NRANKS RANGE ${TEST_RANK_START} ${TEST_RANK_END})
set (script ${SCREAM_BASE_DIR}/scripts/check-tendencies)
- set (fname shoc_standalone_output.INSTANT.nsteps_x1.np${NRANKS}.${RUN_T0}.nc)
+ set (fname shoc_standalone_output.h.INSTANT.nsteps_x1.np${NRANKS}.${RUN_T0}.nc)
set (tname shoc_tend_check_np${NRANKS})
add_test (NAME ${tname}
COMMAND ${script} -f ${fname}
@@ -59,7 +59,7 @@ endforeach()
# components in all output NC files matches the content of corresponding components
# of the vector quantities
foreach (RANK RANGE ${TEST_RANK_START} ${TEST_RANK_END})
- set (nc_file shoc_standalone_output.INSTANT.nsteps_x1.np${RANK}.${RUN_T0}.nc)
+ set (nc_file shoc_standalone_output.h.INSTANT.nsteps_x1.np${RANK}.${RUN_T0}.nc)
add_test (NAME check_U_V_slices_np${RANK}
COMMAND ${SCREAM_BASE_DIR}/scripts/compare-nc-files
-s ${nc_file} -c "horiz_winds(:,:,1,:)=U(:,:,:)" "horiz_winds(:,:,2,:)=V(:,:,:)"
@@ -79,7 +79,7 @@ endforeach()
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()
@@ -88,7 +88,7 @@ endif()
################################
# These tests ensure that the compare-nc-files script doesn't always pass
-set (nc_file shoc_standalone_output.INSTANT.nsteps_x1.np${TEST_RANK_START}.${RUN_T0}.nc)
+set (nc_file shoc_standalone_output.h.INSTANT.nsteps_x1.np${TEST_RANK_START}.${RUN_T0}.nc)
# Legitimate diff
add_test (NAME check_U_V_slices_fail_diff
diff --git a/components/eamxx/tests/single-process/spa/CMakeLists.txt b/components/eamxx/tests/single-process/spa/CMakeLists.txt
index 8501f48224c..ecb9cc54d07 100644
--- a/components/eamxx/tests/single-process/spa/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/spa/CMakeLists.txt
@@ -37,7 +37,7 @@ include (CompareNCFiles)
CompareNCFilesFamilyMpi (
TEST_BASE_NAME ${TEST_BASE_NAME}
- FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
+ FILE_META_NAME ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.npMPIRANKS.${RUN_T0}.nc
MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
LABELS spa physics
META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
@@ -46,6 +46,6 @@ CompareNCFilesFamilyMpi (
if (SCREAM_ENABLE_BASELINE_TESTS)
# Compare one of the output files with the baselines.
# Note: one is enough, since we already check that np1 is BFB with npX
- set (OUT_FILE ${TEST_BASE_NAME}_output.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
+ set (OUT_FILE ${TEST_BASE_NAME}_output.h.INSTANT.nsteps_x1.np${TEST_RANK_END}.${RUN_T0}.nc)
CreateBaselineTest(${TEST_BASE_NAME} ${TEST_RANK_END} ${OUT_FILE} ${FIXTURES_BASE_NAME})
endif()