Merge pull request #2258 from slevis-lmwg/new_params_file

New params file with changes for Meier roughness, MIMICS, and SNICAR, and changes to leafcn and k*_nonmyc

bld/CLMBuildNamelist.pm

@@ -4212,7 +4212,6 @@ sub setup_logic_snowpack {
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'snow_overburden_compaction_method');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lotmp_snowdensity_method');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'upplim_destruct_metamorph');
-  add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fresh_snw_rds_max');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow_glc');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow_glc_ela');

bld/namelist_files/namelist_defaults_ctsm.xml

@@ -431,10 +431,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <upplim_destruct_metamorph   phys="clm5_0" >175.d00</upplim_destruct_metamorph>
 <upplim_destruct_metamorph   phys="clm5_1" >175.d00</upplim_destruct_metamorph>
 
-<fresh_snw_rds_max phys="clm4_5" >54.526d00</fresh_snw_rds_max>
-<fresh_snw_rds_max phys="clm5_0" >204.526d00</fresh_snw_rds_max>
-<fresh_snw_rds_max phys="clm5_1" >204.526d00</fresh_snw_rds_max>
-
 <overburden_compress_tfactor>0.08d00</overburden_compress_tfactor>
 
 <reset_snow>.false.</reset_snow>
@@ -488,9 +484,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <!-- The default filenames are given relative to the root directory
      for the CLM2 data in the CESM distribution -->
 <!-- Plant function types (relative to {csmdata}) -->
-<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c211112.nc</paramfile>
-<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c211112.nc</paramfile>
-<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c211112.nc</paramfile>
+<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c231117.nc</paramfile>
+<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c231117.nc</paramfile>
+<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c231117.nc</paramfile>
 
 <!-- ================================================================== -->
 <!-- FATES default parameter file                                       -->
@@ -503,6 +499,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <!-- ================================================================== -->
 
 <z0param_method>ZengWang2007</z0param_method>
+<z0param_method phys="clm5_1">Meier2022</z0param_method>
 
 <use_z0m_snowmelt z0param_method="Meier2022" >.true.</use_z0m_snowmelt>
 <use_z0m_snowmelt >.false.</use_z0m_snowmelt>

bld/namelist_files/namelist_definition_ctsm.xml

@@ -2783,11 +2783,6 @@ Snow compaction overburden exponential factor (1/K)
 Not used for snow_overburden_compaction_method=Vionnet2012
 </entry>
 
-<entry id="fresh_snw_rds_max" type="real" category="clm_physics"
-       group="aerosol"   >
-maximum warm (at freezing) fresh snow effective radius [microns]
-</entry>
-
 <entry id="reset_snow" type="logical" category="clm_physics"
        group="clm_snowhydrology_inparm"   >
 If set to .true., then reset the snow pack over non-glacier columns to a small value.

cime_config/testdefs/ExpectedTestFails.xml

@@ -74,7 +74,7 @@
     </phase>
   </test>
 
-  <test name="ERP_P72x2_Ld30.f45_f45_mg37.I2000Clm50FatesRs.cheyenne_intel.clm-mimicsFatesCold">
+  <test name="ERP_P72x2_Ld30.f45_f45_mg37.I2000Clm51FatesRs.cheyenne_intel.clm-mimicsFatesCold">
     <phase name="SHAREDLIB_BUILD">
       <status>PEND</status>
       <issue>#1045</issue>

cime_config/testdefs/testlist_clm.xml

@@ -17,15 +17,6 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ln6" grid="f09_g17" compset="I1850Clm50BgcNoAnthro" testmods="clm/Meier2022_surf_rough">
-    <machines>
-      <machine name="cheyenne" compiler="intel" category="aux_clm"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:20:00</option>
-      <option name="comment"  >Meier Surface roughness with no-anthro compset</option>
-    </options>
-  </test>
   <test name="SMS_Ld5" grid="f09_g17" compset="I1850Clm45BgcCru" testmods="clm/default">
     <machines>
       <machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
@@ -532,7 +523,7 @@
       <option name="comment"  >Test soil_decomp_method = 'MIMICSWieder2015'</option>
     </options>
   </test>
-  <test name="SMS_Ld5_Mmpi-serial" grid="1x1_brazil" compset="IHistClm50BgcQianRs" testmods="clm/mimics">
+  <test name="SMS_Ld5_Mmpi-serial" grid="1x1_brazil" compset="IHistClm51Bgc" testmods="clm/mimics">
     <machines>
       <machine name="izumi" compiler="gnu" category="aux_clm"/>
     </machines>
@@ -1163,35 +1154,32 @@
       <option name="comment"  >include a long Clm45 test, and include a production intel test of Clm45</option>
     </options>
   </test>
-  <test name="ERS_Ly3" grid="f10_f10_mg37" compset="I2000Clm51BgcCrop" testmods="clm/Meier2022_surf_rough">
+  <test name="ERS_Ly3" grid="f10_f10_mg37" compset="I2000Clm51BgcCrop">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
     <options>
       <option name="wallclock">01:40:00</option>
-      <option name="comment"  >include a long exact restart test with Meier surface roughness</option>
+      <option name="comment"  >include a long exact restart test with clm51</option>
     </options>
   </test>
-  <test name="SMS_D" grid="f10_f10_mg37" compset="I2000Clm51Bgc" testmods="clm/Meier2022_surf_rough">
+  <test name="SMS_D" grid="f10_f10_mg37" compset="I2000Clm51Bgc">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
       <machine name="cheyenne" compiler="gnu"   category="aux_clm"/>
-      <machine name="izumi"    compiler="nag"   category="aux_clm"/>
-      <machine name="izumi"    compiler="intel" category="aux_clm"/>
-      <machine name="izumi"    compiler="gnu"   category="aux_clm"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment"  >include a short DEBUG test with Meier surface roughness without crop</option>
+      <option name="comment"  >include a short DEBUG test with clm51 without crop</option>
     </options>
   </test>
-  <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm51Sp" testmods="clm/Meier2022_surf_rough">
+  <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm51Sp">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment"  >Exact restart short DEBUG SP test with Meier surface roughness</option>
+      <option name="comment"  >Exact restart short DEBUG SP test with clm51</option>
     </options>
   </test>
   <test name="ERS_Ly6_Mmpi-serial" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/cropMonthOutput">
@@ -1417,10 +1405,11 @@
   </test>
   <test name="SMS_D" grid="f10_f10_mg37" compset="I2000Clm51BgcCrop" testmods="clm/crop">
     <machines>
-      <machine name="izumi" compiler="intel" category="aux_clm"/>
       <machine name="cheyenne" compiler="nvhpc" category="aux_clm"/>
       <machine name="cheyenne" compiler="nvhpc" category="prebeta"/>
+      <machine name="izumi" compiler="intel" category="aux_clm"/>
       <machine name="izumi" compiler="gnu" category="aux_clm"/>
+      <machine name="izumi" compiler="nag" category="aux_clm"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
@@ -2039,7 +2028,7 @@
       <option name="comment">30 day exact restart test activating FATES size and age mortality mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERP_P72x2_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/mimicsFatesCold">
+  <test name="ERP_P72x2_Ld30" grid="f45_f45_mg37" compset="I2000Clm51FatesRs" testmods="clm/mimicsFatesCold">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
       <machine name="cheyenne" compiler="intel" category="fates"/>

cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm

@@ -1,2 +1,2 @@
-paramfile = '/glade/p/cesm/cseg/inputdata/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c211112.nc'
+paramfile = '/glade/p/cesm/cseg/inputdata/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c231117.nc'
 hist_fincl1 = 'CWDC_HR','C13_CWDC_HR','C14_CWDC_HR','CWD_HR_L2','CWD_HR_L2_vr','CWD_HR_L3','CWD_HR_L3_vr'

doc/ChangeLog

@@ -1,4 +1,122 @@
 ===============================================================
+Tag name: ctsm5.1.dev154
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Wed Nov 22 09:53:01 MST 2023
+One-line Summary: New params files: Changes for Meier roughness, MIMICS, and SNICAR, and changes to leafcn and k*_nonmyc
+
+Purpose and description of changes
+----------------------------------
+
+This PR (#2258) addresses several issues:
+1) Start using existing new params file for Meier roughness:
+/glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/paramdata/ctsm51_params.RMz0.c231011.nc
+and include bug-fix #2219.
+2) Update forcing heights per #2071.
+3) Update params file for MIMICS per #1845.
+4) Make leafcn for pfts 15 and 16 the same per #2184.
+5) Switch the values of params kc_nonmyc and kn_nonmyc per #2120.
+6) Move SNICAR parameters to ctsm51, clm50, and clm45 params files per #2247.
+
+See #2258 and the above issues for a list of contributors.
+
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[x] clm5_1
+
+[x] clm5_0
+
+[x] ctsm5_0-nwp
+
+[x] clm4_5
+
+
+Bugs fixed or introduced
+------------------------
+CTSM issues fixed (include CTSM Issue #):
+Fixes #2219
+Fixes #2071
+Fixes #1845
+Fixes #2184
+Fixes #2120
+Fixes #2247
+
+
+Notes of particular relevance for users
+---------------------------------------
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+ SNICAR namelist variable fresh_snw_rds_max moved to the params file.
+
+Changes made to namelist defaults (e.g., changed parameter values):
+ SNICAR namelist variable fresh_snw_rds_max moved to the params file.
+ Pointing to new params files for clm4_5, clm5_0, clm5_1.
+
+Changes to the datasets (e.g., parameter, surface or initial files):
+ New clm5_1 params file with new parameters and with modified values of existing parameters.
+ New clm5_0 and clm4_5 params files with new parameters for SNICAR.
+ ./rimport on the new params files fails with "No space left on device" but the 4 files are safe here:
+ /glade/u/home/slevis/paramfiles/*_params.c231117.nc
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Changes to tests or testing:
+- Remove clm50 Meier test. Should be clm51 but the compset I1850Clm51BgcNoAnthro does not exist.
+- Remove Meier testmod directory and remove such reference from corresponding tests.
+- Change mimics tests from clm50 to clm51.
+- For details, see the updated testlist_clm.xml file.
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    cheyenne ---- OK
+    izumi ------- OK
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: YES
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: ALL
+    - what platforms/compilers: ALL
+    - nature of change:
+      Larger than roundoff/same climate?
+      I will post this tag on the Answer changing tags wiki page as "SIGNIFICANT"
+      and will run a simulation and diagnostics to compare against dev145.
+
+      I used the izumi test-suite to perform one bfb sanity test:
+      I backed up my branch to 6dc1966 (before the snicar mods), then I put back the changes of the
+      commit right after snicar (71e174f). Comparing to dev154 (this tag's new baseline),
+      the izumi test-suite passed bfb (12 gnu, 18 intel, and 32 nag tests).
+      Other mods are quite confined and clear, so I will not pursue other sanity tests.
+
+ Changes to answers commit-by-commit in this PR:
+ f9978db and b8c71fa: These two change answers for Meier2022 and, therefore, clm51 only
+ 626f520: Takes out if (z0param_method == 'Meier2022'), so changes answers for all three CLMs
+ 319d194: Changes answers for mimics and, therefore clm51 only (order of ops, so roundoff)
+ 2ee6943: Changes clm51 params file, so affects clm51 only (expect more than roundoff)
+ f185a31: bfb
+ 6dc1966: This git merge escomp/master probably does change answers from previous commit
+ 29ca5ad and 71e174f: Puts snicar params on the params files for all three CLMs; sanity test gave bfb
+
+Other details
+-------------
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/2258
+
+===============================================================
+===============================================================
 Tag name: ctsm5.1.dev153
 Originator(s): afoster (Adrianna Foster) and johnpaulalex (John Paul Alex)
 Date: Fri Nov 17 11:53:14 MST 2023
@@ -162,18 +280,9 @@ README.md for testing was updated to clarify that arguments should be used.
 
 Testing summary:
 ----------------
-[Remove any lines that don't apply.]
 
  [PASS means all tests PASS; OK means tests PASS other than expected fails.]
 
-  build-namelist tests (if CLMBuildNamelist.pm has changed):
-
-    cheyenne -
-
-  tools-tests (test/tools) (if tools have been changed):
-
-    cheyenne -
-
   python testing (if python code has changed; see instructions in python/README.md; document testing done):
 
     (any machine) - cheyenne OK (pylint suggestions from previous work remain)
@@ -189,13 +298,6 @@ FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm
 FAIL SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm51Bgc.izumi_nag.clm-default--clm-NEON-NIWO BASELINE ctsm5.1.dev151: DIFF
 FAIL SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm51Bgc.izumi_nag.clm-NEON-MOAB--clm-PRISM BASELINE ctsm5.1.dev151: DIFF
 
-  fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
-    cheyenne ----
-    izumi -------
-
-  any other testing (give details below):
-
-If the tag used for baseline comparisons was NOT the previous tag, note that here:
 
 Answer changes
 --------------

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+    ctsm5.1.dev154   slevis 11/22/2023 New params files with changes for Meier roughness, MIMICS, and SNICAR, and changes to leafcn and k*_nonmyc
     ctsm5.1.dev153  afoster 11/17/2023 Call new FATES-side FatesReadParameters
     ctsm5.1.dev152 multiple 11/14/2023 Mv tools to /python and add tests; add snow_thermal_cond_method; a few fixes / refactors
     ctsm5.1.dev151   rgknox 11/11/2023 Fixes to FATES long run restarts