diff --git a/cicecore/drivers/cesm/CICE_copyright.txt b/cicecore/drivers/cesm/CICE_copyright.txt index 7564fa80f..959a3ce32 100644 --- a/cicecore/drivers/cesm/CICE_copyright.txt +++ b/cicecore/drivers/cesm/CICE_copyright.txt @@ -1,7 +1,7 @@ -! Copyright (c) 2018, Triad National Security, LLC +! Copyright (c) 2019, Triad National Security, LLC ! All rights reserved. ! -! Copyright 2018. Triad National Security, LLC. This software was +! Copyright 2019. 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/cice/CICE.F90 b/cicecore/drivers/cice/CICE.F90 index 88ee77438..ec850b128 100644 --- a/cicecore/drivers/cice/CICE.F90 +++ b/cicecore/drivers/cice/CICE.F90 @@ -1,8 +1,8 @@ !======================================================================= -! Copyright (c) 2018, Triad National Security, LLC +! Copyright (c) 2019, Triad National Security, LLC ! All rights reserved. ! -! Copyright 2018. Triad National Security, LLC. This software was +! Copyright 2019. 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/hadgem3/CICE.F90 b/cicecore/drivers/hadgem3/CICE.F90 index 40eee5676..ccc9177fb 100644 --- a/cicecore/drivers/hadgem3/CICE.F90 +++ b/cicecore/drivers/hadgem3/CICE.F90 @@ -1,8 +1,8 @@ !======================================================================= -! Copyright (c) 2018, Triad National Security, LLC +! Copyright (c) 2019, Triad National Security, LLC ! All rights reserved. ! -! Copyright 2018. Triad National Security, LLC. This software was +! Copyright 2019. 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 index fb024cb80..de34d9d31 100644 --- a/cicecore/version.txt +++ b/cicecore/version.txt @@ -1 +1 @@ -CICE 6.0.0 +CICE 6.0.1 diff --git a/doc/source/conf.py b/doc/source/conf.py index 2599d0151..f9b0b7b68 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -54,7 +54,7 @@ # General information about the project. project = u'CICE' -copyright = u'2018, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)' +copyright = u'2019, 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 @@ -62,9 +62,9 @@ # built documents. # # The short X.Y version. -version = u'6.0.0' +version = u'6.0.1' # The full version, including alpha/beta/rc tags. -version = u'6.0.0' +version = u'6.0.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 index 1fa535a70..57b190f44 100755 --- a/doc/source/intro/copyright.rst +++ b/doc/source/intro/copyright.rst @@ -5,7 +5,7 @@ Copyright ============================= -© Copyright 2018, Triad National Security LLC. All rights reserved. +© Copyright 2019, 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 index ac6195df8..0b442b3fe 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit ac6195df8f3b5ae9a8e030b28c5a727fb5c11d62 +Subproject commit 0b442b3fe96d65b3c54c5facbc69653e1b87b740