Changeset 4294 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90

Timestamp:

2013-11-20T18:04:09+01:00 (10 years ago)

Author:

cetlod

Message:

dev_MERGE_2013 : changes to improve compilation

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90 (modified) (2 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90

@@ -174 +174 @@
             DO ji = 1, jpi                ! determines the interpolated U & V current profiles at each (i,j) point
                DO jk = 1, jpk
-                  zl = fsdept_0(ji,jj,jk)
-                  IF    ( zl < gdept_0(1  ) ) THEN          ! extrapolate above the first level of data
+                  zl = fsdept(ji,jj,jk)
+                  IF    ( zl < gdept_1d(1  ) ) THEN          ! extrapolate above the first level of data
                      zup(jk) =  puvd(ji,jj,1    ,1)
                      zvp(jk) =  puvd(ji,jj,1    ,2)
-                  ELSEIF( zl > gdept_0(jpk) ) THEN          ! extrapolate below the last level of data
+                  ELSEIF( zl > gdept_1d(jpk) ) THEN          ! extrapolate below the last level of data
                      zup(jk) =  puvd(ji,jj,jpkm1,1)
                      zvp(jk) =  puvd(ji,jj,jpkm1,2)
                   ELSE                                      ! inbetween : vertical interpolation between jkk & jkk+1
                      DO jkk = 1, jpkm1                      ! when  gdept(jkk) < zl < gdept(jkk+1)
-                        IF( (zl-gdept_0(jkk)) * (zl-gdept_0(jkk+1)) <= 0._wp ) THEN
-                           zi = ( zl - gdept_0(jkk) ) / (gdept_0(jkk+1)-gdept_0(jkk))
+                        IF( (zl-gdept_1d(jkk)) * (zl-gdept_1d(jkk+1)) <= 0._wp ) THEN
+                           zi = ( zl - gdept_1d(jkk) ) / (gdept_1d(jkk+1)-gdept_1d(jkk))
                            zup(jk) = puvd(ji,jj,jkk,1) + ( puvd(ji,jj,jkk+1,1 ) - puvd(ji,jj,jkk,1) ) * zi 
                            zvp(jk) = puvd(ji,jj,jkk,2) + ( puvd(ji,jj,jkk+1,2 ) - puvd(ji,jj,jkk,2) ) * zi
@@ -212 +212 @@
                   ik = mbkt(ji,jj) 
                   IF( ik > 1 ) THEN
-                     zl = ( gdept_0(ik) - fsdept_0(ji,jj,ik) ) / ( gdept_0(ik) - gdept_0(ik-1) )
+                     zl = ( gdept_1d(ik) - gdept_0(ji,jj,ik) ) / ( gdept_1d(ik) - gdept_1d(ik-1) )
                      puvd(ji,jj,ik,1) = (1.-zl) * puvd(ji,jj,ik,1) + zl * puvd(ji,jj,ik-1,1)
                      puvd(ji,jj,ik,2) = (1.-zl) * puvd(ji,jj,ik,2) + zl * puvd(ji,jj,ik-1,2)