Changeset 1239 for trunk/NEMO/OPA_SRC/ZDF/zdfini.F90

Timestamp:

2008-12-31T10:35:35+01:00 (15 years ago)

Author:

ctlod

Message:

this version allows to stabilize the computation of En production term, see ticket: #281

File:

• trunk/NEMO/OPA_SRC/ZDF/zdfini.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -14 +14 @@
    USE zdf_oce         ! TKE vertical mixing          
    USE lib_mpp         ! distribued memory computing
-   USE zdftke          ! TKE vertical mixing  
+   USE zdftke          ! TKE  vertical mixing  
+   USE zdftke2         ! TKE2 vertical mixing
    USE zdfkpp          ! KPP vertical mixing          
    USE zdfddm          ! double diffusion mixing      
@@ -104 +105 @@
          ioptio = ioptio+1
       ENDIF
+      IF( lk_zdftke2 ) THEN
+         IF(lwp) WRITE(numout,*) '             TKE2 dependent eddy coefficients'
+         ioptio = ioptio+1
+      ENDIF
       IF( lk_zdfkpp ) THEN
          IF(lwp) WRITE(numout,*) '             KPP dependent eddy coefficients'
@@ -123 +128 @@
          ioptio = ioptio+1
       ENDIF
-      IF( lk_zdftke ) THEN
+      IF( lk_zdftke .OR. lk_zdftke2 ) THEN
          IF(lwp) WRITE(numout,*) '             use the 1.5 turbulent closure'
       ENDIF
@@ -135 +140 @@
       IF ( ioptio > 1 .AND. .NOT. lk_esopa ) &
            CALL ctl_stop( ' chose between ln_zdfnpc', '           and ln_zdfevd' )
-      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfkpp ) ) &
+      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdftke2 .OR. lk_zdfkpp ) ) &
          CALL ctl_stop( ' except for TKE sor KPP physics, a convection scheme is', &
          &              ' required: ln_zdfevd or ln_zdfnpc logicals' )