Merge Pull Request #2363 from E3SM-Project/scream/tcclevenger/remove_multiple_np_runs_restart_test

Automatically Merged using E3SM Pull Request AutoTester
PR Title: Only test np{SCREAM_TEST_MAX_RANKS} for model_restart
PR Author: tcclevenger

Author: E3SM-Bot

components/eamxx/tests/coupled/dynamics_physics/model_restart/CMakeLists.txt

@@ -18,12 +18,6 @@ set (NEED_LIBS cld_fraction shoc p3 scream_rrtmgp rrtmgp ${NETCDF_C} ${dynLibNam
 #  3) run for N time steps re-starting from t=N*dt (restarted run)
 # We can use the same namelist for all tests, using 3 different input yaml files
 
-# Add _np1 only if we're running also with more than one rank. Otherwise, add nothing
-set (TEST_NRANKS ${TEST_RANK_START})
-if (TEST_RANK_END GREATER TEST_RANK_START)
-  list (APPEND TEST_NRANKS ${TEST_RANK_END})
-endif()
-
 # Create a single executable for all the 3 runs
 CreateUnitTestExec(model_restart model_restart.cpp "${NEED_LIBS}")
 
@@ -32,41 +26,38 @@ set (ATM_TIME_STEP 300)
 set (CASE_T0 2021-10-12-43200)
 set (CASE_TN 2021-10-12-43800)
 
-foreach (NRANKS IN ITEMS ${TEST_NRANKS})
-
-  # Create the baseline (run all 6 timsteps in a single run)
-  CreateUnitTestFromExec(model_baseline model_restart
-                         EXE_ARGS "--use-colour no --ekat-test-params ifile=input_baseline.yaml"
-                         MPI_RANKS ${NRANKS}
-                         PROPERTIES FIXTURES_SETUP baseline_run_np${NRANKS})
-
-  # Start a simulation, but only run half of the time steps
-  CreateUnitTestFromExec(model_initial model_restart
-                         EXE_ARGS "--use-colour no --ekat-test-params ifile=input_initial.yaml"
-                         MPI_RANKS ${NRANKS}
-                         PROPERTIES FIXTURES_SETUP initial_run_np${NRANKS}
-                                    RESOURCE_LOCK rpointer_file)
-
-  # Restart the simulation, and run the second half of the time steps
-  CreateUnitTestFromExec(model_restart model_restart
-                         EXE_ARGS "--use-colour no --ekat-test-params ifile=input_restarted.yaml"
-                         MPI_RANKS ${NRANKS}
-                         PROPERTIES FIXTURES_REQUIRED initial_run_np${NRANKS}
-                                    FIXTURES_SETUP restarted_run_np${NRANKS}
-                                    RESOURCE_LOCK rpointer_file)
-
-  # 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.INSTANT.nsteps_x2.np${NRANKS}.${CASE_T0}.nc)
-  set (TGT_FILE model_output.INSTANT.nsteps_x2.np${NRANKS}.${CASE_T0}.nc)
-
-  add_test (NAME restarted_vs_monolithic_check_np${NRANKS}
-            COMMAND cmake -P ${CMAKE_BINARY_DIR}/bin/CprncTest.cmake ${SRC_FILE} ${TGT_FILE}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-  set_tests_properties (restarted_vs_monolithic_check_np${NRANKS} PROPERTIES
-                        RESOURCE_GROUPS "devices:1"
-                        FIXTURES_REQUIRED "baseline_run_np${NRANKS};restarted_run_np${NRANKS}")
-endforeach()
+# Create the baseline (run all 6 timsteps in a single run)
+CreateUnitTestFromExec(model_baseline model_restart
+                        EXE_ARGS "--use-colour no --ekat-test-params ifile=input_baseline.yaml"
+                        MPI_RANKS ${SCREAM_TEST_MAX_RANKS}
+                        PROPERTIES FIXTURES_SETUP baseline_run_np${SCREAM_TEST_MAX_RANKS})
+
+# Start a simulation, but only run half of the time steps
+CreateUnitTestFromExec(model_initial model_restart
+                        EXE_ARGS "--use-colour no --ekat-test-params ifile=input_initial.yaml"
+                        MPI_RANKS ${SCREAM_TEST_MAX_RANKS}
+                        PROPERTIES FIXTURES_SETUP initial_run_np${SCREAM_TEST_MAX_RANKS}
+                                  RESOURCE_LOCK rpointer_file)
+
+# Restart the simulation, and run the second half of the time steps
+CreateUnitTestFromExec(model_restart model_restart
+                        EXE_ARGS "--use-colour no --ekat-test-params ifile=input_restarted.yaml"
+                        MPI_RANKS ${SCREAM_TEST_MAX_RANKS}
+                        PROPERTIES FIXTURES_REQUIRED initial_run_np${SCREAM_TEST_MAX_RANKS}
+                                  FIXTURES_SETUP restarted_run_np${SCREAM_TEST_MAX_RANKS}
+                                  RESOURCE_LOCK rpointer_file)
+
+# 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.INSTANT.nsteps_x2.np${SCREAM_TEST_MAX_RANKS}.${CASE_T0}.nc)
+set (TGT_FILE model_output.INSTANT.nsteps_x2.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}
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+set_tests_properties (restarted_vs_monolithic_check_np${SCREAM_TEST_MAX_RANKS} PROPERTIES
+                      RESOURCE_GROUPS "devices:1"
+                      FIXTURES_REQUIRED "baseline_run_np${SCREAM_TEST_MAX_RANKS};restarted_run_np${SCREAM_TEST_MAX_RANKS}")
 
 # Determine num subcycles needed to keep shoc dt<=300s
 set (SHOC_MAX_DT 300)