Merge branch 'updatetodev176' of github.com:ekluzek/CTSM into updatet…

…odev176 Conflicts: cime_config/config_component.xml doc/ChangeSum
ekluzek · Apr 11, 2024 · 63bda08 · 63bda08
2 parents 156fb3a + 6bfb9af
commit 63bda08
Show file tree

Hide file tree

Showing 27 changed files with 100 additions and 312 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,11 +91,10 @@ ctsm.input_data_list.previous
 /tools/mksurfdata_esmf/mksurfdata_in
 /tools/mksurfdata_esmf/surfdata_*.nc
 /tools/mksurfdata_esmf/landuse.timeseries_*.nc
-/tools/mksurfdata_esmf/mksurfdata_jobscript_multi
-/tools/mksurfdata_esmf/mksurfdata_jobscript_single
+/tools/mksurfdata_esmf/mksurfdata_jobscript_multi.sh
+/tools/mksurfdata_esmf/mksurfdata_jobscript_single.sh
 /tools/mksurfdata_esmf/pio_iotype.txt
 /tools/mksurfdata_esmf/*.sh
-/tools/mksurfdata_esmf/mksrf_*.o*
 /tools/mksurfdata_esmf/tool_bld
 /tools/mksurfdata_esmf/pio_iotype.txt
 

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -439,7 +439,7 @@ 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="clm6_0" >lnd/clm2/paramdata/ctsm51_params.c240208.nc</paramfile>
+<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c240208.nc</paramfile>
 <paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c240208.nc</paramfile>
 <paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c240208.nc</paramfile>
 <paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c240208.nc</paramfile>
@@ -966,15 +966,15 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
          lnd_tuning_mode="clm5_0_GSWP3v1"
->lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
 </finidat>
 
 
 <finidat hgrid="0.9x1.25"  maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
          lnd_tuning_mode="clm5_0_CRUv7"
->lnd/clm2/initdata_map/clmi.I1850Clm50BgcCropCru-ciso.1526-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm50BgcCropCru-ciso.1526-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
 </finidat>
 
 
@@ -1003,7 +1003,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
          lnd_tuning_mode="clm5_1_GSWP3v1"
->lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
 </finidat>
 <!-- From the clm5_0_cam6.0 setting above...-->
 <!-- Use f09 clm5_0 cam6 spinup file for clm5_1 cam6-->
@@ -1025,7 +1025,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
          lnd_tuning_mode="clm6_0_GSWP3v1"
->lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
 </finidat>
 <!-- From the clm5_0_cam6.0 setting above...-->
 <!-- Use f09 clm5_0 cam6 spinup file for clm6_0 cam6-->
@@ -1046,35 +1046,35 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm4_5_GSWP3v1"
->lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
 </finidat>
 
 <!-- This is the same file as above but, for a different tuning mode -->
 <finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm4_5_CRUv7"
->lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
 </finidat>
 
 <!-- This is the same file as above but, for a different tuning mode -->
 <finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm5_0_GSWP3v1"
->lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
 </finidat>
 <finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm5_1_GSWP3v1"
->lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
 </finidat>
 <finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm6_0_GSWP3v1"
->lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
 </finidat>
 
 
@@ -1083,7 +1083,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm5_0_CRUv7"
->lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
+>lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
 </finidat>
 
 <!-- Present day no crop spinup f09/f19 grid with irrigation on -->

diff --git a/bld/namelist_files/namelist_definition.xsl b/bld/namelist_files/namelist_definition.xsl
@@ -252,18 +252,6 @@
     <p>These are namelist items that appear in the CLM Tools under components/clm/tools.
     </p>
     <table border="1" cellpadding="10">
-    <caption>CLM mksurfdata</caption>
-      <tr>
-      <th rowspan="2">Name</th>
-      <th rowspan="2">Type</th>
-      <th>Description</th>
-      </tr>
-      <tr>
-      <th colspan="1">Valid values</th>
-      </tr>
-      <xsl:apply-templates select="entry[@category='mksurfdata']"/>
-    </table>
-    <table border="1" cellpadding="10">
     <caption>CLM mkgriddata</caption>
       <tr>
       <th rowspan="2">Name</th>
@@ -276,17 +264,6 @@
       <xsl:apply-templates select="entry[@category='mkgriddata']"/>
     </table>
     <table border="1" cellpadding="10">
-    <caption>CLM mkmapdata</caption>
-      <tr>
-      <th rowspan="2">Name</th>
-      <th rowspan="2">Type</th>
-      <th>Description</th>
-      </tr>
-      <tr>
-      <th colspan="1">Valid values</th>
-      </tr>
-      <xsl:apply-templates select="entry[@category='mkmapdata']"/>
-    </table>
     <table border="1" cellpadding="10">
     <caption>CLM mkgriddata</caption>
       <tr>

diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -1374,209 +1374,6 @@ Toggle to turn on the dynamic root model
 Toggle to turn on on diagnostic Snow Radiative Effect
 </entry>
 
-<!--                                                   -->
-<!-- mksurfdata namelist                               -->
-<!--                                                   -->
-<entry id="gitdescribe" type="char*80" category="mksurfdata"
-       group="clmexp" valid_values="" >
-Output of "git describe" to give the tag/commit the version being used corresponds to
-</entry>
-
-<entry id="mksrf_filename" type="char*256" category="mksurfdata"
-       group="default_settings" 
-       valid_values="mksrf_fsoitex,mksrf_forganic,mksrf_flakwat,mksrf_fwetlnd,mksrf_fmax,mksrf_fmax,mksrf_fglacier,mksrf_fglacierregion,mksrf_fvocef,mksrf_furbtopo,firrig,mksrf_furban,mksrf_fvegtyp,mksrf_fhrvtyp,mksrf_fsoicol,mksrf_flai,mksrf_fgdp,mksrf_fpeat,mksrf_fsoildepth,mksrf_fabm,mksrf_ftopostats,mksrf_fvic" >
-Filename for mksurfdata_map to remap raw data into the output surface dataset
-</entry>
-
-<entry id="mksrf_fvegtyp" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Plant Function Type dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fhrvtyp" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Harvest dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fglacier" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Dataset for percent glacier land-unit for mksurfdata
-</entry>
-
-<entry id="mksrf_fglacierregion" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Dataset for glacier region ID for mksurfdata
-</entry>
-
-<entry id="mksrf_furbtopo" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Dataset for topography used to define urban threshold
-</entry>
-
-<entry id="mksrf_flai" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Leaf Area Index dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fsoitex" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Soil texture dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fsoicol" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Soil color dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fmax" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Soil max fraction dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_ffrac" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-High resolution land mask/fraction dataset for mksurfdata
-(used for glacier_mec land-units)
-</entry>
-
-<entry id="mksrf_gridtype" type="char*256" category="mksurfdata"
-       group="clmexp" value="global" valid_values="global,regional" >
-Type of grid to create for mksurfdata
-</entry>
-
-<entry id="mksrf_fgrid" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Grid file at the output resolution for mksurfdata
-</entry>
-
-<entry id="mksrf_fdynuse" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Text file with filepaths (or list of XML elements) for vegetation fractions
-and harvesting for each year to run over for mksurfdata to be able to model
-transient land-use change
-</entry>
-
-<entry id="mksrf_ftopo" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-High resolution topography dataset for mksurfdata
-(used for glacier_mec land-units)
-</entry>
-
-<entry id="mksrf_firrig" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Irrigation dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_forganic" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Organic soil dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_flakwat" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Lake water dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fwetlnd" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Wetland dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_furban" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Urban dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fvocef" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Biogenic Volatile Organic Compounds (VOC) emissions dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fgdp" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-GDP dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fpeat" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Peat dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fsoildepth" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Soil depth dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fabm" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Agricultural burning dominant month dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_ftopostats" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-Topography statistics dataset for mksurfdata
-</entry>
-
-<entry id="mksrf_fvic" type="char*256" category="mksurfdata"
-       input_pathname="abs" group="clmexp" valid_values="" >
-VIC parameters dataset for mksurfdata
-</entry>
-
-<entry id="outnc_double" type="logical" category="mksurfdata"
-       group="clmexp" value=".true.">
-If TRUE, output variables in double precision for mksurfdata
-</entry>
-
-<entry id="all_urban" type="logical" category="mksurfdata"
-       group="clmexp" value=".false.">
-If TRUE, ignore other files, and set the output percentage to 100% urban and
-zero for other land-use types.
-</entry>
-
-<entry id="no_inlandwet" type="logical" category="mksurfdata"
-       group="clmexp" value=".true.">
-If TRUE, set wetland to 0% over land (renormalizing other landcover types as needed);
-wetland will only be used for ocean points.
-</entry>
-
-<entry id="numpft" type="integer" category="mksurfdata"
-       group="clmexp" value="16" valid_values="16,20" >
-Number of Plant Functional Types (excluding bare-soil)
-</entry>
-
-<entry id="pft_idx" type="integer" category="mksurfdata"
-       group="clmexp"
-       valid_values="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20" >
-Plant Function Type index to override global file with for mksurfdata
-</entry>
-
-<entry id="pft_frc" type="real" category="mksurfdata"
-       group="clmexp" valid_values="">
-Plant Function Type fraction to override global file with for mksurfdata
-</entry>
-
-<entry id="soil_color" type="integer" category="mksurfdata"
-       group="clmexp"
-       valid_values="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20" >
-Soil color index to override global file with for mksurfdata
-</entry>
-
-<entry id="soil_fmax" type="real" category="mksurfdata"
-       group="clmexp" >
-Soil maximum fraction to override global file with for mksurfdata
-</entry>
-
-<entry id="soil_sand" type="real" category="mksurfdata"
-       group="clmexp" >
-Soil percent sand to override global file with for mksurfdata
-</entry>
-
-<entry id="soil_clay" type="real" category="mksurfdata"
-       group="clmexp" >
-Soil percent clay to override global file with for mksurfdata
-</entry>
-
-
 <!--                                                   -->
 <!-- mkgriddata namelist                               -->
 <!--                                                   -->

diff --git a/cime_config/SystemTests/mksurfdataesmf.py b/cime_config/SystemTests/mksurfdataesmf.py
@@ -35,7 +35,7 @@ def __init__(self, case):
         time_stamp = datetime.today().strftime("%y%m%d")
         self._res = "10x15"  # see important comment in script's docstring
         self._model_yr = "1850"
-        self._jobscript = os.path.join(self._get_caseroot(), "mksurfdata_jobscript_single")
+        self._jobscript = os.path.join(self._get_caseroot(), "mksurfdata_jobscript_single.sh")
         self._fsurdat_namelist = os.path.join(
             self._get_caseroot(),
             f"surfdata_{self._res}_hist_{self._model_yr}_78pfts_c{time_stamp}.namelist",
@@ -60,9 +60,9 @@ def build_phase(self, sharedlib_only=False, model_only=False):
         # if the test stops and gets restarted.
         if sharedlib_only:
             # Paths and strings
-            build_script_path = os.path.join(self._tool_path, "gen_mksurfdata_build.sh")
+            build_script_path = os.path.join(self._tool_path, "gen_mksurfdata_build")
             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_jobscript_path = os.path.join(self._tool_path, "gen_mksurfdata_jobscript_single.sh")
             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 1 --tasks-per-node 64 --namelist-file {self._fsurdat_namelist} --bld-path {self._tool_bld}"