Skip to content

Commit

Permalink
move optional arg check and alphabetize doc
Browse files Browse the repository at this point in the history
  • Loading branch information
eclare108213 committed Sep 11, 2023
1 parent df4e891 commit e4bc611
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions columnphysics/icepack_therm_itd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2137,10 +2137,10 @@ subroutine icepack_step_therm2 (dt, ncat, nltrcr, &
! Check optional arguments and set local values
!-----------------------------------------------------------------

if (present(update_ocn_f)) then
call icepack_init_parameters(update_ocn_f_in=update_ocn_f)
endif
if (icepack_chkoptargflag(first_call)) then
if (present(update_ocn_f)) then
call icepack_init_parameters(update_ocn_f_in=update_ocn_f)
endif
if (tr_iso) then
if (.not.(present(fiso_ocn) .and. &
present(HDO_ocn) .and. &
Expand Down
2 changes: 1 addition & 1 deletion doc/source/user_guide/ug_case_settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ forcing_nml
"", "``mushy``", "matches mushy-layer thermo (ktherm=2)", ""
"``trestore``", "integer", "sst restoring time scale (days)", "90"
"``cpl_frazil``", "``external``", "frazil water/salt fluxes are handled outside of Icepack", "``fresh_ice_correction``"
"", "``internal``", "send full frazil water/salt fluxes for mushy physics", ""
"", "``fresh_ice_correction``", "correct fresh-ice frazil water/salt fluxes for mushy physics", ""
"", "``internal``", "send full frazil water/salt fluxes for mushy physics", ""
"``update_ocn_f``", "``.false.``", "do not include frazil water/salt fluxes in ocn fluxes", "``.false.``"
"", "``true``", "include frazil water/salt fluxes in ocn fluxes", ""
"``ustar_min``", "real", "minimum value of ocean friction velocity in m/s", "0.005"
Expand Down

0 comments on commit e4bc611

Please sign in to comment.