Merge branch 'master' into fix_perched_water_table

ESCOMP · May 20, 2022 · 790e8d9 · 790e8d9
2 parents 24a7490 + 05450c5
commit 790e8d9
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 5 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -34,7 +34,7 @@ hash = 34723c2
 required = True
 
 [ccs_config]
-tag = ccs_config_cesm0.0.35
+tag = ccs_config_cesm0.0.36
 protocol = git
 repo_url = https://github.com/ESMCI/ccs_config_cesm.git
 local_path = ccs_config

diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
@@ -37,6 +37,13 @@
     </phase>
   </test>
 
+  <test name="LILACSMOKE_D_Ld2.f10_f10_mg37.I2000Ctsm50NwpSpAsRs.cheyenne_intel.clm-lilac">
+    <phase name="MODEL_BUILD">
+      <status>FAIL</status>
+      <issue>#1759</issue>
+    </phase>
+  </test>
+
   <!-- fates test suite failures -->
 
   <test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdDefHydro">

diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template
@@ -31,9 +31,9 @@ Bugs fixed or introduced
 ------------------------
 [Remove any lines that don't apply. Remove entire section if nothing applies.]
 
-Issues fixed (include CTSM Issue #):
+CTSM issues fixed (include CTSM Issue #):
 
-CIME Issues fixed (include issue #):
+Externals issues fixed (include issue #):
 
 Known bugs introduced in this tag (include issue #):
 

diff --git a/doc/.release-ChangeLog_template b/doc/.release-ChangeLog_template
@@ -15,8 +15,9 @@ CTSM Master Tag This Corresponds To:
 Summary of changes:
 -------------------
 
-Issues fixed (include CTSM Issue #): [If none, remove this line]
-CIME Issues fixed (include issue #): [If none, remove this line]
+CTSM issues fixed (include CTSM Issue #): [If none, remove this line]
+
+Externals issues fixed (include issue #): [If none, remove this line]
 
 Science changes since: 
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,4 +1,67 @@
 ===============================================================
+Tag name: ctsm5.1.dev097
+Originator(s): sacks (Bill Sacks)
+Date: Fri May 20 15:30:17 MDT 2022
+One-line Summary: Update ccs_config to fix issue on izumi and maybe elsewhere
+
+Purpose and description of changes
+----------------------------------
+
+Point to latest ccs_config
+
+This fixes an issue I had on izumi where I couldn't run
+anything (https://github.com/ESMCI/ccs_config_cesm/issues/45).
+
+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.]
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed or introduced
+------------------------
+
+Externals issues fixed (include issue #):
+https://github.com/ESMCI/ccs_config_cesm/issues/45
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Changes to tests or testing:
+- Added LILAC test to the expected fails list (this has been failing for
+  the last 2 tags)
+
+Testing summary:
+----------------
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    cheyenne ---- PASS
+    izumi ------- PASS
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: NO
+
+Other details
+-------------
+List any externals directories updated (cime, rtm, mosart, cism, fates, etc.):
+- ccs_config: ccs_config_cesm0.0.35 -> ccs_config_cesm0.0.36
+
+===============================================================
+===============================================================
 Tag name: ctsm5.1.dev096
 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
 Date: Wed May 18 12:44:01 MDT 2022

diff --git a/doc/ChangeSum b/doc/ChangeSum
@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+    ctsm5.1.dev097    sacks 05/20/2022 Update ccs_config to fix issue on izumi and maybe elsewhere
     ctsm5.1.dev096     erik 05/18/2022 Fix a few glitches from the last tag
     ctsm5.1.dev095     erik 05/09/2022 Turn soil BGC off for FATES-SP mode, externals updates, FatesSP user-mod directory and compset
     ctsm5.1.dev094   negins 05/06/2022 subset_data allows zeroing out nonveg landunits without any dompft selected