Merge pull request #2733 from ekluzek/merge-master-20240828

Merge master 20240828
ESCOMP · Aug 29, 2024 · e707519 · e707519
2 parents 1ddecad + 1792237
commit e707519
Show file tree

Hide file tree

Showing 20 changed files with 622 additions and 133 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.47
+fxtag = cdeps1.0.48
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -2282,7 +2282,9 @@ sub setup_logic_cnfire {
 
   my @fire_consts = ( "rh_low", "rh_hgh", "bt_min", "bt_max", "cli_scale", "boreal_peatfire_c", "non_boreal_peatfire_c",
                       "pot_hmn_ign_counts_alpha", "cropfire_a1", "occur_hi_gdp_tree", "lfuel", "ufuel",
-                      "cmb_cmplt_fact_litter", "cmb_cmplt_fact_cwd" );
+                      "cmb_cmplt_fact_litter", "cmb_cmplt_fact_cwd", "max_rh30_affecting_fuel",
+                      "defo_fire_precip_thresh_bet", "defo_fire_precip_thresh_bdt",
+                      "borpeat_fire_soilmoist_denom", "nonborpeat_fire_precip_denom" );
   if ( &value_is_true($nl->get_value('use_cn')) ) {
      foreach my $item ( @fire_consts ) {
         if ( ! &value_is_true($nl_flags->{'cnfireson'} ) ) {

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
diff --git a/bld/namelist_files/namelist_defaults_dust_emis.xml b/bld/namelist_files/namelist_defaults_dust_emis.xml
@@ -15,6 +15,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 <!-- Defaults for dust_emis_inparm namelist  -->
 <dust_emis_method>Zender_2003</dust_emis_method>
+<dust_emis_method phys="clm6_0">Leung_2023</dust_emis_method>
 
 <zender_soil_erod_source>atm</zender_soil_erod_source>
 

diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -252,14 +252,15 @@ formulation (1).
 </entry>
 
 <entry id="fire_method" type="char*80" category="clm_physics"
-       group="cnfire_inparm" valid_values="nofire,li2014qianfrc,li2016crufrc,li2021gswpfrc,li2024gswpfrc" >
+       group="cnfire_inparm" valid_values="nofire,li2014qianfrc,li2016crufrc,li2021gswpfrc,li2024gswpfrc,li2024crujra" >
 The method type to use for CNFire
 
 nofire:        Turn fire effects off
 li2014qianfrc: Reference paper Li, et. al.(2014) tuned with QIAN atmospheric forcing
 li2016crufrc:  Reference paper Li, et. al.(2016) tuned with CRU-NCEP atmospheric forcing
-li2021gswpfrc: Reference paper Li, et. al.(2021?) tuned with GSWP3 atmospheric forcing
-li2024gswpfrc: No reference paper yet
+li2021gswpfrc: No reference paper yet, tuned with GSWP3 atmospheric forcing
+li2024gswpfrc: No reference paper yet, tuned with GSWP3 atmospheric forcing
+li2024crujra:  No reference paper yet, tuned with CRU-JRA forcing
 </entry>
 
 <entry id="pot_hmn_ign_counts_alpha" type="real" category="clm_physics"
@@ -332,6 +333,31 @@ Combustion completeness factor for litter (unitless)
 Combustion completeness factor for CWD[Course Woody Debris] (unitless)
 </entry>
 
+<entry id="max_rh30_affecting_fuel" type="real" category="clm_physics"
+       group="lifire_inparm" >
+Value above which 30-day running relative humidity has no effect on fuel combustibility
+</entry>
+
+<entry id="defo_fire_precip_thresh_bet" type="real" category="clm_physics"
+       group="lifire_inparm" >
+Value (mm/d) above which running mean daily precipitation (10 or 60 days) does not allow deforestation fire for a column with broadleaf evergreen tropical trees but no broadleaf deciduous tropical trees. "PFT-dependent thresholds of P60d and P10d" in Li et al. (2013, doi:10.5194/bg-10-2293-2013).
+</entry>
+
+<entry id="defo_fire_precip_thresh_bdt" type="real" category="clm_physics"
+       group="lifire_inparm" >
+Value (mm/d) above which running mean daily precipitation (10 or 60 days) does not allow deforestation fire for a column with broadleaf deciduous tropical trees but no broadleaf evergreen tropical trees. "PFT-dependent thresholds of P60d and P10d" in Li et al. (2013, doi:10.5194/bg-10-2293-2013).
+</entry>
+
+<entry id="nonborpeat_fire_precip_denom" type="real" category="clm_physics"
+       group="lifire_inparm" >
+Denominator of precipitation in equation relating that to non-boreal peat fire (unitless). Eq. 9 in Li et al. (2013, doi:10.5194/bg-10-2293-2013).
+</entry>
+
+<entry id="borpeat_fire_soilmoist_denom" type="real" category="clm_physics"
+       group="lifire_inparm" >
+Denominator of exponential in soil moisture term of equation relating that and temperature to boreal peat fire (unitless). Eq. 10 in Li et al. (2013, doi:10.5194/bg-10-2293-2013).
+</entry>
+
 <entry id="ncrit" type="real" category="clm_physics"
        group="cnprecision_inparm" >
 Critical threshold for truncation of Nitrogen (truncate Nitrogen states to zero below this value)

diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
@@ -52,13 +52,6 @@
     </phase>
   </test>
 
-  <test name="SMS_D_Ld10.f10_f10_mg37.I2000Clm50BgcCrop.izumi_intel.clm-tracer_consistency">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2444</issue>
-    </phase>
-  </test>
-
   <test name="PEM_D_Ld9.ne30pg3_t232.I1850Clm60BgcCropG.derecho_intel.clm-clm60cam7LndTuningMode">
     <phase name="COMPARE_base_modpes">
       <status>FAIL</status>
@@ -113,20 +106,6 @@
     </phase>
   </test>
 
-  <test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_intel.clm-FatesColdHydro">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2373</issue>
-    </phase>
-  </test>
-
-  <test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdHydro">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2373</issue>
-    </phase>
-  </test>
-
   <test name="FUNITCTSM_P1x1.f10_f10_mg37.I2000Clm50Sp.izumi_intel">
     <phase name="RUN">
       <status>FAIL</status>
@@ -186,17 +165,6 @@
     </phase>
   </test>
 
-  <test name="ERS_D_Ld5.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdHydro">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2373</issue>
-    </phase>
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>FATES#701</issue>
-    </phase>
-  </test>
-
   <test name="ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60FatesRs.derecho_intel.clm-mimicsFatesCold">
     <phase name="RUN">
       <status>FAIL</status>

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -152,7 +152,7 @@
       <machine name="derecho" compiler="intel" category="aux_clm"/>
     </machines>
     <options>
-      <option name="wallclock">00:20:00</option>
+      <option name="wallclock">00:40:00</option>
       <option name="comment">CESM3 development Exact restart test for all startup types at the standard coupled resolution</option>
     </options>
   </test>
@@ -3600,6 +3600,16 @@
     </options>
   </test>
 
+  <test name="SMS_D_Ld65" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/FireLi2024CruJra">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_clm"/>
+      <machine name="derecho" compiler="intel" category="fire"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+
   <test name="SMS_Ld733" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsNoAdapt">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>

diff --git a/cime_config/testdefs/testmods_dirs/clm/FireLi2024CruJra/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FireLi2024CruJra/include_user_mods
@@ -0,0 +1 @@
+../default
diff --git a/cime_config/testdefs/testmods_dirs/clm/FireLi2024CruJra/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FireLi2024CruJra/user_nl_clm
@@ -0,0 +1 @@
+fire_method = 'li2024crujra'
diff --git a/components/cdeps b/components/cdeps
diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template
@@ -98,7 +98,7 @@ infrastructure should be run when appropriate, as described below.
 
   python testing (if python code has changed; see instructions in python/README.md; document testing done):
 
-    (any machine) -
+    derecho -
 
     [If python code has changed and you are NOT running aux_clm (e.g., because the only changes are in python
      code) then also run the clm_pymods test suite; this is a small subset of aux_clm that runs the system
+0 −17		CMakeLists.txt
+42 −24		cime_config/buildlib
+18 −0		cime_config/stream_cdeps.py
+2 −1		cime_config/stream_definition_v2.0.xsd
+12 −5		datm/cime_config/buildnml
+9 −0		datm/cime_config/config_component.xml
+3 −0		datm/cime_config/namelist_definition_datm.xml
+50 −2		datm/cime_config/stream_definition_datm.xml
+2 −2		dglc/cime_config/config_component.xml
+3 −3		dglc/cime_config/testdefs/testlist_dglc.xml
+164 −124		dglc/dglc_datamode_noevolve_mod.F90
+184 −15		dglc/glc_comp_nuopc.F90
+3 −0		doc/source/datm.rst
+2 −0		docn/CMakeLists.txt
+6 −2		docn/cime_config/config_component.xml
+5 −1		docn/cime_config/namelist_definition_docn.xml
+99 −1		docn/cime_config/stream_definition_docn.xml
+264 −0		docn/docn_datamode_multilev_dom_mod.F90
+229 −0		docn/docn_datamode_multilev_mod.F90
+5 −0		docn/docn_datamode_som_mod.F90
+47 −5		docn/ocn_comp_nuopc.F90
+1 −1		drof/cime_config/testdefs/testlist_drof.xml
+16 −4		dshr/dshr_dfield_mod.F90
+1 −1		dshr/dshr_mod.F90
+2 −2		streams/dshr_methods_mod.F90
+39 −7		streams/dshr_strdata_mod.F90