update copyright year, update internal version number in preparation …

…for minor release, update icepack (CICE-Consortium#409)
DeniseWorthen · Feb 21, 2020 · 7e11a34 · 7e11a34
1 parent 2e1c3b7
commit 7e11a34
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/cicecore/drivers/direct/hadgem3/CICE.F90 b/cicecore/drivers/direct/hadgem3/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2019, Triad National Security, LLC 
+! Copyright (c) 2020, Triad National Security, LLC 
 ! All rights reserved.
 !                
-! Copyright 2019. Triad National Security, LLC. This software was 
+! Copyright 2020. Triad National Security, LLC. This software was 
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/mct/cesm1/CICE_copyright.txt b/cicecore/drivers/mct/cesm1/CICE_copyright.txt
@@ -1,7 +1,7 @@
-! Copyright (c) 2019, Triad National Security, LLC 
+! Copyright (c) 2020, Triad National Security, LLC 
 ! All rights reserved.
 !                
-! Copyright 2019. Triad National Security, LLC. This software was 
+! Copyright 2020. Triad National Security, LLC. This software was 
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt b/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
@@ -1,7 +1,7 @@
-! Copyright (c) 2019, Triad National Security, LLC 
+! Copyright (c) 2020, Triad National Security, LLC 
 ! All rights reserved.
 !                
-! Copyright 2019. Triad National Security, LLC. This software was 
+! Copyright 2020. Triad National Security, LLC. This software was 
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/nuopc/dmi/CICE.F90 b/cicecore/drivers/nuopc/dmi/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2019, Triad National Security, LLC 
+! Copyright (c) 2020, Triad National Security, LLC 
 ! All rights reserved.
 !                
-! Copyright 2019. Triad National Security, LLC. This software was 
+! Copyright 2020. Triad National Security, LLC. This software was 
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/drivers/standalone/cice/CICE.F90 b/cicecore/drivers/standalone/cice/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2019, Triad National Security, LLC 
+! Copyright (c) 2020, Triad National Security, LLC 
 ! All rights reserved.
 !                
-! Copyright 2019. Triad National Security, LLC. This software was 
+! Copyright 2020. Triad National Security, LLC. This software was 
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  

diff --git a/cicecore/version.txt b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.1.0
+CICE 6.1.1
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -54,17 +54,17 @@
 
 # General information about the project.
 project = u'CICE'
-copyright = u'2019, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
+copyright = u'2020, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
 author = u'CICE-Consortium'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'6.1.0' 
+version = u'6.1.1' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.1.0' 
+version = u'6.1.1' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/intro/copyright.rst b/doc/source/intro/copyright.rst
@@ -5,7 +5,7 @@
 Copyright
 =============================
 
-© Copyright 2019, Triad National Security LLC. All rights reserved. 
+© Copyright 2020, Triad National Security LLC. All rights reserved. 
 This software was produced under U.S. Government contract 
 89233218CNA000001 for Los Alamos National Laboratory (LANL), which is
 operated by Triad National Security, LLC for the U.S. Department

diff --git a/icepack b/icepack
+16 −0		CONTRIBUTING.md
+22 −6		README.md
+114 −30		columnphysics/icepack_fsd.F90
+19 −1		columnphysics/icepack_intfc.F90
+69 −53		columnphysics/icepack_therm_itd.F90
+167 −155		columnphysics/icepack_wavefracspec.F90
+1 −1		columnphysics/version.txt
+2 −2		configuration/driver/icedrv_MAIN.F90
+1 −1		configuration/driver/icedrv_init_column.F90
+0 −4		configuration/scripts/Makefile
+5 −0		configuration/scripts/icepack.batch.csh
+2 −2		configuration/scripts/machines/Macros.cheyenne_intel
+35 −0		configuration/scripts/machines/Macros.conda_linux
+38 −0		configuration/scripts/machines/Macros.conda_macos
+2 −2		configuration/scripts/machines/Macros.testmachine_intel
+41 −0		configuration/scripts/machines/env.conda_linux
+41 −0		configuration/scripts/machines/env.conda_macos
+1 −1		configuration/scripts/machines/env.izumi_intel
+11 −0		configuration/scripts/machines/environment.yml
+1 −1		configuration/scripts/setup_run_dirs.csh
+3 −3		doc/source/conf.py
+1 −1		doc/source/intro/copyright.rst
+16 −0		doc/source/master_list.bib
+9 −2		doc/source/science_guide/sg_itd.rst
+3 −3		doc/source/user_guide/ug_case_settings.rst
+263 −0		doc/source/user_guide/ug_running.rst
+3 −3		icepack.setup