Changeset 3862 for branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

Timestamp:

2013-04-08T13:07:43+02:00 (11 years ago)

Author:

acc

Message:

Branch 2013/dev_r3858_NOC_ZTC #863. Change names of gdept_0, gdepw_0, e3t_0, e3w_0 to gdept_1d, gdepw_1d, e3t_1d, e3w_1d respectively in preparation for the introduction of time invariant 3d arrays using the _0 suffix

File:

• branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) (2 diffs)

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -195 +195 @@
                      DO jk = 1, jpk                        ! determines the intepolated T-S profiles at each (i,j) points
                         zl = fsdept_0(ji,jj,jk)
-                        IF(     zl < gdept_0(1  ) ) THEN          ! above the first level of data
+                        IF(     zl < gdept_1d(1  ) ) THEN         ! above the first level of data
                            ztp(jk) =  ptrc(ji,jj,1    ,jn)
-                        ELSEIF( zl > gdept_0(jpk) ) THEN          ! below the last level of data
+                        ELSEIF( zl > gdept_1d(jpk) ) THEN         ! below the last level of data
                            ztp(jk) =  ptrc(ji,jj,jpkm1,jn)
                         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))
                                  ztp(jk) = ptrc(ji,jj,jkk,jn) + ( ptrc(ji,jj,jkk+1,jn) - ptrc(ji,jj,jkk,jn) ) * zi 
                               ENDIF
@@ -226 +226 @@
                         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) - fsdept_0(ji,jj,ik) ) / ( gdept_1d(ik) - gdept_1d(ik-1) )
                            ptrc(ji,jj,ik,jn) = (1.-zl) * ptrc(ji,jj,ik,jn) + zl * ptrc(ji,jj,ik-1,jn)
                         ENDIF