Changeset 1529 for trunk/NEMO/LIM_SRC_3/limadv.F90

Timestamp:

2009-07-23T17:33:22+02:00 (15 years ago)

Author:

ctlod

Message:

synchronize loops in advection modules of LIM2.0 and LIM3.0, see ticket: #487

File:

• trunk/NEMO/LIM_SRC_3/limadv.F90 (modified) (5 diffs)

trunk/NEMO/LIM_SRC_3/limadv.F90

@@ -114 +114 @@
       !  Calculate fluxes and moments between boxes i<-->i+1              
       DO jj = 1, jpj                      !  Flux from i to i+1 WHEN u GT 0 
-         !i bug   DO ji = 1, jpim1 
-         !i    DO jj = 1, jpj                      !  Flux from i to i+1 WHEN u GT 0 
          DO ji = 1, jpi
             zbet(ji,jj)  =  MAX( rzero, SIGN( rone, put(ji,jj) ) )
@@ -142 +140 @@
 
       DO jj = 1, jpjm1                      !  Flux from i+1 to i when u LT 0.
-         !i    DO jj = 1, fs_jpjm1                   !  Flux from i+1 to i when u LT 0.
          DO ji = 1, fs_jpim1
             zalf          = MAX( rzero, -put(ji,jj) ) * zrdt * e2u(ji,jj) / psm(ji+1,jj) 
@@ -162 +159 @@
 
       DO jj = 2, jpjm1                     !  Readjust moments remaining in the box. 
-         DO ji = fs_2, jpi
+         DO ji = fs_2, fs_jpim1
             zbt  =       zbet(ji-1,jj)
             zbt1 = 1.0 - zbet(ji-1,jj)
@@ -306 +303 @@
 
       !  Calculate fluxes and moments between boxes j<-->j+1              
-      !!bug  DO jj = 2, jpjm1
       DO jj = 1, jpj
          DO ji = 1, jpi
-            !!bug     DO ji = 1, jpim1
             !  Flux from j to j+1 WHEN v GT 0   
             zbet(ji,jj)  =  MAX( rzero, SIGN( rone, pvt(ji,jj) ) )
@@ -337 +332 @@
       DO jj = 1, jpjm1                   !  Flux from j+1 to j when v LT 0.
          DO ji = 1, jpi
-            !i     DO jj = 1, jpjm1                   !  Flux from j+1 to j when v LT 0.
-            !i        DO ji = 2, jpim1
             zalf          = ( MAX(rzero, -pvt(ji,jj) ) * zrdt * e1v(ji,jj) ) / psm(ji,jj+1) 
             zalg  (ji,jj) = zalf