From aa27fc05b65be34b322b14c650d051cfabf0a037 Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Tue, 30 May 2023 14:54:12 -0400 Subject: [PATCH 1/3] icepack: update to 87d2559 Update Icepack to concepts/Icepack@87d2559 (Merge branch 'concepts/step-therm1-pass-qsur' into 'concepts/main' (!20), 2023-05-19), which includes fixes for bugs encountered during the GDPS/G1 IC-4 cycles: - 'Qsur' was not correctly computed for cells with small ice concentration - 'ferrmax' was too strict for some cases, leading to temperature solver convergence failures Additionnally, an error print was improved to included the failing category. --- icepack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icepack b/icepack index 1464efde8..27149d17c 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit 1464efde802a06325478ebb9bcd2cdd0573aad29 +Subproject commit 27149d17c3613295d53246d934ec696f58ed30af From 7677ff014e0327866033ac2c790022ba77ed44e7 Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Tue, 30 May 2023 15:37:31 -0400 Subject: [PATCH 2/3] icepack: add tfrz_option='nonlin' in icepack_liquidus_temperature Update Icepack to concepts/Icepack@6858156 (Merge branch 'concepts/tf-nonlin' into 'concepts/main' (!21), 2023-05-30), which adds 'nonlin' as a option for 'tfrz_option'. --- icepack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icepack b/icepack index 27149d17c..c0d355e3f 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit 27149d17c3613295d53246d934ec696f58ed30af +Subproject commit c0d355e3fa9ffca3ae20afa59c0e2fb900c55031 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 3/3] 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