From 04ed1530a44027ade613c48f4323b5425c09b5b0 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Tue, 22 Oct 2024 16:34:02 -0600
Subject: [PATCH] Updates from Erik's code review and testing

---
 bld/unit_testers/build-namelist_test.pl | 16 +++++++++++++++-
 cime_config/testdefs/testlist_clm.xml   |  2 --
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 08075df481..ca11c18253 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 3196;
+my $ntests = 3229;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 2437;
@@ -605,6 +605,10 @@ sub cat_and_create_namelistinfile {
                                      namelst=>"use_crop=.true.",
                                      phys=>"clm4_5",
                                    },
+     "LeungDust_WO_Prigent"      =>{ options=>" -envxml_dir . -bgc sp",
+                                     namelst=>"use_prigent_roughness=.false.,dust_emis_method='Leung_2023'",
+                                     phys=>"clm6_0",
+                                   },
      "soilm_stream off w file"      =>{ options=>"-res 0.9x1.25 -envxml_dir .",
                                      namelst=>"use_soil_moisture_streams = .false.,stream_fldfilename_soilm='file_provided_when_off'",
                                      phys=>"clm5_0",
@@ -967,6 +971,16 @@ sub cat_and_create_namelistinfile {
                                      GLC_TWO_WAY_COUPLING=>"TRUE",
                                      phys=>"clm5_0",
                                    },
+     "sasuspinupWOsoilmatx"      =>{ options=>"-envxml_dir . -bgc bgc -clm_accelerated_spinup sasu",
+                                     namelst=>"use_soil_matrixcn=.false.,use_matrixcn=.false.",
+                                     GLC_TWO_WAY_COUPLING=>"TRUE",
+                                     phys=>"clm6_0",
+                                   },
+     "sasuspinupWOCN"            =>{ options=>"-envxml_dir . -bgc sp  -clm_accelerated_spinup sasu",
+                                     namelst=>"",
+                                     GLC_TWO_WAY_COUPLING=>"TRUE",
+                                     phys=>"clm6_0",
+                                   },
      "nyrforceWOspinup"          =>{ options=>"-envxml_dir . -bgc bgc -clm_accelerated_spinup sasu",
                                      namelst=>"use_matrixcn=.false.,spinup_matrixcn=F,nyr_forcing=20",
                                      GLC_TWO_WAY_COUPLING=>"TRUE",
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index a944c5993d..2e1ae173a1 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -123,7 +123,6 @@
       <option name="comment">CESM3 development Exact restart test with change in the processor count at f10, for izumi nag</option>
     </options>
   </test>
-  <!-- Remove when CESM no longer needs it-->
   <test name="ERP_D_Ld9" grid="ne30pg3_t232" compset="I1850Clm60BgcCropG" testmods="clm/clm60cam6LndTuningMode">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -960,7 +959,6 @@
       <option name="comment"  >Test Hist compset with Sp for CLM6.0</option>
     </options>
   </test>
-  <!-- Remove this when CAM removes the use of CLM60 in their testing and compsets -->
   <test name="ERP_D_Ld5" grid="ne30pg3_t232" compset="IHistClm60Sp" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>