Merge pull request #472 from ekluzek/release-clm504ndepupdate

Always avoid generating dynamic landunit adjustments for glacier area
ESCOMP · Aug 7, 2018 · 3feb8b6 · 3feb8b6
2 parents 73f47fe + eb0419e
commit 3feb8b6
Show file tree

Hide file tree

Showing 8 changed files with 2,157 additions and 2,268 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.md b/.github/ISSUE_TEMPLATE/01_bug_report.md
@@ -4,6 +4,10 @@ about: Report a problem with the code
 
 ---
 
+### Brief summary of bug
+
+[Give a one or two sentence summary. This could be the same as the issue title if you feel that is a sufficient summary.]
+
 ### General bug information
 
 **CTSM version you are using:** [output of `git describe`]

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -962,7 +962,7 @@
       <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
     </machines>
     <options>
-      <option name="wallclock">01:20:00</option>
+      <option name="wallclock">01:40:00</option>
       <option name="comment"  >tests mid-year restart, with the restart file being written after more than 2 years, which Sam Levis says is important for testing crop restarts</option>
     </options>
   </test>

diff --git a/doc/.release-ChangeLog_template b/doc/.release-ChangeLog_template
@@ -92,4 +92,7 @@ Externals being used:
 
 CTSM Tag versions pulled over from master development branch:
 
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+
 ===============================================================