Skip to content
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

Jump to bottom

Update Icepack for latest Consortium master, including advance snow physics #6

Merged
merged 11 commits into from
Sep 16, 2021
Merged

Update Icepack for latest Consortium master, including advance snow physics #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
583d961
update Onyx port after upgrade (#367)
apcraig Jul 9, 2021
b529976
Merge branch 'CICE-Consortium:master' into emc/develop
DeniseWorthen Jul 20, 2021
53ffce0
Advanced snow physics (#360)
eclare108213 Aug 11, 2021
f6f3125
Merge remote-tracking branch 'upstream/master' into feature/updcice
DeniseWorthen Aug 15, 2021
5b0cf5b
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen Aug 15, 2021
2f878d7
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Aug 20, 2021
31a575d
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen Aug 20, 2021
e1f3574
Netcdf History Capability (#368)
apcraig Aug 31, 2021
0836bfc
update namelist reading to allow arbitrary order of namelist groups. …
apcraig Aug 31, 2021
34c8e68
update version number to 1.3.0 (#370)
apcraig Aug 31, 2021
29ee0ce
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Aug 31, 2021
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 .github/workflows/test-icepack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
- name: run suite
run: |
cd $HOME/icepack
./icepack.setup -m conda -e ${{ matrix.envdef }} --suite travis_suite --testid ${{ matrix.os }}
./icepack.setup -m conda -e ${{ matrix.envdef }} --suite travis_suite,io_suite --testid ${{ matrix.os }}
- name: write output
run: |
cd $HOME/icepack
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ script:
- "./icepack.setup --case trcase --mach travisCI --env gnu --pes 1x1 -s diag1 && sleep 4"
- "./icepack.setup --test smoke --testid trtest --mach travisCI --env gnu
--pes 1x1 -s diag1 && sleep 4"
- "./icepack.setup --suite travis_suite --testid travisCItest
- "./icepack.setup --suite travis_suite,io_suite --testid travisCItest
--mach travisCI --env gnu &&
cd testsuite.travisCItest &&
./results.csh"
Expand Down
1 change: 1 addition & 0 deletions columnphysics/icepack_algae.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ subroutine zbio (dt, nblyr, &
if (icepack_warnings_aborted(subname)) return

call merge_bgc_fluxes (dt, nblyr, &
nslyr, &
bio_index, n_algae, &
nbtrcr, aicen, &
vicen, vsnon, &
Expand Down
9 changes: 8 additions & 1 deletion columnphysics/icepack_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ subroutine merge_fluxes (aicen, &
fswthru_idr, fswthru_idf,&
melttn, meltsn, meltbn, congeln, snoicen, &
meltt, melts, &
meltb, &
meltb, dsnow, dsnown,&
congel, snoice, &
meltsliq, meltsliqn, &
Uref, Urefn, &
Qref_iso, Qrefn_iso, &
fiso_ocn, fiso_ocnn, &
Expand Down Expand Up @@ -95,6 +96,8 @@ subroutine merge_fluxes (aicen, &
melttn , & ! top ice melt (m)
meltbn , & ! bottom ice melt (m)
meltsn , & ! snow melt (m)
meltsliqn,& ! mass of snow melt (kg/m^2)
dsnown , & ! change in snow depth (m)
congeln , & ! congelation ice growth (m)
snoicen ! snow-ice growth (m)

Expand Down Expand Up @@ -125,6 +128,8 @@ subroutine merge_fluxes (aicen, &
meltt , & ! top ice melt (m)
meltb , & ! bottom ice melt (m)
melts , & ! snow melt (m)
meltsliq, & ! mass of snow melt (kg/m^2)
dsnow , & ! change in snow depth (m)
congel , & ! congelation ice growth (m)
snoice ! snow-ice growth (m)

Expand Down Expand Up @@ -212,6 +217,8 @@ subroutine merge_fluxes (aicen, &
meltt = meltt + melttn * aicen
meltb = meltb + meltbn * aicen
melts = melts + meltsn * aicen
meltsliq = meltsliq + meltsliqn * aicen
dsnow = dsnow + dsnown * aicen
congel = congel + congeln * aicen
snoice = snoice + snoicen * aicen

Expand Down
4 changes: 4 additions & 0 deletions columnphysics/icepack_intfc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ module icepack_intfc
use icepack_wavefracspec, only: icepack_init_wave
use icepack_wavefracspec, only: icepack_step_wavefracture

use icepack_snow, only: icepack_step_snow

use icepack_shortwave, only: icepack_prep_radiation
use icepack_shortwave, only: icepack_step_radiation

Expand Down Expand Up @@ -114,6 +116,8 @@ module icepack_intfc
use icepack_mushy_physics , only: icepack_mushy_liquid_fraction
use icepack_mushy_physics , only: icepack_mushy_temperature_mush

use icepack_snow, only: icepack_init_snow

use icepack_warnings, only: icepack_warnings_clear
use icepack_warnings, only: icepack_warnings_print
use icepack_warnings, only: icepack_warnings_flush
Expand Down
35 changes: 19 additions & 16 deletions columnphysics/icepack_itd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ 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: Lfresh, rhos, ice_ref_salinity, hs_min, cp_ice, Tocnfrz, rhoi
use icepack_parameters, only: rhosi, sk_l, hs_ssl, min_salin
use icepack_parameters, only: rhosi, sk_l, hs_ssl, min_salin, rsnw_fall
use icepack_tracers, only: nt_Tsfc, nt_qice, nt_qsno, nt_aero, nt_isosno, nt_isoice
use icepack_tracers, only: nt_apnd, nt_hpnd, nt_fbri, tr_brine, nt_bgc_S, bio_index
use icepack_tracers, only: n_iso
use icepack_tracers, only: tr_iso
use icepack_tracers, only: n_iso, tr_iso, tr_snow, nt_smice, nt_rsnw, nt_rhos
use icepack_tracers, only: icepack_compute_tracers
use icepack_parameters, only: solve_zsal, skl_bgc, z_tracers
use icepack_parameters, only: kcatbound, kitd
Expand Down Expand Up @@ -1230,11 +1229,15 @@ subroutine zap_small_areas (dt, ntrcr, &

if (ntrcr >= 2) then
do it = 2, ntrcr
if (tr_brine .and. it == nt_fbri) then
trcrn(it,n) = c1
else
trcrn(it,n) = c0
endif
trcrn(it,n) = c0
enddo
endif
if (tr_brine) trcrn(nt_fbri,n) = c1
if (tr_snow) then
do k = 1, nslyr
trcrn(nt_rhos +k-1,n) = rhos
trcrn(nt_smice+k-1,n) = rhos
trcrn(nt_rsnw +k-1,n) = rsnw_fall
enddo
endif
first_ice(n) = .true.
Expand Down Expand Up @@ -1424,14 +1427,14 @@ subroutine zap_snow(dt, nslyr, &
endif ! tr_iso

if (z_tracers) then
dvssl = min(p5*vsnon, hs_ssl*aicen) !snow surface layer
dvint = vsnon- dvssl !snow interior

do it = 1, nbtrcr
xtmp = (trcrn(bio_index(it)+nblyr+1)*dvssl + &
trcrn(bio_index(it)+nblyr+2)*dvint)/dt
dflux_bio(it) = dflux_bio(it) + xtmp
enddo ! it
dvssl = min(p5*vsnon/real(nslyr,kind=dbl_kind), hs_ssl*aicen) ! snow surface layer
dvint = vsnon - dvssl ! snow interior

do it = 1, nbtrcr
xtmp = (trcrn(bio_index(it)+nblyr+1)*dvssl + &
trcrn(bio_index(it)+nblyr+2)*dvint)/dt
dflux_bio(it) = dflux_bio(it) + xtmp
enddo ! it

endif ! z_tracers

Expand Down
31 changes: 19 additions & 12 deletions columnphysics/icepack_meltpond_cesm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module icepack_meltpond_cesm

use icepack_kinds
use icepack_parameters, only: c0, c1, c2, p01, puny
use icepack_parameters, only: rhofresh, rhoi, rhos, Timelt
use icepack_parameters, only: rhofresh, rhoi, rhos, Timelt, pndaspect, use_smliq_pnd
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand All @@ -32,19 +32,19 @@ module icepack_meltpond_cesm
!=======================================================================

subroutine compute_ponds_cesm(dt, hi_min, &
pndaspect, &
rfrac, meltt, &
melts, frain, &
aicen, vicen, &
Tsfcn, apnd, hpnd)
aicen, vicen, &
Tsfcn, apnd, hpnd, &
meltsliqn)

real (kind=dbl_kind), intent(in) :: &
dt, & ! time step (s)
hi_min, & ! minimum ice thickness allowed for thermo (m)
pndaspect ! ratio of pond depth to pond fraction
hi_min ! minimum ice thickness allowed for thermo (m)

real (kind=dbl_kind), intent(in) :: &
rfrac, & ! water fraction retained for melt ponds
meltsliqn, & ! liquid input from snow liquid tracer
rfrac, & ! water fraction retained for melt ponds
meltt, &
melts, &
frain, &
Expand Down Expand Up @@ -104,11 +104,18 @@ subroutine compute_ponds_cesm(dt, hi_min, &
!-----------------------------------------------------------
! Update pond volume
!-----------------------------------------------------------
volpn = volpn &
+ rfrac/rhofresh*(meltt*rhoi &
+ melts*rhos &
+ frain* dt)&
* aicen
if (use_smliq_pnd) then
volpn = volpn &
+ rfrac/rhofresh*(meltt*rhoi &
+ meltsliqn) &
* aicen
else
volpn = volpn &
+ rfrac/rhofresh*(meltt*rhoi &
+ melts*rhos &
+ frain* dt)&
* aicen
endif

!-----------------------------------------------------------
! Shrink pond volume under freezing conditions
Expand Down
24 changes: 15 additions & 9 deletions columnphysics/icepack_meltpond_lvl.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module icepack_meltpond_lvl
use icepack_kinds
use icepack_parameters, only: c0, c1, c2, c10, p01, p5, puny
use icepack_parameters, only: viscosity_dyn, rhoi, rhos, rhow, Timelt, Tffresh, Lfresh
use icepack_parameters, only: gravit, depressT, rhofresh, kice
use icepack_parameters, only: gravit, depressT, rhofresh, kice, pndaspect, use_smliq_pnd
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand All @@ -35,14 +35,15 @@ module icepack_meltpond_lvl
subroutine compute_ponds_lvl(dt, nilyr, &
ktherm, &
hi_min, dpscale, &
frzpnd, pndaspect, &
frzpnd, &
rfrac, meltt, melts, &
frain, Tair, fsurfn,&
dhs, ffrac, &
aicen, vicen, vsnon, &
qicen, sicen, &
Tsfcn, alvl, &
apnd, hpnd, ipnd)
apnd, hpnd, ipnd, &
meltsliqn)

integer (kind=int_kind), intent(in) :: &
nilyr, & ! number of ice layers
Expand All @@ -51,8 +52,7 @@ subroutine compute_ponds_lvl(dt, nilyr, &
real (kind=dbl_kind), intent(in) :: &
dt, & ! time step (s)
hi_min, & ! minimum ice thickness allowed for thermo (m)
dpscale, & ! alter e-folding time scale for flushing
pndaspect ! ratio of pond depth to pond fraction
dpscale ! alter e-folding time scale for flushing

character (len=char_len), intent(in) :: &
frzpnd ! pond refreezing parameterization
Expand All @@ -69,7 +69,8 @@ subroutine compute_ponds_lvl(dt, nilyr, &
fsurfn,& ! atm-ice surface heat flux (W/m2)
aicen, & ! ice area fraction
vicen, & ! ice volume (m)
vsnon ! snow volume (m)
vsnon, & ! snow volume (m)
meltsliqn ! liquid contribution to meltponds in dt (kg/m^2)

real (kind=dbl_kind), &
intent(inout) :: &
Expand Down Expand Up @@ -154,9 +155,14 @@ subroutine compute_ponds_lvl(dt, nilyr, &
! update pond volume
!-----------------------------------------------------------
! add melt water
dvn = rfrac/rhofresh*(meltt*rhoi &
+ melts*rhos &
+ frain* dt)*aicen
if (use_smliq_pnd) then
dvn = rfrac/rhofresh*(meltt*rhoi &
+ meltsliqn)*aicen
else
dvn = rfrac/rhofresh*(meltt*rhoi &
+ melts*rhos &
+ frain* dt)*aicen
endif

! shrink pond volume under freezing conditions
if (trim(frzpnd) == 'cesm') then
Expand Down
Loading