Skip to content

PR for updating icepack to version from OM3-0.4.0 (DO NOT MERGE) #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
blimlim wants to merge 19 commits into
base: main
Choose a base branch
from
Draft

PR for updating icepack to version from OM3-0.4.0 (DO NOT MERGE) #7

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0b5be47
logging, tweaked newton solver tolerances, re-add einex
kieranricardo Apr 29, 2024
03d5235
extra logging
kieranricardo Apr 30, 2024
80dc402
fix argument ordering in set_sfcflux
kieranricardo May 6, 2024
3d50087
remove cm2 style conductive flux limiting
kieranricardo May 7, 2024
1b539cf
use cm2 style conductive flux limiting
kieranricardo May 20, 2024
4d4c7b1
change flux energy error threshold, and reduce fsurf before thermo solve
kieranricardo Jul 22, 2024
862c39c
don't reduce fsurf before thermo solve - has no effect
kieranricardo Jul 23, 2024
8f336c5
convert GBM ice fluxes to local
kieranricardo Aug 20, 2024
ca72f1b
remove scaling by inverse ice fraction
kieranricardo Aug 26, 2024
e6419ab
reduce fcondtop limiting threshold
kieranricardo Aug 27, 2024
a2d88f3
increase ice and snow thickness minimum values to match CM2, revert c…
kieranricardo Sep 17, 2024
0a4650f
scale ice fluxes by changing ice area
kieranricardo Sep 17, 2024
9d7ef62
more agressively zap small ice areas
kieranricardo Sep 17, 2024
d5296fe
revert zapping back to original values - possible water conservation …
kieranricardo Oct 15, 2024
5cb072d
Swap hi_min to 0.2 and add aicenmin=1.e-5
blimlim Nov 14, 2024
0cfa7fd
Remove stray deprecated zsal flag
blimlim Mar 31, 2025
31305ce
Change default hi_min to p1
blimlim Apr 9, 2025
05e415d
Remove unnecessary comments
blimlim Apr 23, 2025
33bbca5
Review suggestions: remove unnecessary include and comment
blimlim Apr 24, 2025
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
2 changes: 1 addition & 1 deletion columnphysics/icepack_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ subroutine set_sfcflux (aicen, &

character(len=*),parameter :: subname='(set_sfcflux)'

raicen = c1
raicen = c1 / aicen

#ifdef CICE_IN_NEMO
!----------------------------------------------------------------------
Expand Down
5 changes: 3 additions & 2 deletions columnphysics/icepack_itd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
module icepack_itd

use icepack_kinds
use icepack_parameters, only: c0, c1, c2, c3, c15, c25, c100, p1, p01, p001, p5, puny
use icepack_parameters, only: c0, c1, c2, c3, c15, c25, c100, p1, p01, p001, p5, puny, p2
Copy link
Copy Markdown

@kieranricardo kieranricardo Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we use p2 here?

Copy link
Copy Markdown
Collaborator Author

@blimlim blimlim Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great point. p2 shouldn't be needed here anymore. I've removed it in 33bbca5

use icepack_parameters, only: Lfresh, rhos, ice_ref_salinity, hs_min, cp_ice, rhoi
use icepack_parameters, only: rhosi, sk_l, hs_ssl, min_salin, rsnw_fall, rhosnew
use icepack_tracers, only: ncat, nilyr, nslyr, nblyr, ntrcr, nbtrcr, n_aero
Expand Down Expand Up @@ -1053,6 +1053,7 @@ subroutine zap_small_areas (dt, &
first_ice ! For bgc tracers. Set to true if zapping ice

! local variables
real (kind=dbl_kind) :: aicenmin = 1.0e-5 ! Cutoff concentration for zapping

integer (kind=int_kind) :: &
n, k, it, & !counting indices
Expand Down Expand Up @@ -1080,7 +1081,7 @@ subroutine zap_small_areas (dt, &
call icepack_warnings_add(subname//' Zap ice: negative ice area')
return
elseif (abs(aicen(n)) /= c0 .and. &
abs(aicen(n)) <= puny) then
abs(aicen(n)) <= aicenmin) then

!-----------------------------------------------------------------
! Account for tracers important for conservation
Expand Down
4 changes: 2 additions & 2 deletions columnphysics/icepack_parameters.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ module icepack_parameters
kice = 2.03_dbl_kind ,&! thermal conductivity of fresh ice(W/m/deg)
! kice is only used with ktherm=1 (BL99) and conduct='MU71'
ksno = 0.30_dbl_kind ,&! thermal conductivity of snow (W/m/deg)
hs_min = 1.e-4_dbl_kind ,&! min snow thickness for computing zTsn (m)
hs_min = 0.10_dbl_kind ,&! min snow thickness for computing zTsn (m)
snowpatch = 0.02_dbl_kind ,&! parameter for fractional snow area (m)
saltmax = 3.2_dbl_kind ,&! max salinity at ice base for BL99 (ppt)
! phi_init, dSin0_frazil are for mushy thermo
Expand All @@ -131,7 +131,7 @@ module icepack_parameters
dSin0_frazil = c3 ,&! bulk salinity reduction of newly formed frazil
dts_b = 50._dbl_kind ,&! zsalinity timestep
ustar_min = 0.005_dbl_kind ,&! minimum friction velocity for ocean heat flux (m/s)
hi_min = p01 ,&! minimum ice thickness allowed (m) for thermo
hi_min = p1 ,&! minimum ice thickness allowed (m) for thermo
! mushy thermo
a_rapid_mode = 0.5e-3_dbl_kind,&! channel radius for rapid drainage mode (m)
Rac_rapid_mode = 10.0_dbl_kind,&! critical Rayleigh number
Expand Down
Loading
Loading