Update Copyright, Version, Icepack (#1049)

apcraig · web-flow · commit fd0d85eda573 · 2025-08-20T13:05:56.000-07:00
* Update Copyright

Update version number in preparation for minor release

Clean up trailing blanks

Update Icepack to #f9789c2f325993c0af
- Update Copyright and version number

* Update Copyright in zenodo json file in CICE and Icepack
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,22 +1,22 @@
 {
     "license": "BSD-3-Clause",
-    "copyright": "Copyright (c) 1998, 2017 Triad National Security, LLC",
+    "copyright": "Copyright 1998-2025 Triad National Security, LLC",
     "description": "View detailed release notes at https://github.com/CICE-Consortium/CICE/releases", 
     "language": "eng", 
-    "title": "CICE-Consortium/CICE: CICE Version 6.6.1", 
+    "title": "CICE-Consortium/CICE: CICE Version 6.6.2", 
     "keywords": [
         "sea ice model",
         "CICE",
         "Icepack"
     ], 
-    "version": "6.6.1", 
+    "version": "6.6.2", 
     "upload_type": "software", 
     "communities": [
         {
             "identifier": "cice-consortium"
         }
     ], 
-    "publication_date": "2025-07-21",
+    "publication_date": "2025-08-15", 
     "creators": [
         {
             "affiliation": "Los Alamos National Laboratory", 
diff --git a/COPYRIGHT.pdf b/COPYRIGHT.pdf
diff --git a/cicecore/cicedyn/infrastructure/ice_grid.F90 b/cicecore/cicedyn/infrastructure/ice_grid.F90
@@ -371,7 +371,7 @@ subroutine init_grid1
                   allocate(work_mom(nx_global*2+1, ny_global*2+1), stat=ierr)
                   if (ierr/=0) call abort_ice(subname//' ERROR: Out of memory', file=__FILE__, line=__LINE__)
 
-                  fieldname='y'                ! use mom y field to fill cice ULAT 
+                  fieldname='y'                ! use mom y field to fill cice ULAT
                   call ice_open_nc(grid_file,fid_grid)
                   call ice_read_global_nc(fid_grid,1,fieldname,work_mom,.true.)
                   call ice_close_nc(fid_grid)
@@ -382,7 +382,7 @@ subroutine init_grid1
                          work_g1(i,j) = work_mom(im, jm)
                          jm = jm + 2
                       enddo
-                      im = im + 2 
+                      im = im + 2
                   enddo
 
                   deallocate(work_mom, stat=ierr)
diff --git a/cicecore/drivers/direct/hadgem3/CICE.F90 b/cicecore/drivers/direct/hadgem3/CICE.F90
@@ -1,5 +1,5 @@
 !=======================================================================
-! Copyright (c) 1998, 2017, Triad National Security, LLC
+! Copyright 1998-2025, Triad National Security, LLC
 ! All rights reserved.
 !
 ! This program was produced under U.S. Government contract 89233218CNA000001
diff --git a/cicecore/drivers/mapl/geos/CICE_copyright.txt b/cicecore/drivers/mapl/geos/CICE_copyright.txt
@@ -1,4 +1,4 @@
-! Copyright (c) 1998, 2017, Triad National Security, LLC
+! Copyright 1998-2025, Triad National Security, LLC
 ! All rights reserved.
 !
 ! This program was produced under U.S. Government contract 89233218CNA000001
diff --git a/cicecore/drivers/mct/cesm1/CICE_copyright.txt b/cicecore/drivers/mct/cesm1/CICE_copyright.txt
@@ -1,4 +1,4 @@
-! Copyright (c) 1998, 2017, Triad National Security, LLC
+! Copyright 1998-2025, Triad National Security, LLC
 ! All rights reserved.
 !
 ! This program was produced under U.S. Government contract 89233218CNA000001
diff --git a/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt b/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
@@ -1,4 +1,4 @@
-! Copyright (c) 1998, 2017, Triad National Security, LLC
+! Copyright 1998-2025, Triad National Security, LLC
 ! All rights reserved.
 !
 ! This program was produced under U.S. Government contract 89233218CNA000001
diff --git a/cicecore/drivers/nuopc/dmi/CICE.F90 b/cicecore/drivers/nuopc/dmi/CICE.F90
@@ -1,5 +1,5 @@
 !=======================================================================
-! Copyright (c) 1998, 2017, Triad National Security, LLC
+! Copyright 1998-2025, Triad National Security, LLC
 ! All rights reserved.
 !
 ! This program was produced under U.S. Government contract 89233218CNA000001
diff --git a/cicecore/drivers/standalone/cice/CICE.F90 b/cicecore/drivers/standalone/cice/CICE.F90
@@ -1,5 +1,5 @@
 !=======================================================================
-! Copyright (c) 1998, 2017, Triad National Security, LLC
+! Copyright 1998-2025, Triad National Security, LLC
 ! All rights reserved.
 !
 ! This program was produced under U.S. Government contract 89233218CNA000001
diff --git a/cicecore/drivers/unittest/opticep/CICE.F90 b/cicecore/drivers/unittest/opticep/CICE.F90
@@ -1,5 +1,5 @@
 !=======================================================================
-! Copyright (c) 1998, 2017, Triad National Security, LLC
+! Copyright 1998-2025, Triad National Security, LLC
 ! All rights reserved.
 !
 ! This program was produced under U.S. Government contract 89233218CNA000001
diff --git a/cicecore/version.txt b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.6.1
+CICE 6.6.2
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -57,17 +57,17 @@
 
 # General information about the project.
 project = u'CICE'
-copyright = u'1998, 2017, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
+copyright = u'1998-2025, 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.6.1' 
+version = u'6.6.2' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.6.1' 
+version = u'6.6.2' 
 
 # 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 1998, 2017, Triad National Security, LLC
+Copyright 1998-2025, Triad National Security, LLC
 All rights reserved.
 
 This program 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 of Energy/National Nuclear Security Administration. All rights in the program are reserved by Triad National Security, LLC, and the U.S. Department of Energy/National Nuclear Security Administration. The Government is granted for itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license in this material to reproduce, prepare. derivative works, distribute copies to the public, perform publicly and display publicly, and to permit others to do so.
diff --git a/icepack b/icepack
@@ -1 +1 @@
-Subproject commit 6a5c51e9e6c643da0760a315e452755661d7d745
+Subproject commit a5b5ebe63f986dbda86d5b2ef91426811619d018

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`!=======================================================================`
`2`		`-! Copyright (c) 1998, 2017, Triad National Security, LLC`
	`2`	`+! Copyright 1998-2025, Triad National Security, LLC`
`3`	`3`	`! All rights reserved.`
`4`	`4`	`!`
`5`	`5`	`! This program was produced under U.S. Government contract 89233218CNA000001`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-! Copyright (c) 1998, 2017, Triad National Security, LLC`
	`1`	`+! Copyright 1998-2025, Triad National Security, LLC`
`2`	`2`	`! All rights reserved.`
`3`	`3`	`!`
`4`	`4`	`! This program was produced under U.S. Government contract 89233218CNA000001`