Merge pull request #2318 from slevis-lmwg/smallville_iss1673

Workaround for transient Smallville tests #1673 + testing all new datasets
ESCOMP · Feb 16, 2024 · cdc9cca · cdc9cca
2 parents 1e0bca4 + 494ad7c
commit cdc9cca
Show file tree

Hide file tree

Showing 47 changed files with 582 additions and 760 deletions.
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
@@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 2815;
+my $ntests = 2587;
 
 if ( defined($opts{'compare'}) ) {
-   $ntests += 1965;
+   $ntests += 1737;
 }
 plan( tests=>$ntests );
 
@@ -433,7 +433,7 @@ sub cat_and_create_namelistinfile {
                       "-res ne0np4CONUS.ne30x8 -bgc sp -use_case 2000_control  -namelist '&a start_ymd=20130101/' -lnd_tuning_mode ${phys}_cam6.0",
                       "-res 1.9x2.5 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=20030101/' -lnd_tuning_mode ${phys}_cam6.0",
                       "-res 1.9x2.5 -bgc sp -use_case 2010_control -namelist '&a start_ymd=20100101/' -lnd_tuning_mode ${phys}_cam6.0",
-                      "-res 1x1_brazil -bgc fates -no-megan -use_case 2000_control -lnd_tuning_mode ${phys}_CRUv7",
+                      "-res 1x1_brazil -no-megan -use_case 2000_control -lnd_tuning_mode ${phys}_CRUv7",
                       "-res C96 -bgc sp -use_case 2010_control -namelist '&a start_ymd=20100101/' -lnd_tuning_mode ${phys}_cam6.0",
                       "-res ne0np4.ARCTIC.ne30x4 -bgc sp -use_case 2000_control -namelist '&a start_ymd=20130101/' -lnd_tuning_mode ${phys}_cam6.0",
                      ) {
@@ -1350,8 +1350,8 @@ sub cat_and_create_namelistinfile {
 print "========================================================================\n";
 
 # Check for ALL resolutions with CLM50SP
-my @resolutions = ( "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "360x720cru", "0.125nldas2", "10x15", "4x5", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4", "ne30np4.pg2", "ne30np4.pg3", "ne120np4.pg3", "ne0np4CONUS.ne30x8", "ne0np4.ARCTIC.ne30x4", "ne0np4.ARCTICGRIS.ne30x8", "C96", "mpasa480", "mpasa120", "mpasa60", "mpasa15", "mpasa15-conus", "mpasa3p75" );
-my @only2000_resolutions = ( "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "0.125nldas2", "mpasa60", "mpasa15", "mpasa15-conus", "mpasa3p75" );
+my @resolutions = ( "360x720cru", "10x15", "4x5", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4", "ne30np4.pg2", "ne30np4.pg3", "ne120np4.pg3", "ne0np4CONUS.ne30x8", "ne0np4.ARCTIC.ne30x4", "ne0np4.ARCTICGRIS.ne30x8", "C96", "mpasa480", "mpasa120" );
+my @only2000_resolutions = ( "1x1_numaIA", "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "0.125nldas2", "mpasa60", "mpasa15", "mpasa15-3", "mpasa3p75" );
 my @regional;
 foreach my $res ( @resolutions ) {
    chomp($res);
@@ -1449,7 +1449,24 @@ sub cat_and_create_namelistinfile {
 print "==================================================\n";
 
 # Check for crop resolutions
-my @crop_res = ( "1x1_numaIA", "1x1_smallvilleIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
+my $crop1850_res = "1x1_smallvilleIA";
+$options = "-bgc bgc -crop -res $crop1850_res -use_case 1850_control -envxml_dir .";
+&make_env_run();
+eval{ system( "$bldnml $options  > $tempfile 2>&1 " ); };
+is( $@, '', "$options" );
+$cfiles->checkfilesexist( "$options", $mode );
+$cfiles->shownmldiff( "default", "standard" );
+if ( defined($opts{'compare'}) ) {
+   $cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
+   $cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
+   $cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
+}
+if ( defined($opts{'generate'}) ) {
+   $cfiles->copyfiles( "$options", $mode );
+}
+&cleanup();
+
+my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
 foreach my $res ( @crop_res ) {
    $options = "-bgc bgc -crop -res $res -envxml_dir .";
    &make_env_run();
@@ -1673,7 +1690,7 @@ sub cat_and_create_namelistinfile {
   &cleanup();
   # Run FATES mode for several resolutions and configurations
   my $clmoptions = "-bgc fates -envxml_dir . -no-megan";
-  my @clmres = ( "1x1_brazil", "5x5_amazon", "4x5", "1.9x2.5" );
+  my @clmres = ( "4x5", "1.9x2.5" );
   foreach my $res ( @clmres ) {
      $options = "-res $res -clm_start_type cold";
      my @edoptions = ( "-use_case 2000_control",

diff --git a/cime_config/SystemTests/mksurfdataesmf.py b/cime_config/SystemTests/mksurfdataesmf.py
@@ -38,11 +38,11 @@ def __init__(self, case):
         self._jobscript = os.path.join(self._get_caseroot(), "mksurfdata_jobscript_single")
         self._fsurdat_namelist = os.path.join(
             self._get_caseroot(),
-            f"surfdata_{self._res}_hist_78pfts_CMIP6_{self._model_yr}_c{time_stamp}.namelist",
+            f"surfdata_{self._res}_hist_{self._model_yr}_78pfts_c{time_stamp}.namelist",
         )
         self._fsurdat_nc = os.path.join(
             self._get_caseroot(),
-            f"surfdata_{self._res}_hist_78pfts_CMIP6_{self._model_yr}_c{time_stamp}.nc",
+            f"surfdata_{self._res}_hist_{self._model_yr}_78pfts_c{time_stamp}.nc",
         )
         self._TestStatus_log_path = os.path.join(self._get_caseroot(), "TestStatus.log")
 
@@ -64,7 +64,7 @@ def build_phase(self, sharedlib_only=False, model_only=False):
             nml_script_path = os.path.join(self._tool_path, "gen_mksurfdata_namelist")
             gen_jobscript_path = os.path.join(self._tool_path, "gen_mksurfdata_jobscript_single")
             gen_mksurfdata_namelist = f"{nml_script_path} --res {self._res} --start-year {self._model_yr} --end-year {self._model_yr}"
-            gen_mksurfdata_jobscript = f"{gen_jobscript_path} --number-of-nodes 12 --tasks-per-node 12 --namelist-file {self._fsurdat_namelist}"
+            gen_mksurfdata_jobscript = f"{gen_jobscript_path} --number-of-nodes 1 --tasks-per-node 64 --namelist-file {self._fsurdat_namelist}"
 
             # Rm tool_bld and build executable that will generate fsurdat
             try:

diff --git a/cime_config/SystemTests/rxcropmaturity.py b/cime_config/SystemTests/rxcropmaturity.py
@@ -328,6 +328,7 @@ def _create_config_file_evenlysplitcrop(self):
             cfg_out.write("PCT_GLACIER = 0.0\n")
             cfg_out.write("PCT_WETLAND = 0.0\n")
             cfg_out.write("PCT_LAKE    = 0.0\n")
+            cfg_out.write("PCT_OCEAN   = 0.0\n")
             cfg_out.write("PCT_URBAN   = 0.0 0.0 0.0\n")
 
     def _run_check_rxboth_run(self):

diff --git a/cime_config/buildnml b/cime_config/buildnml
@@ -85,7 +85,7 @@ def buildnml(case, caseroot, compname):
         "clm4_5_QIAN": "clm4_5_CRUv7",
         "clm4_5_NLDAS2": "clm4_5_CRUv7",
         "clm4_5_ERA5": "clm4_5_CRUv7",
-        "clm5_0_1PT": "clm5_0_GSWP3",
+        "clm5_0_1PT": "clm5_0_GSWP3v1",
         "clm5_0_QIAN": "clm5_0_GSWP3v1",
         "clm5_0_NLDAS2": "clm5_0_GSWP3v1",
         "clm5_0_ERA5": "clm5_0_GSWP3v1",

diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
@@ -28,6 +28,21 @@
   -->
 
 
+  <!-- ctsm_sci test suite failures -->
+  <test name="SMS_P14080x1_Ln9.mpasa3p75_mpasa3p75_mt13.I2000Clm51SpRs.derecho_intel.clm-clm51cam6LndTuningMode">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#2370</issue>
+    </phase>
+  </test>
+
+  <test name="SMS_Ld12_Mmpi-serial.1x1_urbanc_alpha.I1PtClm51SpRs.derecho_intel.clm-output_sp_highfreq">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>Not opened yet but first posted here: https://github.com/ESCOMP/CTSM/pull/2318#discussion_r1484696000</issue>
+    </phase>
+  </test>
+
   <!-- cesm3_dev test suite failures -->
   <test name="ERP_D_Ld9.ne30pg3_t232.IHistClm51BgcCrop.derecho_intel.clm-clm51cam6LndTuningMode">
     <phase name="RUN">
@@ -171,17 +186,10 @@
     </phase>
   </test>
 
-  <test name="ERP_P72x2_Ld30.f45_f45_mg37.I2000Clm51FatesRs.cheyenne_intel.clm-mimicsFatesCold">
-    <phase name="SHAREDLIB_BUILD">
-      <status>PEND</status>
-      <issue>#1045</issue>
-    </phase>
-  </test>
-
   <test name="ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm51FatesRs.derecho_intel.clm-mimicsFatesCold">
     <phase name="SHAREDLIB_BUILD">
-      <status>PEND</status>
-      <issue>#1045</issue>
+      <status>RUN</status>
+      <issue>#2261</issue>
     </phase>
   </test>