Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions columnphysics/icepack_therm_itd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1894,7 +1894,7 @@ subroutine icepack_step_therm2(dt, hin_max, &
wavefreq, &
d_afsd_latg, d_afsd_newi, &
d_afsd_latm, d_afsd_weld, &
dpnd_melt)
dpnd_melt, dSin0_frazil_cell)

use icepack_parameters, only: icepack_init_parameters

Expand Down Expand Up @@ -1942,7 +1942,8 @@ subroutine icepack_step_therm2(dt, hin_max, &
dpnd_melt ! pond 'drainage' due to ice melting (m / step)

real (kind=dbl_kind), intent(in), optional :: &
wlat ! lateral melt rate (m/s)
wlat, & ! lateral melt rate (m/s)
dSin0_frazil_cell ! frazil bulk salinity reduction from sss (ppt)

real (kind=dbl_kind), dimension(:), intent(inout) :: &
aicen_init,& ! initial concentration of ice
Expand Down Expand Up @@ -1999,6 +2000,9 @@ subroutine icepack_step_therm2(dt, hin_max, &

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

real (kind=dbl_kind) :: &
dSin0_frazil_local

!-----------------------------------------------------------------
! Check optional arguments and set local values
!-----------------------------------------------------------------
Expand Down Expand Up @@ -2033,6 +2037,9 @@ subroutine icepack_step_therm2(dt, hin_max, &
endif
endif

dSin0_frazil_local = dSin0_frazil
if (present(dSin0_frazil_cell)) dSin0_frazil_local = dSin0_frazil_cell

!-----------------------------------------------------------------
! Let rain drain through to the ocean.
!-----------------------------------------------------------------
Expand Down Expand Up @@ -2102,7 +2109,7 @@ subroutine icepack_step_therm2(dt, hin_max, &
fresh, fsalt, &
Tf, sss, &
salinz, phi_init, &
dSin0_frazil, &
dSin0_frazil_local, &
flux_bio, &
ocean_bio, &
frazil_diag, fiso_ocn, &
Expand Down
Loading