Changeset 501 for trunk/NEMO/TOP_SRC/TRP/trcldf_bilap.F90

Timestamp:

2006-09-12T13:10:14+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_068:CE:re-organization of coordinate definition and scale factors

File:

• trunk/NEMO/TOP_SRC/TRP/trcldf_bilap.F90 (modified) (4 diffs)

trunk/NEMO/TOP_SRC/TRP/trcldf_bilap.F90

@@ -41 +41 @@
       !!      evaluated using before fields (forward time scheme). The hor.
       !!      diffusive trends of passive tracer is given by:
-      !!       * s-coordinate ('key_s_coord' defined), the vertical scale 
+      !!       * s-coordinate, the vertical scale 
       !!      factors e3. are inside the derivatives:
       !!      Laplacian of trb:
@@ -87 +87 @@
       !! * Local declarations
       INTEGER ::   ji, jj, jk, jn             ! dummy loop indices
-#if defined key_partial_steps
       INTEGER ::   iku, ikv                   ! temporary integers
-#endif
+
       REAL(wp) ::   ztra     ! temporary scalars
 
@@ -116 +115 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-#if defined key_s_coord || defined key_partial_steps
+#if ! defined key_zco 
                   ! s-coordinates, vertical scale factor are used
                   zbtr(ji,jj) = 1. / ( e1t(ji,jj)*e2t(ji,jj)*fse3t(ji,jj,jk) )
@@ -141 +140 @@
                END DO
             END DO
-#if defined key_partial_steps
-
-            DO jj = 1, jpj-1
-               DO ji = 1, jpi-1
-                  ! last level
-                  iku = MIN ( mbathy(ji,jj), mbathy(ji+1,jj  ) ) - 1
-                  ikv = MIN ( mbathy(ji,jj), mbathy(ji  ,jj+1) ) - 1
-                  IF( iku == jk ) THEN
-                     ztu(ji,jj,jk) = zeeu(ji,jj) * gtu(ji,jj)
-                  ENDIF
-                  IF( ikv == jk ) THEN
-                     ztv(ji,jj,jk) = zeev(ji,jj) * gtv(ji,jj)
-                  ENDIF
-               END DO
-            END DO
-#endif
+
+            IF( ln_zps ) THEN
+               DO jj = 1, jpj-1
+                  DO ji = 1, jpi-1
+                     ! last level
+                     iku = MIN ( mbathy(ji,jj), mbathy(ji+1,jj  ) ) - 1
+                     ikv = MIN ( mbathy(ji,jj), mbathy(ji  ,jj+1) ) - 1
+                     IF( iku == jk ) THEN
+                        ztu(ji,jj,jk) = zeeu(ji,jj) * gtu(ji,jj)
+                     ENDIF
+                     IF( ikv == jk ) THEN
+                        ztv(ji,jj,jk) = zeev(ji,jj) * gtv(ji,jj)
+                     ENDIF
+                  END DO
+               END DO
+            ENDIF
 
             ! Second derivative (divergence)