Changeset 642 for trunk/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2007-03-15T12:17:58+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_028 : CT : correction to be able to compile without compilation stop when using key_zco cpp key

File:

• trunk/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -86 +86 @@
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       !!
-      INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp) ::   zt, zs       ! temporary scalars
-      REAL(wp) ::   zfact        ! temporary scalar
+      INTEGER  ::   ji, jj, jk    ! dummy loop indices
+      REAL(wp) ::   zt, zs, zssh1 ! temporary scalars
+      REAL(wp) ::   zfact         ! temporary scalar
       !! Variable volume
-      REAL(wp) ::   zssh                         ! temporary scalars
+      REAL(wp), DIMENSION(jpi,jpj) ::   zssh                         ! temporary scalars
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: zfse3tb, zfse3tn, zfse3ta  ! 3D workspace
 
@@ -100 +100 @@
          ! Scale factors at before and after time step
          ! -------------------------------------------
-         DO jk = 1, jpkm1
-            zfse3tb(:,:,jk)  = fsve3t(:,:,jk) * ( 1 + sshb(:,:) * mut(:,:,jk) )
-            zfse3ta(:,:,jk)  = fsve3t(:,:,jk) * ( 1 + ssha(:,:) * mut(:,:,jk) )
-         END DO
+         zfse3tb(:,:,:) = sfe3( sshb, 'T' )    ;    zfse3ta(:,:,:) = sfe3( ssha, 'T' )
 
          ! Asselin filtered scale factor at now time step
          ! ----------------------------------------------
          IF( (neuler == 0 .AND. kt == nit000) .OR. lk_dynspg_ts ) THEN
-            zfse3tn(:,:,:) = fse3t(:,:,:)
+            zfse3tn(:,:,:) = sfe3ini( 'T' )
          ELSE
-            DO jk = 1, jpkm1
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     zssh = atfp * ( sshb(ji,jj) + ssha(ji,jj) ) + atfp1 * sshn(ji,jj)
-                     zfse3tn(ji,jj,jk) = fsve3t(ji,jj,jk) * ( 1 + zssh * mut(ji,jj,jk) )
-                  END DO
+            zssh(:,:) = atfp * ( sshb(:,:) + ssha(:,:) ) + atfp1 * sshn(:,:)
+            zfse3tn(:,:,:) = sfe3( zssh, 'T' )
+         ENDIF
+
+         ! Thickness weighting
+         ! -------------------
+         DO jk = 1, jpkm1
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  ta(ji,jj,jk) = ta(ji,jj,jk) * fse3t(ji,jj,jk)
+                  sa(ji,jj,jk) = sa(ji,jj,jk) * fse3t(ji,jj,jk)
+
+                  tn(ji,jj,jk) = tn(ji,jj,jk) * fse3t(ji,jj,jk)
+                  sn(ji,jj,jk) = sn(ji,jj,jk) * fse3t(ji,jj,jk)
+
+                  tb(ji,jj,jk) = tb(ji,jj,jk) * zfse3tb(ji,jj,jk)
+                  sb(ji,jj,jk) = sb(ji,jj,jk) * zfse3tb(ji,jj,jk)
                END DO
             END DO
-         ENDIF
-
-         ! Thickness weighting
-         ! -------------------
-         ta(:,:,1:jpkm1) = ta(:,:,1:jpkm1) * fse3t (:,:,1:jpkm1)
-         sa(:,:,1:jpkm1) = sa(:,:,1:jpkm1) * fse3t (:,:,1:jpkm1)
-
-         tn(:,:,1:jpkm1) = tn(:,:,1:jpkm1) * fse3t (:,:,1:jpkm1)
-         sn(:,:,1:jpkm1) = sn(:,:,1:jpkm1) * fse3t (:,:,1:jpkm1)
-
-         tb(:,:,1:jpkm1) = tb(:,:,1:jpkm1) * zfse3tb(:,:,1:jpkm1)
-         sb(:,:,1:jpkm1) = sb(:,:,1:jpkm1) * zfse3tb(:,:,1:jpkm1)
+         END DO
 
       ENDIF
@@ -221 +218 @@
                   DO jj = 1, jpj
                      DO ji = 1, jpi
-                        zssh = tmask(ji,jj,jk) / fse3t(ji,jj,jk)
-                        tb(ji,jj,jk) = tn(ji,jj,jk) * zssh * tmask(ji,jj,jk)
-                        sb(ji,jj,jk) = sn(ji,jj,jk) * zssh * tmask(ji,jj,jk)
-                        zssh = tmask(ji,jj,jk) / zfse3ta(ji,jj,jk)
-                        tn(ji,jj,jk) = ta(ji,jj,jk) * zssh * tmask(ji,jj,jk)
-                        sn(ji,jj,jk) = sa(ji,jj,jk) * zssh * tmask(ji,jj,jk)
+                        zssh1 = tmask(ji,jj,jk) / fse3t(ji,jj,jk)
+                        tb(ji,jj,jk) = tn(ji,jj,jk) * zssh1 * tmask(ji,jj,jk)
+                        sb(ji,jj,jk) = sn(ji,jj,jk) * zssh1 * tmask(ji,jj,jk)
+                        zssh1 = tmask(ji,jj,jk) / zfse3ta(ji,jj,jk)
+                        tn(ji,jj,jk) = ta(ji,jj,jk) * zssh1 * tmask(ji,jj,jk)
+                        sn(ji,jj,jk) = sa(ji,jj,jk) * zssh1 * tmask(ji,jj,jk)
                      END DO
                   END DO
@@ -255 +252 @@
                   DO jj = 1, jpj
                      DO ji = 1, jpi
-                        zssh = tmask(ji,jj,jk) / zfse3tn(ji,jj,jk)
+                        zssh1 = tmask(ji,jj,jk) / zfse3tn(ji,jj,jk)
                         tb(ji,jj,jk) = ( atfp  * ( tb(ji,jj,jk) + ta(ji,jj,jk) ) &
-                          &            + atfp1 * tn(ji,jj,jk) ) * zssh
+                          &            + atfp1 * tn(ji,jj,jk) ) * zssh1
                         sb(ji,jj,jk) = ( atfp  * ( sb(ji,jj,jk) + sa(ji,jj,jk) ) &
-                          &            + atfp1 * sn(ji,jj,jk) ) * zssh
-                        zssh = tmask(ji,jj,1) / zfse3ta(ji,jj,jk)
-                        tn(ji,jj,jk) = ta(ji,jj,jk) * zssh
-                        sn(ji,jj,jk) = sa(ji,jj,jk) * zssh
+                          &            + atfp1 * sn(ji,jj,jk) ) * zssh1
+                        zssh1 = tmask(ji,jj,1) / zfse3ta(ji,jj,jk)
+                        tn(ji,jj,jk) = ta(ji,jj,jk) * zssh1
+                        sn(ji,jj,jk) = sa(ji,jj,jk) * zssh1
                      END DO
                   END DO