Sync to CICE-Consortium/main (2025-08-06)

.zenodo.json

@@ -1,19 +1,22 @@
 {
-    "license": "other-open", 
-    "description": "No description provided", 
+    "license": "BSD-3-Clause",
+    "copyright": "Copyright (c) 1998, 2017 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 m.n.p", 
+    "title": "CICE-Consortium/CICE: CICE Version 6.6.1", 
     "keywords": [
-        "sea ice model, CICE, Icepack"
+        "sea ice model",
+        "CICE",
+        "Icepack"
     ], 
-    "version": "m.n.p", 
+    "version": "6.6.1", 
     "upload_type": "software", 
     "communities": [
         {
             "identifier": "cice-consortium"
         }
     ], 
-    "publication_date": "2019-07-25", 
+    "publication_date": "2025-07-21",
     "creators": [
         {
             "affiliation": "Los Alamos National Laboratory", 
@@ -32,7 +35,11 @@
             "name": "Philippe Blain"
         }, 
         {
-            "affiliation": "National Oceanographic and Atmospheric Administration (CTR)", 
+            "affiliation": "National Center for Atmospheric Research", 
+            "name": "David Clemens-Sewall"
+        }, 
+        {
+            "affiliation": "National Oceanic and Atmospheric Administration (CTR)",
             "name": "Anthony Craig"
         }, 
         {
@@ -44,7 +51,11 @@
             "name": "Alice DuVivier"
         }, 
         {
-            "affiliation": "National Oceanographic and Atmospheric Administration", 
+            "affiliation": "National Center for Atmospheric Research", 
+            "name": "Jim Edwards"
+        }, 
+        {
+            "affiliation": "National Oceanic and Atmospheric Administration",
             "name": "Robert Grumbine"
         }, 
         {
@@ -67,6 +78,10 @@
             "affiliation": "Institute of Oceanology, Polish Academy of Sciences", 
             "name": "Robert Osinski"
         }, 
+        {
+            "affiliation": "Intel Corporation", 
+            "name": "Jacob Poulsen"
+        }, 
         {
             "affiliation": "Danish Meteorological Institute", 
             "name": "Till Rasmussen"
@@ -75,20 +90,37 @@
             "affiliation": "Danish Meteorological Institute", 
             "name": "Mads Ribergaard"
         }, 
+        {
+            "affiliation": "Alfred-Wegener-Institut Helmholz-Zentrum fur Polar- und Meersforschung", 
+            "name": "Lettie Roach"
+        }, 
         {
             "affiliation": "Los Alamos National Laboratory", 
             "name": "Andrew Roberts"
         }, 
+        {
+            "affiliation": "Australian Earth-System Simulator", 
+            "name": "Anton Steketee"
+        }, 
         {
             "affiliation": "Los Alamos National Laboratory", 
             "name": "Matthew Turner"
         }, 
         {
             "affiliation": "Geophysical Fluid Dynamics Laboratory", 
             "name": "Michael Winton"
+        }, 
+        {
+            "affiliation": "National Oceanic and Atmospheric Administration",
+            "name": "Denise Worthen"
+        }, 
+        {
+            "affiliation": "National Aeronautics and Space Administration", 
+            "name": "Bin Zhao"
         }
     ], 
     "access_right": "open", 
+    "repository_url": "https://github.com/CICE-Consortium/CICE", 
     "related_identifiers": [
         {
             "identifier": "https://github.com/CICE-Consortium/CICE/tree/CICE6.0.1", 

README.md

@@ -6,7 +6,7 @@
 <!--- [![codecov](https://codecov.io/gh/apcraig/Test_CICE_Icepack/branch/master/graph/badge.svg)](https://codecov.io/gh/apcraig/Test_CICE_Icepack) --->
 
 ## The CICE Consortium sea-ice model
-CICE is a computationally efficient model for simulating the growth, melting, and movement of polar sea ice. Designed as one component of coupled atmosphere-ocean-land-ice global climate models, today’s CICE model is the outcome of more than two decades of community collaboration in building a sea ice model suitable for multiple uses including process studies, operational forecasting, and climate simulation.
+CICE is a computationally efficient model for simulating the growth, melting, and movement of polar sea ice. Designed as one component of coupled atmosphere-ocean-land-ice global coupled models, today’s CICE model is the outcome of more than two decades of community collaboration in building a sea ice model suitable for multiple uses including process studies, operational forecasting, and Earth system simulation.
 
 
 This repository contains the files and code needed to run the CICE sea ice numerical model starting with version 6. CICE is maintained by the CICE Consortium. 

cicecore/cicedyn/analysis/ice_history.F90

@@ -69,7 +69,7 @@ subroutine init_hist (dt)
       use ice_domain_size, only: max_blocks, max_nstrm, nilyr, nslyr, nblyr, ncat, nfsd
       use ice_dyn_shared, only: kdyn
       use ice_flux, only: mlt_onset, frz_onset, albcnt, snwcnt
-      use ice_grid, only: grid_ice, &
+      use ice_grid, only: grid_ice, grid_outfile, &
           grid_atm_thrm, grid_atm_dynu, grid_atm_dynv, &
           grid_ocn_thrm, grid_ocn_dynu, grid_ocn_dynv
       use ice_history_shared ! everything
@@ -239,15 +239,14 @@ subroutine init_hist (dt)
          call get_fileunit(nu_nml)
          open (nu_nml, file=trim(nml_filename), status='old',iostat=nml_error)
          if (nml_error /= 0) then
-            call abort_ice(subname//'ERROR: '//trim(nml_name)//' open file '// &
-               trim(nml_filename), &
-               file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: '//trim(nml_name)//' open file '// &
+               trim(nml_filename), file=__FILE__, line=__LINE__)
          endif
 
          ! seek to this namelist
          call goto_nml(nu_nml,trim(nml_name),nml_error)
          if (nml_error /= 0) then
-            call abort_ice(subname//'ERROR: searching for '// trim(nml_name), &
+            call abort_ice(subname//' ERROR: searching for '// trim(nml_name), &
                file=__FILE__, line=__LINE__)
          endif
 
@@ -260,7 +259,7 @@ subroutine init_hist (dt)
                ! backspace and re-read erroneous line
                backspace(nu_nml)
                read(nu_nml,fmt='(A)') tmpstr2
-               call abort_ice(subname//'ERROR: ' // trim(nml_name) // ' reading ' // &
+               call abort_ice(subname//' ERROR: ' // trim(nml_name) // ' reading ' // &
                     trim(tmpstr2), file=__FILE__, line=__LINE__)
             endif
          end do
@@ -278,23 +277,35 @@ subroutine init_hist (dt)
                 nstreams = nstreams + 1
                 if (ns >= 2) then
                    if (histfreq(ns-1) == 'x') then
-                      call abort_ice(subname//'ERROR: histfreq all non x must be at start of array')
+                      call abort_ice(subname//' ERROR: histfreq all non x must be at start of array', &
+                           file=__FILE__, line=__LINE__)
                    endif
                 endif
          else if (histfreq(ns) /= 'x') then
-             call abort_ice(subname//'ERROR: histfreq contains illegal element')
+             write(nu_diag, * ) subname,' ns,histfreq = ',ns,histfreq(ns)
+             call abort_ice(subname//' ERROR: histfreq contains illegal element', &
+                  file=__FILE__, line=__LINE__)
          endif
       enddo
-      if (nstreams == 0) write (nu_diag,*) 'WARNING: No history output'
+      if (nstreams == 0 .and. my_task == master_task) write (nu_diag,*) subname,' WARNING: No history output'
       do ns1 = 1, nstreams
          do ns2 = 1, nstreams
             if (histfreq(ns1) == histfreq(ns2) .and. ns1/=ns2 &
                .and. my_task == master_task) then
-               call abort_ice(subname//'ERROR: histfreq elements must be unique')
+               call abort_ice(subname//' ERROR: histfreq elements must be unique', &
+                    file=__FILE__, line=__LINE__)
             endif
          enddo
       enddo
 
+      ! Turn on one-time grid output file
+      if (grid_outfile) then
+         nstreams = nstreams + 1
+         histfreq(nstreams) = 'g'
+         hist_avg(nstreams) = .false.
+         if (my_task == master_task) write (nu_diag,*) subname,' Writing one-time grid file'
+      endif
+
       if (.not. tr_iage) then
          f_iage = 'x'
          f_dagedtt = 'x'
@@ -445,14 +456,6 @@ subroutine init_hist (dt)
          f_taubyE = f_tauby
       endif
 
-      ! write dimensions for 3D or 4D history variables
-      ! note: list of variables checked here is incomplete
-      if (f_aicen(1:1) /= 'x' .or. f_vicen(1:1) /= 'x' .or. &
-          f_Tinz (1:1) /= 'x' .or. f_Sinz (1:1) /= 'x') f_NCAT  = .true.
-      if (f_Tinz (1:1) /= 'x' .or. f_Sinz (1:1) /= 'x') f_VGRDi = .true.
-      if (f_Tsnz (1:1) /= 'x')                          f_VGRDs = .true.
-      if (tr_fsd)                                       f_NFSD  = .true.
-
       call broadcast_scalar (f_tlon, master_task)
       call broadcast_scalar (f_tlat, master_task)
       call broadcast_scalar (f_ulon, master_task)
@@ -2319,7 +2322,7 @@ subroutine accum_hist (dt)
             timedbl = (timesecs-dt)/(secday)
             time_beg(ns) = real(timedbl,kind=real_kind)
          endif
-      enddo
+      enddo  ! ns
 
       !---------------------------------------------------------------
       ! increment field
@@ -4195,6 +4198,13 @@ subroutine accum_hist (dt)
         enddo
 
       endif  ! write_history or write_ic
+
+      ! Turn off one-time grid output file
+      if (histfreq(ns) == 'g') then
+         histfreq(ns) = 'x'
+         nstreams = nstreams - 1
+      endif
+
       enddo  ! nstreams
 
       !$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)