From 79aab267ae054d5cd6cfc8a9e4e38cc7777edc7a Mon Sep 17 00:00:00 2001
From: jchanut <jerome.chanut@mercator-ocean.fr>
Date: Wed, 9 Mar 2022 15:01:23 +0100
Subject: [PATCH] Ice thickness dependent roughness in GLS and TKE
Prevent from using nn_mxlice==(2,3) without a sea-ice model (nn_ice==0)
---
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