Changeset 2303 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF

Timestamp:

2010-10-22T16:51:08+02:00 (14 years ago)

Author:

rblod

Message:

Suppress old TKE see ticket #742

Location:

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF

Files:

• zdfini.F90 (modified) (4 diffs)
• zdftke_old.F90 (deleted)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -18 +18 @@
    USE zdf_oce         ! TKE vertical mixing          
    USE lib_mpp         ! distribued memory computing
-   USE zdftke_old      ! TKE vertical mixing  (old scheme)
    USE zdftke          ! TKE vertical mixing
    USE zdfgls          ! GLS vertical mixing
@@ -99 +98 @@
          ioptio = ioptio+1
       ENDIF
-      IF( lk_zdftke_old ) THEN
-         IF(lwp) WRITE(numout,*) '      TKE dependent eddy coefficients'
-         ioptio = ioptio+1
-      ENDIF
       IF( lk_zdftke ) THEN
          IF(lwp) WRITE(numout,*) '      TKE dependent eddy coefficients'
@@ -130 +125 @@
          ioptio = ioptio+1
       ENDIF
-      IF( lk_zdftke_old .OR. lk_zdftke ) THEN
+      IF( lk_zdftke ) THEN
          IF(lwp) WRITE(numout,*) '      use the 1.5 turbulent closure'
       ENDIF
@@ -144 +139 @@
       ENDIF
       IF ( ioptio > 1 .AND. .NOT. lk_esopa )   CALL ctl_stop( ' chose between ln_zdfnpc and ln_zdfevd' )
-      IF( ioptio == 0 .AND. .NOT.( lk_zdftke_old .OR. lk_zdftke .OR. lk_zdfgls .OR. lk_zdfkpp ) ) &
+      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfgls .OR. lk_zdfkpp ) ) &
          CALL ctl_stop( ' except for TKE, GLS or KPP physics, a convection scheme is', &
          &              ' required: ln_zdfevd or ln_zdfnpc logicals' )