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

Timestamp:

2009-07-24T08:48:42+02:00 (15 years ago)

Author:

ctlod

Message:

change TKE cpp key names, see ticket: #485

File:

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

trunk/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -101 +101 @@
          ioptio = ioptio+1
       ENDIF
-      IF( lk_zdftke ) THEN
+      IF( lk_zdftke_old ) THEN
          IF(lwp) WRITE(numout,*) '             TKE dependent eddy coefficients'
          ioptio = ioptio+1
       ENDIF
-      IF( lk_zdftke2 ) THEN
+      IF( lk_zdftke ) THEN
          IF(lwp) WRITE(numout,*) '             TKE2 dependent eddy coefficients'
          ioptio = ioptio+1
@@ -128 +128 @@
          ioptio = ioptio+1
       ENDIF
-      IF( lk_zdftke .OR. lk_zdftke2 ) THEN
+      IF( lk_zdftke_old .OR. lk_zdftke ) THEN
          IF(lwp) WRITE(numout,*) '             use the 1.5 turbulent closure'
       ENDIF
@@ -140 +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_zdftke2 .OR. lk_zdfkpp ) ) &
+      IF( ioptio == 0 .AND. .NOT.( lk_zdftke_old .OR. lk_zdftke .OR. lk_zdfkpp ) ) &
          CALL ctl_stop( ' except for TKE sor KPP physics, a convection scheme is', &
          &              ' required: ln_zdfevd or ln_zdfnpc logicals' )