Skip to content

Commit

Permalink
Update version to 6.4.2 (CICE-Consortium#864)
Browse files Browse the repository at this point in the history 
Update License and Copyright

Update Icepack for version/copyright
  • Loading branch information
@apcraig @TillRasmussen
apcraig authored and TillRasmussen committed Sep 16, 2023
1 parent b1af309 commit a15a131
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
Binary file modified LICENSE.pdf
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions cicecore/drivers/direct/hadgem3/CICE.F90
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
!=======================================================================
! Copyright (c) 2022, Triad National Security, LLC
! Copyright (c) 2023, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2022. Triad National Security, LLC. This software was
! Copyright 2023. 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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/mct/cesm1/CICE_copyright.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! Copyright (c) 2022, Triad National Security, LLC
! Copyright (c) 2023, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2022. Triad National Security, LLC. This software was
! Copyright 2023. 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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! Copyright (c) 2022, Triad National Security, LLC
! Copyright (c) 2023, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2022. Triad National Security, LLC. This software was
! Copyright 2023. 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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/nuopc/dmi/CICE.F90
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
!=======================================================================
! Copyright (c) 2022, Triad National Security, LLC
! Copyright (c) 2023, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2022. Triad National Security, LLC. This software was
! Copyright 2023. 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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/standalone/cice/CICE.F90
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
!=======================================================================
! Copyright (c) 2022, Triad National Security, LLC
! Copyright (c) 2023, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2022. Triad National Security, LLC. This software was
! Copyright 2023. 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.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/unittest/opticep/CICE.F90
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
!=======================================================================
! Copyright (c) 2022, Triad National Security, LLC
! Copyright (c) 2023, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2022. Triad National Security, LLC. This software was
! Copyright 2023. 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.
Expand Down
2 changes: 1 addition & 1 deletion cicecore/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CICE 6.4.1
CICE 6.4.2
6 changes: 3 additions & 3 deletions doc/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@

# General information about the project.
project = u'CICE'
copyright = u'2022, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
copyright = u'2023, 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.4.1'
version = u'6.4.2'
# The full version, including alpha/beta/rc tags.
version = u'6.4.1'
version = u'6.4.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/intro/copyright.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright
=============================

© Copyright 2022, Triad National Security LLC. All rights reserved.
© Copyright 2023, 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
Expand Down
2 changes: 1 addition & 1 deletion icepack
Submodule icepack updated 21 files
+ − LICENSE.pdf
+2 −2 columnphysics/icepack_intfc.F90
+1 −1 columnphysics/version.txt
+2 −2 configuration/driver/icedrv_MAIN.F90
+47 −0 configuration/scripts/machines/Macros.derecho_cray
+47 −0 configuration/scripts/machines/Macros.derecho_gnu
+1 −1 configuration/scripts/machines/Macros.derecho_intel
+49 −0 configuration/scripts/machines/Macros.derecho_intelclassic
+49 −0 configuration/scripts/machines/Macros.derecho_inteloneapi
+53 −0 configuration/scripts/machines/Macros.derecho_nvhpc
+6 −6 configuration/scripts/machines/env.cheyenne_gnu
+6 −6 configuration/scripts/machines/env.cheyenne_intel
+6 −6 configuration/scripts/machines/env.cheyenne_pgi
+51 −0 configuration/scripts/machines/env.derecho_cray
+51 −0 configuration/scripts/machines/env.derecho_gnu
+51 −0 configuration/scripts/machines/env.derecho_intelclassic
+51 −0 configuration/scripts/machines/env.derecho_inteloneapi
+51 −0 configuration/scripts/machines/env.derecho_nvhpc
+3 −3 doc/source/conf.py
+1 −1 doc/source/intro/copyright.rst
+2 −2 doc/source/user_guide/interfaces.include

0 comments on commit a15a131

Please sign in to comment.