From 7df80baa1a67769ad0aa4e07bbf8d250079d410d Mon Sep 17 00:00:00 2001 From: "David A. Bailey" Date: Wed, 15 Mar 2023 16:45:16 -0600 Subject: [PATCH] FSD updates for icepack. (#813) * send wlat to and fro for FSD * Update Icepack to include FSDmods --------- Co-authored-by: cmbitz --- cicecore/cicedyn/general/ice_flux.F90 | 4 +++- cicecore/cicedyn/general/ice_step_mod.F90 | 6 ++++-- icepack | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cicecore/cicedyn/general/ice_flux.F90 b/cicecore/cicedyn/general/ice_flux.F90 index 8d190753e..5145fec66 100644 --- a/cicecore/cicedyn/general/ice_flux.F90 +++ b/cicecore/cicedyn/general/ice_flux.F90 @@ -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) @@ -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) diff --git a/cicecore/cicedyn/general/ice_step_mod.F90 b/cicecore/cicedyn/general/ice_step_mod.F90 index 8dd6fe49a..56510c247 100644 --- a/cicecore/cicedyn/general/ice_step_mod.F90 +++ b/cicecore/cicedyn/general/ice_step_mod.F90 @@ -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, & @@ -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), & @@ -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 @@ -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), & diff --git a/icepack b/icepack index 37e215b53..a4779cc71 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit 37e215b5329463591d2cce228883fd34aa0ea3be +Subproject commit a4779cc71125b40a7db3a4da8512247cbf2b0955