Changeset 589

Timestamp:

2007-01-22T15:01:49+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_002: SM: come back to previous version

File:

• trunk/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/TRA/traldf_bilap.F90

@@ -90 +90 @@
       REAL(wp) ::   zta, zsa              ! temporary scalars
       REAL(wp), DIMENSION(jpi,jpj) ::   & 
-         zeeu, zeev, zbtr                 ! 2D workspace arrays
+         zeeu, zeev, zbtr,              & ! 2D workspace
+         zlt, zls
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   & 
-         zsu, zsv, zlt, zls               ! 3D workspace arrays
+         zsu, zsv                         ! 3D workspace 
       !!----------------------------------------------------------------------
 
@@ -100 +101 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~'
       ENDIF
+
 
       !                                                ! ===============
@@ -160 +162 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               zlt(ji,jj,jk) = zbtr(ji,jj) * (  ztu(ji,jj,jk) - ztu(ji-1,jj,jk) + ztv(ji,jj,jk) - ztv(ji,jj-1,jk)  )
-               zls(ji,jj,jk) = zbtr(ji,jj) * (  zsu(ji,jj,jk) - zsu(ji-1,jj,jk) + zsv(ji,jj,jk) - zsv(ji,jj-1,jk)  )
+               zlt(ji,jj) = zbtr(ji,jj) * (  ztu(ji,jj,jk) - ztu(ji-1,jj,jk) + ztv(ji,jj,jk) - ztv(ji,jj-1,jk)  )
+               zls(ji,jj) = zbtr(ji,jj) * (  zsu(ji,jj,jk) - zsu(ji-1,jj,jk) + zsv(ji,jj,jk) - zsv(ji,jj-1,jk)  )
             END DO
          END DO
@@ -168 +170 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               zlt(ji,jj,jk) = fsahtt(ji,jj,jk) * zlt(ji,jj,jk)
-               zls(ji,jj,jk) = fsahtt(ji,jj,jk) * zls(ji,jj,jk)
-            END DO
-         END DO
-      ENDDO
-
-      ! Lateral boundary conditions on the laplacian (zlt,zls)   (unchanged sgn)
-      CALL lbc_lnk( zlt, 'T', 1. )   ;    CALL lbc_lnk( zls, 'T', 1. )
-
-      DO jk = 1, jpkm1
-      
+               zlt(ji,jj) = fsahtt(ji,jj,jk) * zlt(ji,jj)
+               zls(ji,jj) = fsahtt(ji,jj,jk) * zls(ji,jj)
+            END DO
+         END DO
+
+         ! Lateral boundary conditions on the laplacian (zlt,zls)   (unchanged sgn)
+         CALL lbc_lnk( zlt, 'T', 1. )   ;    CALL lbc_lnk( zls, 'T', 1. )
+
          ! 2. Bilaplacian
          ! --------------
@@ -185 +184 @@
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
-               ztu(ji,jj,jk) = zeeu(ji,jj) * ( zlt(ji+1,jj  ,jk) - zlt(ji,jj,jk) )
-               zsu(ji,jj,jk) = zeeu(ji,jj) * ( zls(ji+1,jj  ,jk) - zls(ji,jj,jk) )
-               ztv(ji,jj,jk) = zeev(ji,jj) * ( zlt(ji  ,jj+1,jk) - zlt(ji,jj,jk) )
-               zsv(ji,jj,jk) = zeev(ji,jj) * ( zls(ji  ,jj+1,jk) - zls(ji,jj,jk) )
+               ztu(ji,jj,jk) = zeeu(ji,jj) * ( zlt(ji+1,jj  ) - zlt(ji,jj) )
+               zsu(ji,jj,jk) = zeeu(ji,jj) * ( zls(ji+1,jj  ) - zls(ji,jj) )
+               ztv(ji,jj,jk) = zeev(ji,jj) * ( zlt(ji  ,jj+1) - zlt(ji,jj) )
+               zsv(ji,jj,jk) = zeev(ji,jj) * ( zls(ji  ,jj+1) - zls(ji,jj) )
             END DO
          END DO