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 7c412688)

79aab267 Ice thickness dependent roughness in GLS and TKE

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
 

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