Merge pull request #543 from ekluzek/updateclm50rel2dev12

Update release branch to ctsm1.0.dev012
ESCOMP · Oct 23, 2018 · 86d298f · 86d298f
2 parents 9a526f2 + 0600fc1
commit 86d298f
Show file tree

Hide file tree

Showing 55 changed files with 2,323 additions and 818 deletions.
diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml
@@ -112,8 +112,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <building_temp_method phys="clm5_0">1</building_temp_method>
 <building_temp_method phys="clm4_5">0</building_temp_method>
 
-<calc_human_stress_indices phys="clm5_0">.true.</calc_human_stress_indices>
-<calc_human_stress_indices phys="clm4_5">.false.</calc_human_stress_indices>
+<calc_human_stress_indices phys="clm5_0">FAST</calc_human_stress_indices>
+<calc_human_stress_indices phys="clm4_5">NONE</calc_human_stress_indices>
 
 <!-- Default urban traffic flux -->
 <urban_traffic>.false.</urban_traffic>

diff --git a/bld/namelist_files/namelist_defaults_clm4_5_tools.xml b/bld/namelist_files/namelist_defaults_clm4_5_tools.xml
@@ -624,10 +624,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </mksrf_fvegtyp>
 
 <!-- Historical Greenhouse gas concentrations from CAM -->
-<mkghg_bndtvghg           >atm/cam/ggas/ghg_hist_1765-2005_c091218.nc</mkghg_bndtvghg>
-<mkghg_bndtvghg rcp="2.6" >atm/cam/ggas/ghg_rcp26_1765-2500_c100405.nc</mkghg_bndtvghg>
-<mkghg_bndtvghg rcp="4.5" >atm/cam/ggas/ghg_rcp45_1765-2500_c100405.nc</mkghg_bndtvghg>
-<mkghg_bndtvghg rcp="6"   >atm/cam/ggas/ghg_rcp60_1765-2500_c100901.nc</mkghg_bndtvghg>
-<mkghg_bndtvghg rcp="8.5" >atm/cam/ggas/ghg_rcp85_1765-2500_c100203.nc</mkghg_bndtvghg>
+<mkghg_bndtvghg  hgrid="lat-bands" >atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</mkghg_bndtvghg>
+<mkghg_bndtvghg  hgrid="global"    >/gpfs/fs1/p/acom/acom-climate/cesm2/inputdata/atm/waccm/lb/LBC_1750-2015_CMIP6_GlobAnnAvg_c180905.nc</mkghg_bndtvghg>
 
 </namelist_defaults>
diff --git a/bld/namelist_files/namelist_definition_clm4_5.xml b/bld/namelist_files/namelist_definition_clm4_5.xml
@@ -868,9 +868,13 @@ If TRUE, urban traffic flux will be activated (Currently NOT implemented).
 1 = prognostic calculation of interior building temp (clm5_0)
 </entry>
 
-<entry id="calc_human_stress_indices" type="logical" category="clm_physics"
-       group="clm_humanindex_inparm" valid_values="" >
-If TRUE, human stress indices will be calculated
+<entry id="calc_human_stress_indices" type="char*16" category="clm_physics"
+       group="clm_humanindex_inparm" valid_values="ALL,FAST,NONE" >
+Human heat stress indices:
+    ALL  = All indices will be calculated
+    FAST = A subset of indices will be calculated (will not include the computationally 
+           expensive wet bulb calculation and associated indices)
+    NONE = No indices will be calculated
 </entry>
 
 <entry id="wrtdia" type="logical" category="history"
@@ -1051,6 +1055,12 @@ Max number of plant functional types in naturally vegetated landunit.
 Toggle to turn on the dynamic root model
 </entry>
 
+<entry id="use_SSRE" type="logical" category="physics"
+       group="clm_inparm" valid_values="" value=".false.">
+Toggle to turn on on diagnostic Snow Radiative Effect
+</entry>
+
+
 <!--                                                   -->
 <!-- mkmapdata  namelist                               -->
 <!--                                                   -->

diff --git a/bld/namelist_files/use_cases/1850_control.xml b/bld/namelist_files/use_cases/1850_control.xml
@@ -35,5 +35,9 @@
 <!-- Use single year ndep file for CLM50 as the new multi-year file has different times that change answers relative to control sims -->
 <stream_fldfilename_ndep phys="clm5_0" use_cn=".true."
 >lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>
+
+<ndep_taxmode            phys="clm5_0" use_cn=".true." >cycle</ndep_taxmode>
+
+<ndep_varlist            phys="clm5_0" use_cn=".true." >NDEP_month</ndep_varlist>
 
 </namelist_defaults>
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
@@ -2,13 +2,12 @@
 
 <expectedFails>
   <category name="aux_clm">
-    <entry issue="#404"     >FAIL ERP_D_Ld10_P36x2.f10_f10_musgs.IHistClm50BgcCrop.cheyenne_intel.clm-ciso_decStart RUN</entry>
-    <entry issue="#158"     >FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_gnu.clm-monthly RUN</entry>
-    <entry issue="#158"     >FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_intel.clm-monthly RUN</entry>
-    <entry issue="#339"     >FAIL ERS_D_Ld3.f10_f10_musgs.I1850Clm50BgcCrop.cheyenne_gnu.clm-default COMPARE_base_rest</entry>
-    <entry issue="#384"     >FAIL ERP_D_Ld5.f09_g17.I2000Clm50Vic.cheyenne_intel.clm-vrtlay RUN</entry>
-    <entry issue="#442"     >FAIL SMS.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN</entry>
-    <entry issue="#442"     >FAIL SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN</entry>
+    <entry issue="#404"            >FAIL ERP_D_Ld10_P36x2.f10_f10_musgs.IHistClm50BgcCrop.cheyenne_intel.clm-ciso_decStart RUN</entry>
+    <entry issue="#158"            >FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_gnu.clm-monthly RUN</entry>
+    <entry issue="#158"            >FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_intel.clm-monthly RUN</entry>
+    <entry issue="#442"            >FAIL SMS.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN</entry>
+    <entry issue="#442"            >FAIL SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN</entry>
+    <entry issue="ESMCI/cime#2804" >FAIL ERS_D_Ln9_P480x3.f19_g16.I2000Clm50SpGs.cheyenne_intel.clm-waccmx_offline MODEL_BUILD</entry>
   </category>
   <category name="fates">
     <entry issue="NGEET/fates#315">FAIL ERS_Ld60.f45_f45_mg37.I2000Clm45Fates.hobart_nag.clm-Fates COMPARE_base_rest</entry>

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -107,6 +107,14 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
+  <test name="ERS_D_Ln9_P480x3" grid="f19_g16" compset="I2000Clm50SpGs" testmods="clm/waccmx_offline">
+    <machines>
+      <machine name="cheyenne" compiler="intel" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+    </options>
+  </test>
   <test name="ERI_Ld9" grid="f45_g37" compset="I2000Clm40SpCruGs" testmods="clm/40default">
     <machines>
       <machine name="cheyenne" compiler="intel" category="prebeta"/>
@@ -952,7 +960,7 @@
       <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
     </machines>
     <options>
-      <option name="wallclock">01:20:00</option>
+      <option name="wallclock">02:00:00</option>
       <option name="comment"  >tests mid-year restart, with the restart file being written in the middle of the second year</option>
     </options>
   </test>

diff --git a/cime_config/testdefs/testmods_dirs/clm/clm50KSinkMOut/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm50KSinkMOut/user_nl_clm
@@ -1,2 +1,3 @@
  hist_nhtfrq    = 0,-240
  hist_mfilt     = 1,1
+ calc_human_stress_indices = 'ALL'
diff --git a/cime_config/testdefs/testmods_dirs/clm/clm50KitchenSink/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm50KitchenSink/user_nl_clm
@@ -4,3 +4,4 @@ use_bedrock = .true.
 use_luna = .true.
 use_flexibleCN = .true.
 use_fun = .true.
+calc_human_stress_indices = 'ALL'
diff --git a/cime_config/testdefs/testmods_dirs/clm/default/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/default/user_nl_clm
@@ -24,4 +24,4 @@
                   'SoilAlpha_U',
                   'SWup', 'LWup', 'URBAN_AC', 'URBAN_HEAT'
 
-
+ use_ssre = .true.
diff --git a/cime_config/testdefs/testmods_dirs/clm/reduceOutput/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/reduceOutput/user_nl_clm
@@ -10,3 +10,5 @@ hist_fincl1       = 'SNOWLIQ','SNOWICE' ,
                     'TG', 
                     'RH2M_U', 'RH2M_R',
                     'QRUNOFF'
+calc_human_stress_indices = 'NONE'
+use_ssre = .false.
diff --git a/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/README b/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/README
@@ -0,0 +1,4 @@
+The purpose of this test is to run with the changes needed for the WACCM-X configuration
+but with CTSM standalone. Since, WACCM-X is unlikely to have initial conditions that are 
+in equalibrium purposely use a file that will require the model to flush out a shock to the system
+at startup.
diff --git a/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/include_user_mods
@@ -0,0 +1 @@
+../default
diff --git a/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/shell_commands b/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/shell_commands
@@ -0,0 +1,2 @@
+./xmlchange USE_ESMF_LIB=TRUE,ATM_NCPL=288,CALENDAR=GREGORIAN
+
diff --git a/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/user_nl_clm
@@ -0,0 +1,5 @@
+! Add in an initial condition file that isn't in equilibrium and will need to be brought into equilibrium.
+! We purposely want to add a shock to ensure the model can properly respond to it, skipping balance checks
+! at the beginning and then coming into balance after enough time.
+ finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.I1850Clm45BgcGs.0901-01-01.0.9x1.25_gx1v6_simyr1850_c180204.nc'
+ use_init_interp = .true.