From e7c45504087b3db2f969e47cf51309463cc7a2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Dupont?= Date: Fri, 5 May 2023 02:41:35 +0000 Subject: [PATCH] ice_init: do not warn when using BL99 thermo and 'tfrz_option=nonlin' In the previous commit we updated Icepack to allow 'tfrz_option=nonlin'. Adjust the check in ice_init::input_data such that we do not warn when this value is used along with the BL99 thermo, and adjust the warning accordingly. Co-authored-by: Philippe Blain --- cicecore/cicedynB/general/ice_init.F90 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index eb94f6ddb..8dab6e8fa 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1342,10 +1342,12 @@ subroutine input_data ! tcraig, is it really OK for users to run inconsistently? ! ech: yes, for testing sensitivities. It's not recommended for science runs - if (ktherm == 1 .and. trim(tfrz_option) /= 'linear_salt') then + if (ktherm == 1 .and. (trim(tfrz_option) /= 'linear_salt' .or. & + trim(tfrz_option) /= 'nonlin')) then if (my_task == master_task) then write(nu_diag,*) subname//' WARNING: ktherm = 1 and tfrz_option = ',trim(tfrz_option) write(nu_diag,*) subname//' WARNING: For consistency, set tfrz_option = linear_salt' + write(nu_diag,*) subname//' WARNING: or tfrz_option = nonlin' endif endif if (ktherm == 2 .and. trim(tfrz_option) /= 'mushy') then