Merge remote-tracking branch 'escomp/master' into dynlakes_master_not…

…ools

.config_files.xml

@@ -18,9 +18,10 @@
     <default_value>unset</default_value>
     <values>
       <value component="clm"      >$SRCROOT</value>
-      <value component="dlnd"      >$CIMEROOT/src/components/data_comps/dlnd</value>
-      <value component="slnd"      >$CIMEROOT/src/components/stub_comps/slnd</value>
-      <value component="xlnd"      >$CIMEROOT/src/components/xcpl_comps/xlnd</value>
+      <value component="dlnd" comp_interface="mct">$CIMEROOT/src/components/data_comps_mct/dlnd</value>
+      <value component="dlnd" comp_interface="nuopc">$CIMEROOT/src/components/cdeps/dlnd</value>
+      <value component="slnd"      >$CIMEROOT/src/components/stub_comps_$COMP_INTERFACE/slnd</value>
+      <value component="xlnd"      >$CIMEROOT/src/components/xcpl_comps_$COMP_INTERFACE/xlnd</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>

Externals.cfg

@@ -8,29 +8,29 @@ required = True
 local_path = components/cism
 protocol = git
 repo_url = https://github.com/ESCOMP/CISM-wrapper
-tag = cism2_1_68
+tag = cism2_1_69
 externals = Externals_CISM.cfg
 required = True
 
 [rtm]
 local_path = components/rtm
 protocol = git
 repo_url = https://github.com/ESCOMP/RTM
-tag = rtm1_0_71
+tag = rtm1_0_72
 required = True
 
 [mosart]
 local_path = components/mosart
 protocol = git
 repo_url = https://github.com/ESCOMP/MOSART
-tag = mosart1_0_36
+tag = mosart1_0_37
 required = True
 
 [cime]
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-tag = branch_tags/cime5.8.24_a01
+tag = cime5.8.30
 externals = ../Externals_cime.cfg
 required = True
 

Externals_cime.cfg

@@ -1,9 +1,23 @@
 [cmeps]
-hash = 386e1631a6a1e1900700c3a04d693df8692c9420
+hash = cab9030
 protocol = git
 repo_url = https://github.com/ESCOMP/CMEPS.git
 local_path = src/drivers/nuopc/
 required = True
 
+[fox]
+hash = 0ed59c1
+protocol = git
+repo_url = https://github.com/ESMCI/fox.git
+local_path = src/externals/fox
+required = True
+
+[cdeps]
+hash = d7b8a4c8e1b7cbff88da5bdb782ab715de62468a
+protocol = git
+repo_url = https://github.com/ESCOMP/CDEPS.git
+local_path = src/components/cdeps
+required = True
+
 [externals_description]
 schema_version = 1.0.0

bld/namelist_files/namelist_defaults_ctsm_tools.xml

@@ -46,15 +46,21 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <scripgriddata hgrid="C24"  lmask="nomask" >atm/cam/coords/C24_SCRIP_desc.181018.nc</scripgriddata>
 
 <!-- HOMME grids -->
-<scripgriddata hgrid="ne240np4" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne240np4_nomask_c091227.nc</scripgriddata>
-<scripgriddata hgrid="ne120np4" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne120np4_nomask_c101123.nc</scripgriddata>
-<scripgriddata hgrid="ne60np4"  lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne60np4_nomask_c100408.nc</scripgriddata>
-<scripgriddata hgrid="ne30np4"  lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne30np4_nomask_c101123.nc</scripgriddata>
-<scripgriddata hgrid="ne16np4"  lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne16np4_nomask_c110512.nc</scripgriddata>
-<scripgriddata hgrid="ne4np4"   lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne4np4_nomask_c110808.nc</scripgriddata>
+<scripgriddata hgrid="ne240np4"     lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne240np4_nomask_c091227.nc</scripgriddata>
+<scripgriddata hgrid="ne120np4"     lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne120np4_nomask_c101123.nc</scripgriddata>
+<scripgriddata hgrid="ne60np4"      lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne60np4_nomask_c100408.nc</scripgriddata>
+<scripgriddata hgrid="ne30np4"      lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne30np4_nomask_c101123.nc</scripgriddata>
+<scripgriddata hgrid="ne16np4"      lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne16np4_nomask_c110512.nc</scripgriddata>
+<!-- HOMME SE dycore Physics grids -->
+<scripgriddata hgrid="ne30np4.pg2"  lmask="nomask" >atm/cam/coords/ne30pg2_scrip_c170608.nc</scripgriddata>
+<scripgriddata hgrid="ne30np4.pg3"  lmask="nomask" >atm/cam/coords/ne30pg3_scrip_170604.nc</scripgriddata>
+<scripgriddata hgrid="ne120np4.pg2" lmask="nomask" >atm/cam/coords/ne120pg2_scrip_c170629.nc</scripgriddata>
+<scripgriddata hgrid="ne120np4.pg3" lmask="nomask" >atm/cam/coords/ne120pg3_scrip_c170628.nc</scripgriddata>
 
 <!-- Refined mesh grids -->
-<scripgriddata hgrid="conus_30_x8" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_conus_30_x8_nomask_c170111.nc</scripgriddata>
+<scripgriddata hgrid="ne0np4CONUS.ne30x8"      lmask="nomask" >atm/cam/coords/ne0CONUSne30x8_scrip_c200107.nc</scripgriddata>
+<scripgriddata hgrid="ne0np4ARCTICGRIS.ne30x8" lmask="nomask" >atm/cam/coords/ne0ARCTICGRISne30x8_scrip_c191209.nc</scripgriddata>
+<scripgriddata hgrid="ne0np4ARCTIC.ne30x4"     lmask="nomask" >atm/cam/coords/ne0ARCTICne30x4_scrip_c191212.nc</scripgriddata>
 
 <!-- Regular lat/lon grids -->
 <scripgriddata hgrid="0.125x0.125" lmask="nomask"    
@@ -265,6 +271,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <mksrf_furban   hgrid="3x3min"   lmask="LandScan2004"
 >lnd/clm2/rawdata/mksrf_urban_0.05x0.05_simyr2000.c120621.nc</mksrf_furban>
 
+<mksrf_furban   hgrid="3x3min"   lmask="LandScan2004" sim_year="PtVg"
+>lnd/clm2/rawdata/mksrf_urban_0.05x0.05_zerourbanpct.c181014.nc</mksrf_furban>
+
 <!-- mksrf_fglacier % glacier land-unit -->
 <!-- WJS (9-26-12): 
      There are two versions of this dataset: the "standard" version uses
@@ -294,6 +303,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <!-- fire-related datasets -->
 <mksrf_fgdp hgrid="0.5x0.5" lmask="AVHRR"
 >lnd/clm2/rawdata/mksrf_gdp_0.5x0.5_AVHRR_simyr2000.c130228.nc</mksrf_fgdp>
+<mksrf_fgdp hgrid="0.5x0.5" lmask="AVHRR" sim_year="PtVg"
+>lnd/clm2/rawdata/mksrf_gdp_0.5x0_zerogdp.c200413.nc</mksrf_fgdp>
 
 <mksrf_fpeat hgrid="0.5x0.5" lmask="AVHRR"
 >lnd/clm2/rawdata/mksrf_peatf_0.5x0.5_AVHRR_simyr2000.c130228.nc</mksrf_fpeat>
@@ -303,6 +314,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 <mksrf_fabm hgrid="0.5x0.5" lmask="AVHRR"
 >lnd/clm2/rawdata/mksrf_abm_0.5x0.5_AVHRR_simyr2000.c130201.nc</mksrf_fabm>
+<mksrf_fabm hgrid="0.5x0.5" lmask="AVHRR" sim_year="PtVg"
+>lnd/clm2/rawdata/mksrf_abm_0.5x0.5_missingabm.c200413.nc</mksrf_fabm>
+
 
 <mksrf_ftopostats hgrid="1km-merge-10min" lmask="HYDRO1K-merge-nomask"
 >lnd/clm2/rawdata/mksrf_topostats_1km-merge-10min_HYDRO1K-merge-nomask_simyr2000.c130402.nc</mksrf_ftopostats>
@@ -4666,7 +4680,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </mksrf_fvegtyp>
 
 <!-- 
-      Future scenarios 
+      Future scenarios  (up to 2100)
 -->
 
 <!-- SSP1-RCP 2.6 -->

bld/namelist_files/namelist_defaults_overall.xml

@@ -12,16 +12,26 @@ in a namelist, but they are default values that will help
 determine default values for namelists.
 -->
 
-<!-- Default CLM start-type -->
+<!-- 
+
+    Default CLM start-type 
+
+    NOTE: For clm_start_type of "startup" these need to be carefully coordinated with
+          the settings for use_init_interp, init_interp_attributes and finidat in
+          namelist_defaults_ctsm.xml.
+
+-->
+
+<clm_start_type phys="clm5_0" use_cndv=".true." >arb_ic</clm_start_type>
+<clm_start_type phys="clm4_5" use_cndv=".true." >arb_ic</clm_start_type>
+<clm_start_type phys="clm4_5" use_fates=".true.">arb_ic</clm_start_type>
+<clm_start_type phys="clm5_0" use_fates=".true.">arb_ic</clm_start_type>
 <clm_start_type phys="clm4_5" sim_year="1850"   >startup</clm_start_type>
 <clm_start_type phys="clm5_0" sim_year="1850"   >startup</clm_start_type>
 <clm_start_type phys="clm4_5" sim_year="2000"   >startup</clm_start_type>
 <clm_start_type phys="clm5_0" sim_year="2000"   >startup</clm_start_type>
 <clm_start_type phys="clm4_5"                   >arb_ic</clm_start_type>
 <clm_start_type phys="clm5_0"                   >arb_ic</clm_start_type>
-<clm_start_type phys="clm5_0" use_cndv=".true." >arb_ic</clm_start_type>
-<clm_start_type phys="clm4_5" use_cndv=".true." >arb_ic</clm_start_type>
-<clm_start_type phys="clm5_0" use_fates=".true.">arb_ic</clm_start_type>
 <clm_start_type phys="clm4_5" use_fates=".true.">arb_ic</clm_start_type>
 <clm_start_type bgc_spinup="on"                 >cold</clm_start_type>
 

bld/namelist_files/namelist_definition_ctsm.xml

@@ -619,11 +619,6 @@ The maximum value to use for zeta under stable conditions
 baseline proportion of nitrogen allocated for electron transport (J)
 </entry>
 
-<entry id="dtime" type="real"  category="clm_physics" 
-       group="clm_inparm" valid_values="">
-Time step (seconds)
-</entry>
-
 <entry id="use_fates" type="logical" category="physics"
         group="clm_inparm" valid_values="" value=".false.">
 Toggle to turn on the FATES model
@@ -1953,7 +1948,7 @@ CLM run type.
 
 <entry id="res" type="char*30" category="default_settings"
        group="default_settings"  
-       valid_values="conus_30_x8,512x1024,360x720cru,128x256,64x128,48x96,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min,C24,C48,C96,C192,C384">
+       valid_values="512x1024,360x720cru,128x256,64x128,48x96,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4.pg2,ne30np4.pg3,ne30np4,ne60np4,ne120np4,ne120np4.pg2,ne120np4.pg3,ne0np4CONUS.ne30x8,ne0np4.ARCTIC.ne30x4,ne0np4.ARCTICGRIS.ne30x8,ne240np4,1km-merge-10min,C24,C48,C96,C192,C384">
 Horizontal resolutions
 Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min, 1km-merge-10min and 0.33x0.33 are only used for CLM toolsI
 </entry> 
@@ -1970,7 +1965,7 @@ hist means do NOT use a future scenario, just use historical data.
 
 <entry id="mask" type="char*10" category="default_settings"
        group="default_settings"  
-       valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx1v1,T62,cruncep,nldas2">
+       valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx0.1v3,tx1v1,T62,cruncep,nldas2">
 Land mask description
 </entry> 
 
@@ -1990,7 +1985,7 @@ If 1, turn on the MEGAN model for BVOC's (Biogenic Volitile Organic Compounds)
 
 <entry id="sim_year" type="char*4" category="default_settings"
        group="default_settings" valid_values=
-"PtVg,1000,850,1100,1350,1600,1850,1855,1865,1875,1885,1895,1905,1915,1925,1935,1945,1955,1965,1975,1980,1985,1995,2000,2005,2010,2015,2025,2035,2045,2055,2065,2075,2085,2095,2105">
+"PtVg,1000,850,1100,1350,1600,1850,1855,1865,1875,1885,1895,1905,1915,1925,1935,1945,1955,1965,1975,1979,1980,1982,1985,1995,2000,2005,2010,2013,2015,2025,2035,2045,2055,2065,2075,2085,2095,2105">
 Year to simulate and to provide datasets for (such as surface datasets, initial conditions, aerosol-deposition, Nitrogen deposition rates etc.)
 A sim_year of 1000 corresponds to data used for testing only, NOT corresponding to any real datasets.
 A sim_year greater than 2015 corresponds to ssp_rcp scenario data
@@ -2028,8 +2023,8 @@ Attributes to use when looking for an initial condition file (finidat) if interp
 How close in years to use when looking for an initial condition file (finidat) if interpolation is turned on (use_init_interp is .true.)
 </entry>
 
-<entry id="init_interp_sim_years" type="integer(2)"  category="default_settings"
-       group="default_settings" valid_values="1850,2000" >
+<entry id="init_interp_sim_years" type="integer(6)"  category="default_settings"
+       group="default_settings" valid_values="1850,1979,2000,2003,2010,2013" >
 Simulation years you can look for in initial condition files (finidat) if interpolation is turned on (use_init_interp is .true.)
 </entry>
 

bld/namelist_files/use_cases/20thC_transient.xml

@@ -19,11 +19,11 @@
 <irrigate use_crop=".true." phys="clm4_5"                   >.false.</irrigate>
 
 <stream_year_first_ndep phys="clm4_5" use_cn=".true."   >1850</stream_year_first_ndep>
-<stream_year_last_ndep  phys="clm4_5" use_cn=".true."   >2005</stream_year_last_ndep>
+<stream_year_last_ndep  phys="clm4_5" use_cn=".true."   >2015</stream_year_last_ndep>
 <model_year_align_ndep  phys="clm4_5" use_cn=".true."   >1850</model_year_align_ndep>
 
 <stream_year_first_ndep phys="clm5_0" use_cn=".true."   >1850</stream_year_first_ndep>
-<stream_year_last_ndep  phys="clm5_0" use_cn=".true."   >2005</stream_year_last_ndep>
+<stream_year_last_ndep  phys="clm5_0" use_cn=".true."   >2015</stream_year_last_ndep>
 <model_year_align_ndep  phys="clm5_0" use_cn=".true."   >1850</model_year_align_ndep>
 
 <stream_year_first_popdens phys="clm4_5" cnfireson=".true."   >1850</stream_year_first_popdens>