Changeset 4985 for branches/2014

Timestamp:

2014-12-12T19:43:51+01:00 (9 years ago)

Author:

mathiot

Message:

add initialisation + rm useless IF

File:

• branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) (4 diffs)

branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90

@@ -113 +113 @@
       !
       pgtu(:,:,:)=0.0_wp ; pgtv(:,:,:)=0.0_wp ;
+      sgtu(:,:,:)=0.0_wp ; sgtv(:,:,:)=0.0_wp ;
+      zti (:,:,:)=0.0_wp ; ztj (:,:,:)=0.0_wp ;
+      zhi (:,:  )=0.0_wp ; zhj (:,:  )=0.0_wp ;
       !
       DO jn = 1, kjpt      !==   Interpolation of tracers at the last ocean level   ==!
@@ -128 +131 @@
                !
                ! i- direction
-               IF (iku .GT. 1) THEN
-                  IF( ze3wu >= 0._wp ) THEN      ! case 1
-                     zmaxu =  ze3wu / fse3w(ji+1,jj,iku)
-                     ! interpolated values of tracers
-                     zti (ji,jj,jn) = pta(ji+1,jj,iku,jn) + zmaxu * ( pta(ji+1,jj,ikum1,jn) - pta(ji+1,jj,iku,jn) )
-                     ! gradient of  tracers
-                     pgtu(ji,jj,jn) = umask(ji,jj,iku) * ( zti(ji,jj,jn) - pta(ji,jj,iku,jn) )
-                  ELSE                           ! case 2
-                     zmaxu = -ze3wu / fse3w(ji,jj,iku)
-                     ! interpolated values of tracers
-                     zti (ji,jj,jn) = pta(ji,jj,iku,jn) + zmaxu * ( pta(ji,jj,ikum1,jn) - pta(ji,jj,iku,jn) )
-                     ! gradient of tracers
-                     pgtu(ji,jj,jn) = umask(ji,jj,iku) * ( pta(ji+1,jj,iku,jn) - zti(ji,jj,jn) )
-                  ENDIF
+               IF( ze3wu >= 0._wp ) THEN      ! case 1
+                  zmaxu =  ze3wu / fse3w(ji+1,jj,iku)
+                  ! interpolated values of tracers
+                  zti (ji,jj,jn) = pta(ji+1,jj,iku,jn) + zmaxu * ( pta(ji+1,jj,ikum1,jn) - pta(ji+1,jj,iku,jn) )
+                  ! gradient of  tracers
+                  pgtu(ji,jj,jn) = umask(ji,jj,iku) * ( zti(ji,jj,jn) - pta(ji,jj,iku,jn) )
+               ELSE                           ! case 2
+                  zmaxu = -ze3wu / fse3w(ji,jj,iku)
+                  ! interpolated values of tracers
+                  zti (ji,jj,jn) = pta(ji,jj,iku,jn) + zmaxu * ( pta(ji,jj,ikum1,jn) - pta(ji,jj,iku,jn) )
+                  ! gradient of tracers
+                  pgtu(ji,jj,jn) = umask(ji,jj,iku) * ( pta(ji+1,jj,iku,jn) - zti(ji,jj,jn) )
                ENDIF
                !
                ! j- direction
-               IF (ikv .GT. 1) THEN
-                  IF( ze3wv >= 0._wp ) THEN      ! case 1
-                     zmaxv =  ze3wv / fse3w(ji,jj+1,ikv)
-                     ! interpolated values of tracers
-                     ztj (ji,jj,jn) = pta(ji,jj+1,ikv,jn) + zmaxv * ( pta(ji,jj+1,ikvm1,jn) - pta(ji,jj+1,ikv,jn) )
-                     ! gradient of tracers
-                     pgtv(ji,jj,jn) = vmask(ji,jj,ikv) * ( ztj(ji,jj,jn) - pta(ji,jj,ikv,jn) )
-                  ELSE                           ! case 2
-                     zmaxv =  -ze3wv / fse3w(ji,jj,ikv)
-                     ! interpolated values of tracers
-                     ztj (ji,jj,jn) = pta(ji,jj,ikv,jn) + zmaxv * ( pta(ji,jj,ikvm1,jn) - pta(ji,jj,ikv,jn) )
-                     ! gradient of tracers
-                     pgtv(ji,jj,jn) = vmask(ji,jj,ikv) * ( pta(ji,jj+1,ikv,jn) - ztj(ji,jj,jn) )
-                  ENDIF
-              ENDIF
+               IF( ze3wv >= 0._wp ) THEN      ! case 1
+                  zmaxv =  ze3wv / fse3w(ji,jj+1,ikv)
+                  ! interpolated values of tracers
+                  ztj (ji,jj,jn) = pta(ji,jj+1,ikv,jn) + zmaxv * ( pta(ji,jj+1,ikvm1,jn) - pta(ji,jj+1,ikv,jn) )
+                  ! gradient of tracers
+                  pgtv(ji,jj,jn) = vmask(ji,jj,ikv) * ( ztj(ji,jj,jn) - pta(ji,jj,ikv,jn) )
+               ELSE                           ! case 2
+                  zmaxv =  -ze3wv / fse3w(ji,jj,ikv)
+                  ! interpolated values of tracers
+                  ztj (ji,jj,jn) = pta(ji,jj,ikv,jn) + zmaxv * ( pta(ji,jj,ikvm1,jn) - pta(ji,jj,ikv,jn) )
+                  ! gradient of tracers
+                  pgtv(ji,jj,jn) = vmask(ji,jj,ikv) * ( pta(ji,jj+1,ikv,jn) - ztj(ji,jj,jn) )
+               ENDIF
             END DO
          END DO
@@ -168 +167 @@
       ! horizontal derivative of density anomalies (rd)
       IF( PRESENT( prd ) ) THEN         ! depth of the partial step level
-         pgru(:,:)=0.0_wp ; pgrv(:,:)=0.0_wp 
+         pgru(:,:)=0.0_wp   ; pgrv(:,:)=0.0_wp ; 
+         pgzu(:,:)=0.0_wp   ; pgzv(:,:)=0.0_wp ;
+         pmru(:,:)=0.0_wp   ; pmru(:,:)=0.0_wp ;
+         pge3ru(:,:)=0.0_wp ; pge3rv(:,:)=0.0_wp ;
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
@@ -285 +287 @@
       ! horizontal derivative of density anomalies (rd)
       IF( PRESENT( prd ) ) THEN         ! depth of the partial step level
+         sgru(:,:)  =0.0_wp ; sgrv(:,:)  =0.0_wp ;
+         sgzu(:,:)  =0.0_wp ; sgzv(:,:)  =0.0_wp ;
+         smru(:,:)  =0.0_wp ; smru(:,:)  =0.0_wp ;
+         sge3ru(:,:)=0.0_wp ; sge3rv(:,:)=0.0_wp ;
+
          DO jj = 1, jpjm1
             DO ji = 1, jpim1