[WIP] Work with self_tests so that there's an initialization only option

bld/CLMBuildNamelist.pm

@@ -5315,6 +5315,7 @@ sub write_output_files {
   push @groups, "clm_canopy_inparm";
   push @groups, "prigentroughness";
   push @groups, "zendersoilerod";
+  push @groups, "for_testing_options";
   if (remove_leading_and_trailing_quotes($nl->get_value('snow_cover_fraction_method')) eq 'SwensonLawrence2012') {
      push @groups, "scf_swenson_lawrence_2012_inparm";
   }

bld/namelist_files/namelist_definition_ctsm.xml

@@ -1259,12 +1259,38 @@ Whether to use subgrid fluxes for snow
 Whether snow on the vegetation canopy affects the radiation/albedo calculations
 </entry>
 
+<!-- ========================================================================================  -->
+<!-- Namelist items for doing specific things for testing                                      -->
+<!-- for_testing section:                                                                      -->
+<!-- ========================================================================================  -->
+
+<entry id="for_testing_bypass_init" type="logical" category="default_settings"
+       group="for_testing_options" >
+For testing whether to bypass the rest of the initialization after the self test driver is run
+</entry>
+
+<entry id="for_testing_bypass_run" type="logical" category="default_settings"
+       group="for_testing_options" >
+For testing whether to bypass most of the run phase other than the clock advance
+</entry>
+
+<entry id="for_testing_exit_after_self_tests" type="logical" category="default_settings"
+       group="for_testing_options" >
+Whether to exit early after the initialization self tests are run. This is typically only used in automated tests.
+</entry>
+
 <entry id="for_testing_run_ncdiopio_tests" type="logical" category="default_settings"
-       group="clm_inparm" >
+       group="for_testing_options" >
 Whether to run some tests of ncdio_pio as part of the model run. This is
 typically only used in automated tests.
 </entry>
 
+<entry id="for_testing_run_decomp_init_tests" type="logical" category="default_settings"
+       group="for_testing_options" >
+Whether to run some tests of decompInit (to get the gridcell to MPI task decomposition) as part of the model run. This is
+typically only used in automated tests.
+</entry>
+
 <entry id="for_testing_use_second_grain_pool" type="logical" category="default_settings"
        group="clm_inparm" >
 If true, allocate memory for and use a second crop grain pool. This is

cime_config/buildlib

@@ -135,6 +135,7 @@ def _main_func():
                 os.path.join(lnd_root, "src", "dyn_subgrid"),
                 os.path.join(lnd_root, "src", "init_interp"),
                 os.path.join(lnd_root, "src", "self_tests"),
+                os.path.join(lnd_root, "src", "unit_test_shr"),
                 os.path.join(lnd_root, "src", "fates"),
                 os.path.join(lnd_root, "src", "fates", "main"),
                 os.path.join(lnd_root, "src", "fates", "biogeophys"),

cime_config/testdefs/ExpectedTestFails.xml

@@ -381,45 +381,4 @@
 
   <!-- decomp_init test list-->
 
-  <test name="SMS_Ln1_PL.mpasa15_mpasa15.I2000Clm45Sp.derecho_intel.clm-run_self_tests">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#3316</issue>
-    </phase>
-  </test>
-
-  <!-- interim_restart (and aux_clm) test list-->
-
-  <test name="ERR_Ld7.f10_f10_mg37.I2000Clm50BgcCropRtm.derecho_gnu.clm-default">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#3383</issue>
-    </phase>
-  </test>
-
-  <test name="ERR_Ld7.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.clm-default">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#3383</issue>
-    </phase>
-  </test>
-  <test name="ERI_Ld41.f10_f10_mg37.I2000Clm60BgcCrop.derecho_gnu.clm-default">
-    <phase name="COMPARE_base_hybrid">
-     <status>FAIL</status>
-     <issue>#3494</issue>
-    </phase>
-  </test>
-
-  <test name="ERI_D_Ld9.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdSatPhenCamLndTuningMode">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#3496</issue>
-    </phase>
-  </test>
-  <test name="ERI_D_Ld9.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_intel.clm-FatesColdSatPhenCamLndTuningMode">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#3507</issue>
-    </phase>
-  </test>  
 </expectedFails>

cime_config/testdefs/testmods_dirs/clm/for_testing_fastsetup_bypassrun/user_nl_clm

@@ -1,3 +1,6 @@
+! Exit early and bypass the run phase
+for_testing_exit_after_self_tests = .true.
+
 ! Turn off history, restarts, and output
 hist_empty_htapes = .true.
 use_noio = .true.

cime_config/testdefs/testmods_dirs/clm/run_self_tests/shell_commands

@@ -0,0 +1,9 @@
+#!/bin/bash
+./xmlchange CLM_FORCE_COLDSTART="on"
+
+# We use this testmod in a _Ln1 test; this requires forcing the ROF coupling frequency to every time step
+./xmlchange ROF_NCPL=48
+
+# Restarts aren't allowed for these tests, and turn off CPL history
+./xmlchange REST_OPTION="never"
+./xmlchange HIST_OPTION="never"

cime_config/testdefs/testmods_dirs/clm/run_self_tests/user_nl_clm

@@ -1,5 +1,14 @@
+! Bypass as much of the init phase as can be done
+! Bypassing the run phase already was inherited from the for_testing_fastsetup_bypassrun testmod
+for_testing_bypass_init = .true.
+
+! Turn on some of the self tests
 for_testing_run_ncdiopio_tests = .true.
 
 ! Turn off history, restarts, and output
 hist_empty_htapes = .true.
 use_noio = .true.
+for_testing_run_decomp_init_tests = .true.
+
+! Exit initialization phase after the self tests
+for_testing_bypass_init = .true.