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

FSD updates for icepack. #813

Merged
merged 4 commits into from
Mar 15, 2023
Merged

FSD updates for icepack. #813

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d8a2d7
send wlat to and fro for FSD
cmbitz Jan 30, 2023
0dab0da
Merge branch 'CICE-Consortium:main' into FSDmods
dabail10 Feb 15, 2023
35d63b3
Merge branch 'CICE-Consortium:main' into FSDmods
dabail10 Mar 15, 2023
4b4ec2f
Update Icepack to include FSDmods
dabail10 Mar 15, 2023
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
4 changes: 3 additions & 1 deletion cicecore/cicedyn/general/ice_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ module ice_flux
vatmT , & ! vatm on T grid (m/s)
rside , & ! fraction of ice that melts laterally
fside , & ! lateral heat flux (W/m^2)
wlat , & ! lateral heat rate (m/s)
fsw , & ! incoming shortwave radiation (W/m^2)
coszen , & ! cosine solar zenith angle, < 0 for sun below horizon
rdg_conv, & ! convergence term for ridging (1/s)
Expand Down Expand Up @@ -540,7 +541,8 @@ subroutine alloc_flux
uatmT (nx_block,ny_block,max_blocks), & ! uatm on T grid
vatmT (nx_block,ny_block,max_blocks), & ! vatm on T grid
rside (nx_block,ny_block,max_blocks), & ! fraction of ice that melts laterally
fside (nx_block,ny_block,max_blocks), & ! lateral melt rate (W/m^2)
fside (nx_block,ny_block,max_blocks), & ! lateral melt flux (W/m^2)
wlat (nx_block,ny_block,max_blocks), & ! lateral melt rate (m/s)
fsw (nx_block,ny_block,max_blocks), & ! incoming shortwave radiation (W/m^2)
coszen (nx_block,ny_block,max_blocks), & ! cosine solar zenith angle, < 0 for sun below horizon
rdg_conv (nx_block,ny_block,max_blocks), & ! convergence term for ridging (1/s)
Expand Down
6 changes: 4 additions & 2 deletions cicecore/cicedyn/general/ice_step_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ subroutine step_therm1 (dt, iblk)
use ice_calendar, only: yday
use ice_domain_size, only: ncat, nilyr, nslyr, n_iso, n_aero
use ice_flux, only: frzmlt, sst, Tf, strocnxT_iavg, strocnyT_iavg, rside, fbot, Tbot, Tsnice, &
meltsn, melttn, meltbn, congeln, snoicen, uatmT, vatmT, fside, &
meltsn, melttn, meltbn, congeln, snoicen, uatmT, vatmT, fside, wlat, &
wind, rhoa, potT, Qa, zlvl, zlvs, strax, stray, flatn, fsensn, fsurfn, fcondtopn, &
flw, fsnow, fpond, sss, mlt_onset, frz_onset, fcondbotn, fcondbot, fsloss, &
frain, Tair, strairxT, strairyT, fsurf, fcondtop, fsens, &
Expand Down Expand Up @@ -469,6 +469,7 @@ subroutine step_therm1 (dt, iblk)
frzmlt = frzmlt (i,j, iblk), &
rside = rside (i,j, iblk), &
fside = fside (i,j, iblk), &
wlat = wlat (i,j, iblk), &
fsnow = fsnow (i,j, iblk), &
frain = frain (i,j, iblk), &
fpond = fpond (i,j, iblk), &
Expand Down Expand Up @@ -618,7 +619,7 @@ subroutine step_therm2 (dt, iblk)
use ice_calendar, only: yday
use ice_domain_size, only: ncat, nilyr, nslyr, nblyr, nfsd
use ice_flux, only: fresh, frain, fpond, frzmlt, frazil, frz_onset, &
update_ocn_f, fsalt, Tf, sss, salinz, fhocn, rside, fside, &
update_ocn_f, fsalt, Tf, sss, salinz, fhocn, rside, fside, wlat, &
meltl, frazil_diag
use ice_flux_bgc, only: flux_bio, faero_ocn, &
fiso_ocn, HDO_ocn, H2_16O_ocn, H2_18O_ocn
Expand Down Expand Up @@ -702,6 +703,7 @@ subroutine step_therm2 (dt, iblk)
rside = rside (i,j, iblk), &
meltl = meltl (i,j, iblk), &
fside = fside (i,j, iblk), &
wlat = wlat (i,j, iblk), &
frzmlt = frzmlt (i,j, iblk), &
frazil = frazil (i,j, iblk), &
frain = frain (i,j, iblk), &
Expand Down