Skip to content
Merged
Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions source/ice_init.F90
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ subroutine input_data(forcing_start_date, cur_exp_date, &
use ice_meltpond_lvl, only: restart_pond_lvl, dpscale, frzpnd, &
rfracmin, rfracmax, pndaspect, hs1
use ice_aerosol, only: restart_aero
use ice_therm_shared, only: ktherm, calc_Tsfc, conduct
use ice_therm_shared, only: ktherm, calc_Tsfc, conduct, ferrmax
use ice_therm_vertical, only: ustar_min, fbot_xfer_type
use ice_therm_mushy, only: a_rapid_mode, Rac_rapid_mode, aspect_rapid_mode, &
dSdt_slow_mode, phi_c_slow_mode, &
Expand Down Expand Up @@ -158,7 +158,7 @@ subroutine input_data(forcing_start_date, cur_exp_date, &
#ifdef AusCOM
chio, &
#endif
dSdt_slow_mode, phi_c_slow_mode, phi_i_mushy
dSdt_slow_mode, phi_c_slow_mode, phi_i_mushy, ferrmax

namelist /dynamics_nml/ &
kdyn, ndte, revised_evp, yield_curve, &
Expand Down Expand Up @@ -285,6 +285,8 @@ subroutine input_data(forcing_start_date, cur_exp_date, &
calc_Tsfc = .true. ! calculate surface temperature
update_ocn_f = .false. ! include fresh water and salt fluxes for frazil
ustar_min = 0.005 ! minimum friction velocity for ocean heat flux (m/s)
ferrmax = 1.0e-3_dbl_kind ! max allowed energy flux error (W m-2)
! recommend ferrmax < 0.01 W m-2
l_mpond_fresh = .false. ! logical switch for including meltpond freshwater
! flux feedback to ocean model
fbot_xfer_type = 'constant' ! transfer coefficient type for ocn heat flux
Expand Down
6 changes: 3 additions & 3 deletions source/ice_therm_shared.F90
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ module ice_therm_shared
Tmlt ! melting temperature
! nilyr + 1 index is for bottom surface

real (kind=dbl_kind), parameter, public :: &
ferrmax = 1.0e-3_dbl_kind ! max allowed energy flux error (W m-2)
! recommend ferrmax < 0.01 W m-2
real (kind=dbl_kind), public :: &
ferrmax ! max allowed energy flux error (W m-2)
! recommend ferrmax < 0.01 W m-2

real (kind=dbl_kind), parameter, public :: &
Tmin = -100.0_dbl_kind ! min allowed internal temperature (deg C)
Expand Down