Change DP unit test

- use PG2 (CIME test still uses GLL, so both are covered)
- Use 72 levels (nothing in DP is specific to 128, so save compute time)
- Use TMS to test loading SGH30 on PG2 grid

Author: tcclevenger

components/eamxx/tests/multi-process/dynamics_physics/CMakeLists.txt

@@ -6,7 +6,7 @@ if (SCREAM_DOUBLE_PRECISION)
     add_subdirectory(model_restart)
     add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp)
     add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp_128levels)
-    add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp_dp)
+    add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp_pg2_dp)
     if (SCREAM_ENABLE_MAM)
       # Once the mam4xx aerosol microphysics AtmosphereProcess is running, the
       # corresponding test here needs to be reworked with valid aerosol

components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_dp/CMakeLists.txt renamed to components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/CMakeLists.txt

@@ -1,17 +1,17 @@
 include (ScreamUtils)
 
-set (TEST_BASE_NAME homme_shoc_cld_spa_p3_rrtmgp_dp)
+set (TEST_BASE_NAME homme_shoc_cld_spa_p3_rrtmgp_pg2_dp)
 set (FIXTURES_BASE_NAME ${TEST_BASE_NAME}_generate_output_nc_files)
 
 # Get or create the dynamics lib
 #                 HOMME_TARGET   NP PLEV QSIZE_D
-CreateDynamicsLib("theta-l_kokkos"  4   128   10)
+CreateDynamicsLib("theta-l_kokkos"  4   72   10)
 
 # Create the test
-set (TEST_LABELS "dynamics;driver;shoc;cld;spa;p3;rrtmgp;physics;dp")
-CreateUnitTest(homme_shoc_cld_spa_p3_rrtmgp_dp "homme_shoc_cld_spa_p3_rrtmgp_dp.cpp"
+set (TEST_LABELS "dynamics;driver;tms;shoc;cld;spa;p3;rrtmgp;physics;dp")
+CreateUnitTest(homme_shoc_cld_spa_p3_rrtmgp_pg2_dp "homme_shoc_cld_spa_p3_rrtmgp_pg2_dp.cpp"
   LABELS ${TEST_LABELS}
-  LIBS cld_fraction shoc spa p3 scream_rrtmgp ${dynLibName} scream_control diagnostics
+  LIBS cld_fraction tms shoc spa p3 scream_rrtmgp ${dynLibName} scream_control diagnostics
   MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
   FIXTURES_SETUP_INDIVIDUAL ${FIXTURES_BASE_NAME}
 )
@@ -61,16 +61,16 @@ set (HOMME_TEST_MOISTURE notdry)
 set (HOMME_THETA_HY_MODE false)
 
 # Vert coord settings
-set (HOMME_TEST_VCOORD_INT_FILE acme-128i.ascii)
-set (HOMME_TEST_VCOORD_MID_FILE acme-128m.ascii)
+set (HOMME_TEST_VCOORD_INT_FILE acme-72i.ascii)
+set (HOMME_TEST_VCOORD_MID_FILE acme-72m.ascii)
 
 # Configure the namelist into the test directory
 configure_file(${SCREAM_SRC_DIR}/dynamics/homme/tests/theta-dp.nl
                ${CMAKE_CURRENT_BINARY_DIR}/namelist.nl)
 
 # Ensure test input files are present in the data dir
 set (TEST_INPUT_FILES
-  scream/init/${EAMxx_tests_IC_FILE_128lev}
+  scream/init/${EAMxx_tests_IC_FILE_72lev}
   cam/topo/${EAMxx_tests_TOPO_FILE}
   cam/scam/iop/CASS_iopfile_4scam.nc
 )
@@ -85,7 +85,7 @@ CompareNCFilesFamilyMpi (
   TEST_BASE_NAME ${TEST_BASE_NAME}
   FILE_META_NAME ${TEST_BASE_NAME}_output.INSTANT.nsteps_x${NUM_STEPS}.npMPIRANKS.${RUN_T0}.nc
   MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
-  LABELS dynamics physics shoc cld spa p3 rrtmgp dp
+  LABELS dynamics physics tms shoc cld spa p3 rrtmgp dp pg2
   META_FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_npMPIRANKS_omp1
 )
 

components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_dp/homme_shoc_cld_spa_p3_rrtmgp_dp.cpp renamed to components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp.cpp

@@ -21,7 +21,7 @@ time_stepping:
   number_of_steps: ${NUM_STEPS}
 
 initial_conditions:
-  Filename: ${SCREAM_DATA_DIR}/init/${EAMxx_tests_IC_FILE_128lev}
+  Filename: ${SCREAM_DATA_DIR}/init/${EAMxx_tests_IC_FILE_72lev}
   topography_filename: ${TOPO_DATA_DIR}/${EAMxx_tests_TOPO_FILE}
   surf_evap: 0.0
   surf_sens_flux: 0.0
@@ -44,7 +44,7 @@ atmosphere_processes:
     schedule_type: Sequential
     Type: Group
     mac_aero_mic:
-      atm_procs_list: [shoc,CldFraction,spa,p3]
+      atm_procs_list: [tms,shoc,CldFraction,spa,p3]
       Type: Group
       schedule_type: Sequential
       number_of_subcycles: ${MAC_MIC_SUBCYCLES}
@@ -78,7 +78,7 @@ atmosphere_processes:
 
 grids_manager:
   Type: Homme
-  physics_grid_type: GLL
+  physics_grid_type: PG2
   dynamics_namelist_file_name: namelist.nl
   vertical_coordinate_filename: IC_FILE
 

components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_dp/input.yaml renamed to components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/input.yaml

@@ -1,10 +1,10 @@
 %YAML 1.1
 ---
-filename_prefix: homme_shoc_cld_spa_p3_rrtmgp_dp_output
+filename_prefix: homme_shoc_cld_spa_p3_rrtmgp_pg2_dp_output
 Averaging Type: Instant
 Max Snapshots Per File: 1
 Fields:
-  Physics GLL:
+  Physics PG2:
     Field Names:
       # HOMME
       - ps
@@ -105,4 +105,4 @@ output_control:
   Frequency: ${NUM_STEPS}
   frequency_units: nsteps
 ...
-  
+