Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c08a7a6
Update Icepack to #6a5c51e9e6c64, including bug fix in zap_small_areas
apcraig Aug 6, 2025
997835d
port for gaeac6 (#1043)
rgrumbine Aug 8, 2025
67cf139
NaN Debug failures when reading files (#1045)
anton-seaice Aug 14, 2025
fd0d85e
Update Copyright, Version, Icepack (#1049)
apcraig Aug 20, 2025
50e058e
Add DMI computer Boreas (#1050)
TillRasmussen Aug 29, 2025
b4a6c44
Update the qstat job completion checks to use (#1052)
apcraig Sep 10, 2025
b010325
NUOPC/CMEPS only: Make datestamps in pointer filenames configurable (…
anton-seaice Sep 11, 2025
bd30d63
Fix bug in ice_restoring, indexing of trcrn_rest
apcraig Oct 7, 2025
61701f0
Add an option to be able to update ice concentration (from data assim…
sanAkel Nov 5, 2025
8e3ef7c
Update outer boundary implementation to support open boundary conditi…
apcraig Nov 5, 2025
ec2e2bd
Fixes for sitemptop, sitempbot, and sitempsnic. (#1054)
dabail10 Nov 13, 2025
fa682b3
change dynamics minimum area and mass values and add Icepack paramete…
eclare108213 Nov 26, 2025
25ce26d
Update Carpenter Port (#1076)
apcraig Dec 18, 2025
3ed0800
documentation for averaging (#1056)
eclare108213 Dec 19, 2025
26a5cfe
Add ability to read an extended grid (supported for pop netcdf file f…
apcraig Jan 8, 2026
a4f8ba9
Add wave_height_type options (#1071)
eclare108213 Jan 9, 2026
27a4982
Updates for CMIP7 (#1066)
dabail10 Jan 16, 2026
29f63e5
Add history restart capability (#1069)
apcraig Jan 22, 2026
7c59f23
Update version to 6.6.3 (#1086)
apcraig Jan 23, 2026
a214a72
Fix some bugs with the last CMIP7 PR (#1088)
dabail10 Jan 24, 2026
2989628
Merge remote-tracking branch 'origin' into CICE6.6.1-x
anton-seaice Jan 27, 2026
038a276
Making a debug build run
anton-seaice Feb 5, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"license": "BSD-3-Clause",
"copyright": "Copyright (c) 1998, 2017 Triad National Security, LLC",
"copyright": "Copyright 1998-2026 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.3",
"keywords": [
"sea ice model",
"CICE",
"Icepack"
],
"version": "6.6.1",
"version": "6.6.3",
"upload_type": "software",
"communities": [
{
"identifier": "cice-consortium"
}
],
"publication_date": "2025-07-21",
"publication_date": "2026-01-22",
"creators": [
{
"affiliation": "Los Alamos National Laboratory",
Expand Down
Binary file modified COPYRIGHT.pdf
Binary file not shown.
2,476 changes: 1,148 additions & 1,328 deletions cicecore/cicedyn/analysis/ice_history.F90

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion cicecore/cicedyn/analysis/ice_history_bgc.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3398,7 +3398,7 @@ subroutine init_history_bgc

use ice_arrays_column, only: PP_net, grow_net, hbri, &
ice_bio_net, snow_bio_net, fbio_snoice, fbio_atmice, &
zfswin
upNO, upNH, bTiz, bphi, zfswin, iDi, iki
use ice_flux_bgc, only: flux_bio, flux_bio_ai, fnit, fsil, &
famm, fdmsp, fdms, fhum, fdust, falgalN, fdoc, fdic, &
fdon, ffep, ffed
Expand All @@ -3407,14 +3407,20 @@ subroutine init_history_bgc

PP_net (:,:,:) = c0
grow_net (:,:,:) = c0
upNO (:,:,:) = c0
upNH (:,:,:) = c0
hbri (:,:,:) = c0
flux_bio (:,:,:,:) = c0
flux_bio_ai (:,:,:,:) = c0
ice_bio_net (:,:,:,:) = c0
snow_bio_net(:,:,:,:) = c0
fbio_snoice (:,:,:,:) = c0
fbio_atmice (:,:,:,:) = c0
bTiz (:,:,:,:,:) = c0
bphi (:,:,:,:,:) = c0
zfswin (:,:,:,:,:) = c0
iDi (:,:,:,:,:) = c0
iki (:,:,:,:,:) = c0
fnit (:,:,:) = c0
fsil (:,:,:) = c0
famm (:,:,:) = c0
Expand Down
73 changes: 55 additions & 18 deletions cicecore/cicedyn/analysis/ice_history_mechred.F90
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ module ice_history_mechred
f_aredistn = 'x', f_vredistn = 'x', &
f_araftn = 'x', f_vraftn = 'x'

! CMIP ridging variables.

character (len=max_nstrm), public :: &
f_sirdgconc = 'm', f_sirdgthick = 'm'

!---------------------------------------------------------------
! namelist variables
!---------------------------------------------------------------
Expand All @@ -51,13 +56,14 @@ module ice_history_mechred
f_dvirdgndt, &
f_aparticn, f_krdgn , &
f_aredistn, f_vredistn , &
f_araftn, f_vraftn
f_araftn, f_vraftn , &
f_sirdgconc, f_sirdgthick

!---------------------------------------------------------------
! field indices
!---------------------------------------------------------------

integer (kind=int_kind), dimension(max_nstrm) :: &
integer (kind=int_kind), dimension(max_nstrm), public :: &
n_ardg , n_vrdg , &
n_alvl , n_vlvl , &
n_dardg1dt , n_dardg2dt , &
Expand All @@ -69,6 +75,9 @@ module ice_history_mechred
n_aredistn , n_vredistn , &
n_araftn , n_vraftn

integer (kind=int_kind), dimension(max_nstrm) :: &
n_sirdgconc, n_sirdgthick

!=======================================================================

contains
Expand Down Expand Up @@ -152,6 +161,8 @@ subroutine init_hist_mechred_2D
f_vrdgn = 'x'
f_araftn = 'x'
f_vraftn = 'x'
f_sirdgconc = 'x'
f_sirdgthick = 'x'
endif
if (f_araftn /= 'x' .or. f_vraftn /= 'x') f_ardgn = f_araftn

Expand All @@ -174,6 +185,8 @@ subroutine init_hist_mechred_2D
call broadcast_scalar (f_vredistn, master_task)
call broadcast_scalar (f_araftn, master_task)
call broadcast_scalar (f_vraftn, master_task)
call broadcast_scalar (f_sirdgconc, master_task)
call broadcast_scalar (f_sirdgthick, master_task)

! 2D variables

Expand All @@ -182,49 +195,63 @@ subroutine init_hist_mechred_2D

if (f_alvl(1:1) /= 'x') &
call define_hist_field(n_alvl,"alvl","1",tstr2D, tcstr, &
"level ice area fraction", &
"none", c1, c0, &
"level ice area fraction", &
"none", c1, c0, &
ns, f_alvl)
if (f_vlvl(1:1) /= 'x') &
call define_hist_field(n_vlvl,"vlvl","m",tstr2D, tcstr, &
"level ice volume", &
"grid cell mean level ice thickness", c1, c0, &
"level ice volume", &
"grid cell mean level ice thickness", c1, c0, &
ns, f_vlvl)
if (f_ardg(1:1) /= 'x') &
call define_hist_field(n_ardg,"ardg","1",tstr2D, tcstr, &
"ridged ice area fraction", &
"none", c1, c0, &
"ridged ice area fraction", &
"none", c1, c0, &
ns, f_ardg)
if (f_vrdg(1:1) /= 'x') &
call define_hist_field(n_vrdg,"vrdg","m",tstr2D, tcstr, &
"ridged ice volume", &
"grid cell mean level ridged thickness", c1, c0, &
"ridged ice volume", &
"grid cell mean level ridged thickness", c1, c0, &
ns, f_vrdg)

if (f_dardg1dt(1:1) /= 'x') &
call define_hist_field(n_dardg1dt,"dardg1dt","%/day",tstr2D, tcstr, &
"ice area ridging rate", &
"none", secday*c100, c0, &
"ice area ridging rate", &
"none", secday*c100, c0, &
ns, f_dardg1dt)

if (f_dardg2dt(1:1) /= 'x') &
call define_hist_field(n_dardg2dt,"dardg2dt","%/day",tstr2D, tcstr, &
"ridge area formation rate", &
"none", secday*c100, c0, &
"ridge area formation rate", &
"none", secday*c100, c0, &
ns, f_dardg2dt)

if (f_dvirdgdt(1:1) /= 'x') &
call define_hist_field(n_dvirdgdt,"dvirdgdt","cm/day",tstr2D, tcstr, &
"ice volume ridging rate", &
"none", mps_to_cmpdy, c0, &
"ice volume ridging rate", &
"none", mps_to_cmpdy, c0, &
ns, f_dvirdgdt)

if (f_opening(1:1) /= 'x') &
call define_hist_field(n_opening,"opening","%/day",tstr2D, tcstr, &
"lead area opening rate", &
"none", secday*c100, c0, &
"lead area opening rate", &
"none", secday*c100, c0, &
ns, f_opening)

if (f_sirdgconc(1:1) /= 'x') &
call define_hist_field(n_sirdgconc,"sirdgconc","%",tstr2D, tcstr, &
"percentage of ridged sea ice", &
"area percentage of sea ice surface that is ridged sea ice", &
c100, c0, &
ns, f_sirdgconc, avg_ice_present='none', mask_ice_free_points=.false.)

if (f_sirdgthick(1:1) /= 'x') &
call define_hist_field(n_sirdgthick,"sirdgthick","m",tstr2D, tcstr, &
"ridged ice thickness", &
"total volume of ridged sea ice divided by area of ridges", &
c1, c0, &
ns, f_sirdgthick, avg_ice_present='ridge', mask_ice_free_points=.true.)

endif ! histfreq(ns) /= 'x'
enddo ! nstreams

Expand Down Expand Up @@ -331,6 +358,7 @@ end subroutine init_hist_mechred_3Dc

subroutine accum_hist_mechred (iblk)

use ice_blocks, only: nx_block, ny_block
use ice_history_shared, only: n2D, a2D, a3Dc, ncat_hist, &
accum_hist_field
use ice_state, only: aice, vice, trcr, aicen, vicen, trcrn
Expand Down Expand Up @@ -380,6 +408,15 @@ subroutine accum_hist_mechred (iblk)
if (f_opening(1:1) /= 'x') &
call accum_hist_field(n_opening, iblk, opening(:,:,iblk), a2D)

if (f_sirdgconc(1:1)/= 'x') &
call accum_hist_field(n_sirdgconc, iblk, &
aice(:,:,iblk) * (c1 - trcr(:,:,nt_alvl,iblk)), a2D)

if (f_sirdgthick(1:1)/= 'x') then
call accum_hist_field(n_sirdgthick, iblk, &
vice(:,:,iblk) * (c1 - trcr(:,:,nt_vlvl,iblk)), a2D)
endif

endif ! allocated(a2D)

! 3D category fields
Expand Down
Loading