Merge branch 'master' into interpMonthlyVeg_helper_function

adrifoster · Jan 24, 2024 · b6e1965 · b6e1965
2 parents 460fa67 + ff7c19d
commit b6e1965
Show file tree

Hide file tree

Showing 317 changed files with 19,513 additions and 16,910 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,4 +1,5 @@
 # Ran python directory through black python formatter
+d229b5c6689efc4c2a6cef077515c4ccd5c18ff6
 4cd83cb3ee6d85eb909403487abf5eeaf4d98911
 0aa2957c1f8603c63fa30b11295c06cfddff44a5
 2cdb380febb274478e84cd90945aee93f29fa2e6
@@ -10,6 +11,21 @@ b88e1cd1b28e3609684c79a2ec0e88f26cfc362b
 b771971e3299c4fa56534b93421f7a2b9c7282fd
 9de88bb57ea9855da408cbec1dc8acb9079eda47
 8bc4688e52ea23ef688e283698f70a44388373eb
+c8bd4c6f98c0b411391b4355da449507db3aab4e
+4ee49e3e516ca7dee5df378f65664f93a7db4415
+0207bc98dd5c75cd69a0e788bc53e41093712f5c
+e4d38681df23ccca0ae29581a45f8362574e0630
+0a5a9e803b56ec1bbd6232eff1c99dbbeef25eb7
+810cb346f05ac1aabfff931ab1a2b7b584add241
+5933b0018f8e29413e30dda9b906370d147bad45
+025d5e7c2e80263717fb029101d65cbbf261c3c4
+a9d96219902cf609636886c7073a84407f450d9a
+d866510188d26d51bcd6d37239283db690af7e82
 # Ran SystemTests and python/ctsm through black python formatter
 5364ad66eaceb55dde2d3d598fe4ce37ac83a93c
 8056ae649c1b37f5e10aaaac79005d6e3a8b2380
+0bc3f00115d86d026a977918661c93779b3b19f9
+540b256d1f3382f4619d7b0877c32d54ce5c40b6
+8a168bb0895f4f2421608dd2589398e13a6663e6
+183fc26a6691bbdf87f515dc47924a64be3ced9b
+6fccf682eaf718615407d9bacdd3903b8786a03d
diff --git a/Externals.cfg b/Externals.cfg
@@ -8,7 +8,7 @@ required = True
 local_path = components/cism
 protocol = git
 repo_url = https://github.com/ESCOMP/CISM-wrapper
-tag = cismwrap_2_1_95
+tag = cismwrap_2_1_96
 externals = Externals_CISM.cfg
 required = True
 
@@ -34,7 +34,7 @@ hash = 34723c2
 required = True
 
 [ccs_config]
-tag = ccs_config_cesm0.0.65
+tag = ccs_config_cesm0.0.84
 protocol = git
 repo_url = https://github.com/ESMCI/ccs_config_cesm.git
 local_path = ccs_config
@@ -44,26 +44,26 @@ required = True
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-tag = cime6.0.125
+tag = cime6.0.175
 required = True
 
 [cmeps]
-tag = cmeps0.14.21
+tag = cmeps0.14.43
 protocol = git
 repo_url = https://github.com/ESCOMP/CMEPS.git
 local_path = components/cmeps
 required = True
 
 [cdeps]
-tag = cdeps1.0.13
+tag = cdeps1.0.24
 protocol = git
 repo_url = https://github.com/ESCOMP/CDEPS.git
 local_path = components/cdeps
 externals =  Externals_CDEPS.cfg
 required = True
 
 [cpl7]
-tag = cpl77.0.5
+tag = cpl77.0.7
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
 local_path = components/cpl7
@@ -84,7 +84,7 @@ local_path = libraries/mct
 required = True
 
 [parallelio]
-tag = pio2_5_10
+tag = pio2_6_2
 protocol = git
 repo_url = https://github.com/NCAR/ParallelIO
 local_path = libraries/parallelio

diff --git a/Externals_CLM.cfg b/Externals_CLM.cfg
@@ -2,7 +2,7 @@
 local_path = src/fates
 protocol = git
 repo_url = https://github.com/NGEET/fates
-tag = sci.1.67.1_api.27.0.0
+tag = sci.1.71.0_api.33.0.0
 required = True
 
 [externals_description]

diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
diff --git a/bld/env_run.xml b/bld/env_run.xml
@@ -9,5 +9,6 @@ Sample env_run.xml file that allows build-namelist to be run for testing in this
 -->
 <entry id="DIN_LOC_ROOT"         value="MYDINLOCROOT"  /> 
 <entry id="GLC_TWO_WAY_COUPLING" value="FALSE"         /> 
+<entry id="NEONSITE"             value=""              /> 
 
 </config_definition>
diff --git a/bld/namelist_files/createMapEntry.pl b/bld/namelist_files/createMapEntry.pl
@@ -23,7 +23,7 @@
    my $scriptName;
    ($scriptName = $0) =~ s!(.*)/!!; # get name of script
    my $cwd = getcwd();
-   my $CSMDATA = "/glade/p/cesm/cseg/inputdata";
+   my $CSMDATA = "/glade/campaign/cesm/cesmdata/cseg/inputdata";
 
    if ($#ARGV != 0 ) {
       usage();

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_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml
@@ -44,8 +44,10 @@ determine default values for namelists.
 
 
 <!-- For transient cases, turn on demand to set flanduse_timeseries -->
-<clm_demand sim_year_range="1850-2000">flanduse_timeseries</clm_demand>
-<clm_demand sim_year_range="1850-2100">flanduse_timeseries</clm_demand>
+<clm_demand sim_year_range="1850-2100" neon=".true." >null</clm_demand>    <!-- NEON sites don't have transient PFT datasets yet -->
+<clm_demand sim_year_range="constant"                >null</clm_demand>
+<clm_demand sim_year_range="1850-2000"               >flanduse_timeseries</clm_demand>
+<clm_demand sim_year_range="1850-2100"               >flanduse_timeseries</clm_demand>
 
 
 <!-- Default location of {csmdata} -->