update icepack and version number (CICE-Consortium#511)

DeniseWorthen · Aug 26, 2020 · 7888bc8 · 7888bc8
1 parent 40533df
commit 7888bc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cicecore/version.txt b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.1.2
+CICE 6.1.3
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'6.1.2' 
+version = u'6.1.3' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.1.2' 
+version = u'6.1.3' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/icepack b/icepack
+2 −0		columnphysics/icepack_therm_mushy.F90
+1 −1		columnphysics/version.txt
+7 −0		configuration/scripts/options/set_nml.swredist
+1 −0		configuration/scripts/tests/base_suite.ts
+2 −2		doc/source/conf.py
+66 −6		doc/source/user_guide/interfaces.include