Changeset 2132 for branches/devmercator2010_1/NEMO/OPA_SRC/ZDF/zdfini.F90

Timestamp:

2010-09-29T17:31:36+02:00 (14 years ago)

Author:

cbricaud

Message:

add change from DEV_r1784_GLS

File:

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

branches/devmercator2010_1/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -20 +20 @@
    USE zdftke_old      ! TKE vertical mixing  (old scheme)
    USE zdftke          ! TKE vertical mixing
+   USE zdfgls          ! GLS vertical mixing
    USE zdfkpp          ! KPP vertical mixing          
    USE zdfddm          ! double diffusion mixing      
@@ -106 +107 @@
          ioptio = ioptio+1
       ENDIF
+      IF( lk_zdfgls ) THEN
+         IF(lwp) WRITE(numout,*) '      GLS dependent eddy coefficients'
+         ioptio = ioptio+1
+      ENDIF
       IF( lk_zdfkpp ) THEN
          IF(lwp) WRITE(numout,*) '      KPP dependent eddy coefficients'
@@ -128 +133 @@
          IF(lwp) WRITE(numout,*) '      use the 1.5 turbulent closure'
       ENDIF
+      IF( lk_zdfgls ) THEN
+         IF(lwp) WRITE(numout,*) '      use the GLS closure scheme'
+      ENDIF
       IF( lk_zdfkpp ) THEN
          IF(lwp) WRITE(numout,*) '      use the KPP closure scheme'
@@ -136 +144 @@
       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_zdfkpp ) ) &
-         CALL ctl_stop( ' except for TKE sor KPP physics, a convection scheme is', &
+      IF( ioptio == 0 .AND. .NOT.( lk_zdftke_old .OR. 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' )