Changeset 27 for trunk/NEMO/OPA_SRC/LDF

Timestamp:

2004-02-17T10:07:54+01:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX009 : Running problem for EEL5 configuration is solved

Location:

trunk/NEMO/OPA_SRC/LDF

Files:

• ldfdyn.F90 (modified) (1 diff)
• ldftra.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/LDF/ldfdyn.F90

@@ -126 +126 @@
       ENDIF
 
-      IF( .NOT. lk_sco ) THEN          ! horizontal = iso-level except in s-coordinate
-         ln_dynldf_level = ln_dynldf_level .OR. ln_dynldf_hor
+      IF( lk_sco ) THEN          ! s-coordinates: rotation required for horizontal or isopycnal direction
+         IF( ( ln_dynldf_iso .OR. ln_dynldf_hor ) .AND. .NOT.lk_ldfslp ) THEN
+            IF(lwp) WRITE(numout,cform_err)
+            IF(lwp) WRITE(numout,*) '          the rotation of the viscous tensor require key_ldfslp'
+            IF( .NOT.lk_esopa )   nstop = nstop + 1
+         ENDIF
+      ELSE                       ! z-coordinates with/without partial step:
+         ln_dynldf_level = ln_dynldf_level .OR. ln_dynldf_hor      ! level mixing = horizontal mixing
          ln_dynldf_hor   = .FALSE.
          IF(lwp) WRITE(numout,*) '          horizontal mixing in z-coord or partial steps: force ln_dynldf_level = T'
-         IF(lwp) WRITE(numout,*) '             ln_dynldf_level = ', ln_dynldf_level, ' ln_dynldf_hor = ', ln_dynldf_hor
-         IF(lwp) WRITE(numout,*) '             ln_dynldf_t 1: ', .NOT. lk_ldfslp .OR. .NOT. lk_esopa   &
-                                               , '2 ' , ln_dynldf_iso .OR. .NOT. ln_dynldf_hor
-      ENDIF
-      IF( .NOT.lk_ldfslp .AND. ( ln_dynldf_iso .OR. .NOT. ln_dynldf_hor ) ) THEN
-         IF( .NOT.lk_esopa ) THEN
+         IF(lwp) WRITE(numout,*) '                                                  and    force ln_dynldf_hor   = F'
+         IF( ln_dynldf_iso .AND. .NOT.lk_ldfslp ) THEN             ! rotation required for isopycnal mixing
             IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) '          the rotation of the diffusive tensor require key_ldfslp'
-            nstop = nstop + 1
+            IF(lwp) WRITE(numout,*) '          the rotation of the viscous tensor require key_ldfslp'
+            IF( .NOT.lk_esopa )   nstop = nstop + 1
          ENDIF
       ENDIF
-
 
       l_dynldf_lap     =       ln_dynldf_lap   .AND. ln_dynldf_level     ! iso-level   laplacian operator

trunk/NEMO/OPA_SRC/LDF/ldftra.F90

@@ -135 +135 @@
       ENDIF
 
-      IF( .NOT. lk_sco ) THEN          ! horizontal = iso-level except in s-coordinate
-         ln_traldf_level = ln_traldf_level .OR. ln_traldf_hor
+      IF( lk_sco ) THEN          ! s-coordinates: rotation required for horizontal or isopycnal mixing
+         IF( ( ln_traldf_iso .OR. ln_traldf_hor ) .AND. .NOT.lk_ldfslp ) THEN
+            IF(lwp) WRITE(numout,cform_err)
+            IF(lwp) WRITE(numout,*) '          the rotation of the diffusive tensor require key_ldfslp'
+            IF( .NOT.lk_esopa )   nstop = nstop + 1
+         ENDIF
+      ELSE                       ! z-coordinates with/without partial step:
+         ln_traldf_level = ln_traldf_level .OR. ln_traldf_hor      ! level diffusion = horizontal diffusion
          ln_traldf_hor   = .FALSE.
-      ENDIF
-      IF( .NOT.lk_ldfslp .AND. ( ln_traldf_iso .OR. .NOT.ln_traldf_hor ) ) THEN
-         IF( .NOT.lk_esopa ) THEN
+         IF(lwp) WRITE(numout,*) '          horizontal mixing in z-coord or partial steps: force ln_traldf_level = T'
+         IF(lwp) WRITE(numout,*) '                                                  and    force ln_traldf_hor   = F'
+         IF( ln_traldf_iso .AND. .NOT.lk_ldfslp ) THEN             ! rotation required for isopycnal mixing
             IF(lwp) WRITE(numout,cform_err)
             IF(lwp) WRITE(numout,*) '          the rotation of the diffusive tensor require key_ldfslp'
-            nstop = nstop + 1
+            IF( .NOT.lk_esopa )   nstop = nstop + 1
          ENDIF
       ENDIF