Changeset 1953 for branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/TRP/trczdf_imp.F90

Timestamp:

2010-06-24T17:27:10+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far

File:

• branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/TRP/trczdf_imp.F90 (modified) (1 diff)

branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/TRP/trczdf_imp.F90

@@ -112 +112 @@
          rdttrc(:) =  rdttra(:) * FLOAT(ndttrc)      
       ENDIF
-     !                                                       ! ===========
+
+      ! Initialisation
+      zwd( 1 ,:,:) = 0.e0     ;     zwd(jpi,:,:) = 0.e0
+      zws( 1 ,:,:) = 0.e0     ;     zws(jpi,:,:) = 0.e0
+      zwi( 1 ,:,:) = 0.e0     ;     zwi(jpi,:,:) = 0.e0
+      !                                          
+      ! 0. Matrix construction 
+      ! ----------------------
+
+      ! Diagonal, inferior, superior
+      ! (including the bottom boundary condition via avs masked
+      DO jk = 1, jpkm1                    
+         DO jj = 2, jpjm1                                    
+            DO ji = fs_2, fs_jpim1   ! vector opt.
+               zwi(ji,jj,jk) = - rdttrc(jk) * fstravs(ji,jj,jk  ) /( fse3t(ji,jj,jk) * fse3w(ji,jj,jk  ) )
+               zws(ji,jj,jk) = - rdttrc(jk) * fstravs(ji,jj,jk+1) /( fse3t(ji,jj,jk) * fse3w(ji,jj,jk+1) )
+               zwd(ji,jj,jk) = 1. - zwi(ji,jj,jk) - zws(ji,jj,jk)
+            END DO
+         END DO
+      END DO
+
+      ! Surface boudary conditions
+      DO jj = 2, jpjm1        
+         DO ji = fs_2, fs_jpim1
+            zwi(ji,jj,1) = 0.e0
+            zwd(ji,jj,1) = 1. - zws(ji,jj,1) 
+         END DO
+      END DO
+
+      !                                                       ! ===========
       DO jn = 1, jptra                                        ! tracer loop
          !                                                    ! ===========
          IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn)         ! ??? validation needed
 
-    ! Initialisation     
-    zwd( 1 ,:,:) = 0.e0     ;     zwd(jpi,:,:) = 0.e0
-    zws( 1 ,:,:) = 0.e0     ;     zws(jpi,:,:) = 0.e0
-    zwi( 1 ,:,:) = 0.e0     ;     zwi(jpi,:,:) = 0.e0
     zwt( 1 ,:,:) = 0.e0     ;     zwt(jpi,:,:) = 0.e0     
          zwt(  :,:,1) = 0.e0     ;     zwt(  :,:,jpk) = 0.e0
-         !                                          
-         ! 0. Matrix construction
-         ! ----------------------
-
-         ! Diagonal, inferior, superior
-         ! (including the bottom boundary condition via avs masked
-         DO jk = 1, jpkm1                                                     
-            DO jj = 2, jpjm1                                      
-               DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zwi(ji,jj,jk) = - rdttrc(jk) * fstravs(ji,jj,jk  ) /( fse3t(ji,jj,jk) * fse3w(ji,jj,jk  ) )
-                  zws(ji,jj,jk) = - rdttrc(jk) * fstravs(ji,jj,jk+1) /( fse3t(ji,jj,jk) * fse3w(ji,jj,jk+1) )
-                  zwd(ji,jj,jk) = 1. - zwi(ji,jj,jk) - zws(ji,jj,jk)
-               END DO
-            END DO
-         END DO
-
-         ! Surface boudary conditions
-         DO jj = 2, jpjm1        
-            DO ji = fs_2, fs_jpim1
-               zwi(ji,jj,1) = 0.e0
-               zwd(ji,jj,1) = 1. - zws(ji,jj,1)
-            END DO
-         END DO
          
          ! Second member construction