From 7f871a6c36f54c202af239943b60a259f0ae874e Mon Sep 17 00:00:00 2001
From: Guillaume Samson <guillaume.samson@mercator-ocean.fr>
Date: Wed, 9 Mar 2022 14:10:41 +0000
Subject: [PATCH] Merge branch '29-zdftke-and-zdfgls-nn_ice-0' into
'branch_4.2'
Ice thickness dependent roughness in GLS and TKE
See merge request nemo/nemo!49
(cherry picked from commit 7c4126888b4bc2798da19b37b168ee76703bdd4f)
79aab267 Ice thickness dependent roughness in GLS and TKE
---
src/OCE/ZDF/zdfgls.F90 | 3 +++
src/OCE/ZDF/zdftke.F90 | 3 +++
2 files changed, 6 insertions(+)
diff --git a/src/OCE/ZDF/zdfgls.F90 b/src/OCE/ZDF/zdfgls.F90
index e3f7c96e8..8c0b65d2b 100644
--- a/src/OCE/ZDF/zdfgls.F90
+++ b/src/OCE/ZDF/zdfgls.F90
@@ -969,6 +969,9 @@ CONTAINS
CASE DEFAULT
CALL ctl_stop( 'zdf_tke_init: wrong value for nn_mxlice, should be 0,1,2,3 ')
END SELECT
+ IF ( (nn_mxlice>1).AND.(nn_ice<2) ) THEN
+ CALL ctl_stop( 'zdf_tke_init: with no ice model, nn_mxlice must be 0 or 1')
+ ENDIF
WRITE(numout,*)
ENDIF
diff --git a/src/OCE/ZDF/zdftke.F90 b/src/OCE/ZDF/zdftke.F90
index c9847d553..f8f604567 100644
--- a/src/OCE/ZDF/zdftke.F90
+++ b/src/OCE/ZDF/zdftke.F90
@@ -762,6 +762,9 @@ CONTAINS
CASE DEFAULT
CALL ctl_stop( 'zdf_tke_init: wrong value for nn_mxlice, should be 0,1,2,3 or 4')
END SELECT
+ IF ( (nn_mxlice>1).AND.(nn_ice<2) ) THEN
+ CALL ctl_stop( 'zdf_tke_init: with no ice model, nn_mxlice must be 0 or 1')
+ ENDIF
ENDIF
WRITE(numout,*) ' Langmuir cells parametrization ln_lc = ', ln_lc
WRITE(numout,*) ' coef to compute vertical velocity of LC rn_lc = ', rn_lc
--
GitLab