Add clm5 compsets with explicit use of the Crujra datm inputs

slevis-lmwg · Feb 8, 2025 · 4d51e4d · 4d51e4d
1 parent fca4696
commit 4d51e4d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -2223,7 +2223,7 @@ Land mask description
 <!-- lnd_tuning_mode, there needs to be a setting for: CRUJRA2024, CRUv7, GSWP3v1, cam6.0, and cam7.0 for each valid physics option -->
 <entry id="lnd_tuning_mode" type="char*20" category="default_settings"
        group="default_settings"
-       valid_values="clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam7.0,clm4_5_cam6.0,clm4_5_cam5.0,clm4_5_cam4.0,clm5_0_cam7.0,clm5_0_cam6.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_CRUv7,clm5_0_GSWP3v1,clm6_0_GSWP3v1,clm6_0_CRUJRA2024,clm6_0_cam7.0,clm6_0_cam6.0,clm6_0_cam5.0,clm6_0_cam4.0">
+       valid_values="clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam7.0,clm4_5_cam6.0,clm4_5_cam5.0,clm4_5_cam4.0,clm5_0_cam7.0,clm5_0_cam6.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_CRUv7,clm5_0_GSWP3v1,clm6_0_GSWP3v1,clm5_0_CRUJRA2024,clm6_0_CRUJRA2024,clm6_0_cam7.0,clm6_0_cam6.0,clm6_0_cam5.0,clm6_0_cam4.0">
 General configuration of model version and atmospheric forcing to tune the model to run under.
 This sets the model to run with constants and initial conditions that were set to run well under 
 the configuration of model version and atmospheric forcing. To run well constants would need to be changed

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
@@ -1981,8 +1981,7 @@ sub cat_and_create_namelistinfile {
      foreach my $bgc ( "sp", "bgc" ) {
         my $lndtuningmode = "${phys}_${forc}";
         if ( $lndtuningmode eq "clm6_0_CRUv7" or
-             $lndtuningmode eq "clm4_5_CRUJRA2024" or
-             $lndtuningmode eq "clm5_0_CRUJRA2024") {
+             $lndtuningmode eq "clm4_5_CRUJRA2024") {
            next;
         }
         my $clmoptions = "-res $res -mask $mask -sim_year $simyr -envxml_dir . -lnd_tuning_mod $lndtuningmode -bgc $bgc";

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
@@ -78,7 +78,7 @@
     </desc>
     <default_value>UNSET</default_value>
     <!-- 10 forcing options for each CLM physics option: CRUJRA2024, CRUv7, GSWP3, cam7.0, cam6.0, cam5.0, cam4.0, QIAN, 1PT, NLDAS2, ERA5 -->
-    <valid_values>clm5_0_cam6.0,clm5_0_cam7.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_QIAN,clm4_5_cam6.0,clm4_5_cam7.0,clm4_5_cam5.0,clm4_5_cam4.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm6_0_CRUv7,clm6_0_GSWP3v1,clm6_0_CRUJRA2024,clm6_0_cam6.0,clm6_0_cam7.0,clm6_0_cam5.0,clm6_0_cam4.0,clm6_0_QIAN,clm6_0_1PT,clm6_0_NLDAS2,clm6_0_ERA5</valid_values>
+    <valid_values>clm5_0_cam6.0,clm5_0_cam7.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_QIAN,clm4_5_cam6.0,clm4_5_cam7.0,clm4_5_cam5.0,clm4_5_cam4.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm6_0_CRUv7,clm6_0_GSWP3v1,clm5_0_CRUJRA2024,clm6_0_CRUJRA2024,clm6_0_cam6.0,clm6_0_cam7.0,clm6_0_cam5.0,clm6_0_cam4.0,clm6_0_QIAN,clm6_0_1PT,clm6_0_NLDAS2,clm6_0_ERA5</valid_values>
     <values match="last">
       <!-- Options for atm forcing are: CRUJRA2024, CRUv7, GSWP3, cam6.0 (also used for DATM%CPLHIST), cam5.0, cam4.0, QIAN, WISOQIA, 1PT, NLDAS2, and ERA5) -->
       <!-- All the clm4_5 physics options -->
@@ -98,6 +98,7 @@
       <value compset="DATM%NLDAS2_CLM45" >clm4_5_NLDAS2</value>
       <value compset="DATM%ERA5_CLM45"   >clm4_5_ERA5</value>
       <!-- All the clm5_0 physics options -->
+      <value compset="DATM%CRUJRA2024_CLM50">clm5_0_CRUJRA2024</value>
       <value compset="DATM%CRUv7_CLM50"  >clm5_0_CRUv7</value>
       <value compset="DATM%CRU_CLM50"    >clm5_0_CRUv7</value>
       <value compset="SATM_CLM50"        >clm5_0_GSWP3v1</value>

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -158,6 +158,10 @@
     <science_support grid="f19_g17"/>
   </compset>
 
+  <compset>
+    <alias>I1850Clm50SpCrujra</alias>
+    <lname>1850_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+  </compset>
   <compset>
     <alias>I1850Clm60SpCrujra</alias>
     <lname>1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
@@ -227,6 +231,10 @@
     <science_support grid="f09_g17"/>
     <science_support grid="f19_g17"/>
   </compset>
+  <compset>
+    <alias>I1850Clm50BgcCropCrujra</alias>
+    <lname>1850_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+  </compset>
 
   <!-- latest CLM version with BGC-Crop and CRU forcing -->
   <compset>
@@ -378,6 +386,10 @@
     <science_support grid="f19_g17"/>
   </compset>
 
+  <compset>
+    <alias>IHistClm50SpCrujra</alias>
+    <lname>HIST_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+  </compset>
   <compset>
     <alias>IHistClm50SpCru</alias>
     <lname>HIST_DATM%CRUv7_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -3389,6 +3389,16 @@
       <option name="comment">30 day exact restart test with threading for FATES fixed biogeography reduced complexity mode on an f45 grid and CRUJRA2024 instead of CRUv7 datm.</option>
     </options>
   </test>
+  <test name="ERP_P128x2_Ld30" grid="f45_f45_mg37" compset="I1850Clm50BgcCropCrujra" testmods="clm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="fates"/>
+      <machine name="derecho" compiler="intel" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">30 day exact restart test with threading for BgcCrop on an f45 grid and CRUJRA2024 instead of CRUv7 datm with Clm5.</option>
+    </options>
+  </test>
   <test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdLogging">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>