Changeset 7525 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2017-01-04T17:47:47+01:00 (7 years ago)

Author:

mocavero

Message:

changes after review

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (7 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -105 +105 @@
       DO jk = 1, jpkm1                                 ! Horizontal divergence of barotropic transports
 !$OMP DO schedule(static) private(jj, ji)
-            DO jj = 1, jpj
-               DO ji = 1, jpi   ! vector opt.
-                  zhdiv(ji,jj) = zhdiv(ji,jj) + e3t_n(ji,jj,jk) * hdivn(ji,jj,jk)
-               END DO
-            END DO           
+         DO jj = 1, jpj
+            DO ji = 1, jpi   ! vector opt.
+               zhdiv(ji,jj) = zhdiv(ji,jj) + e3t_n(ji,jj,jk) * hdivn(ji,jj,jk)
+            END DO
+         END DO           
       END DO
 !$OMP END PARALLEL
@@ -120 +120 @@
       IF(ln_wd) CALL wad_lmt(sshb, zcoef * (emp_b(:,:) + emp(:,:)), z2dt)
 !$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            ssha(ji,jj) = (  sshb(ji,jj) - z2dt * ( zcoef * ( emp_b(ji,jj) + emp(ji,jj) ) + zhdiv(ji,jj) )  ) * ssmask(ji,jj)
-         END DO
-      END DO           
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               ssha(ji,jj) = (  sshb(ji,jj) - z2dt * ( zcoef * ( emp_b(ji,jj) + emp(ji,jj) ) + zhdiv(ji,jj) )  ) * ssmask(ji,jj)
+            END DO
+         END DO           
       IF ( .NOT.ln_dynspg_ts ) THEN
          ! These lines are not necessary with time splitting since
@@ -143 +143 @@
          CALL ssh_asm_inc( kt )
 !$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            ssha(ji,jj) = ssha(ji,jj) + z2dt * ssh_iau(ji,jj)
-         END DO
-      END DO           
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               ssha(ji,jj) = ssha(ji,jj) + z2dt * ssh_iau(ji,jj)
+            END DO
+         END DO           
       ENDIF
 #endif
@@ -193 +193 @@
          IF(lwp) WRITE(numout,*) '~~~~~ '
          !
-         wn(ji,jj,jpk) = 0._wp                  ! bottom boundary condition: w=0 (set once for all)
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               wn(ji,jj,jpk) = 0._wp                  ! bottom boundary condition: w=0 (set once for all)
+            END DO
+         END DO 
       ENDIF
       !                                           !------------------------------!
@@ -221 +226 @@
             DO jj = 1, jpj
                DO ji = 1, jpi   ! vector opt.
-            wn(ji,jj,jk) = wn(ji,jj,jk+1) - ( e3t_n(ji,jj,jk) * hdivn(ji,jj,jk) + zhdiv(ji,jj,jk)    &
-               &                         + z1_2dt * ( e3t_a(ji,jj,jk) - e3t_b(ji,jj,jk) )     ) * tmask(ji,jj,jk)
+                  wn(ji,jj,jk) = wn(ji,jj,jk+1) - ( e3t_n(ji,jj,jk) * hdivn(ji,jj,jk) + zhdiv(ji,jj,jk)    &
+                  &                         + z1_2dt * ( e3t_a(ji,jj,jk) - e3t_b(ji,jj,jk) )     ) * tmask(ji,jj,jk)
                END DO
             END DO
@@ -233 +238 @@
             DO jj = 1, jpj
                DO ji = 1, jpi   ! vector opt.
-            ! computation of w
-            wn(ji,jj,jk) = wn(ji,jj,jk+1) - (  e3t_n(ji,jj,jk) * hdivn(ji,jj,jk)                 &
-               &                         + z1_2dt * ( e3t_a(ji,jj,jk) - e3t_b(ji,jj,jk) )  ) * tmask(ji,jj,jk)
+                  ! computation of w
+                  wn(ji,jj,jk) = wn(ji,jj,jk+1) - (  e3t_n(ji,jj,jk) * hdivn(ji,jj,jk)                 &
+                  &                         + z1_2dt * ( e3t_a(ji,jj,jk) - e3t_b(ji,jj,jk) )  ) * tmask(ji,jj,jk)
                 END DO
             END DO
@@ -291 +296 @@
          & ( ln_bt_fw    .AND. ln_dynspg_ts )      ) THEN 
 !$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            sshb(ji,jj) = sshn(ji,jj)                              ! before <-- now
-            sshn(ji,jj) = ssha(ji,jj)                              ! now    <-- after  (before already = now)
-         END DO
-      END DO           
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               sshb(ji,jj) = sshn(ji,jj)                              ! before <-- now
+               sshn(ji,jj) = ssha(ji,jj)                              ! now    <-- after  (before already = now)
+            END DO
+         END DO           
          !
       ELSE           !==  Leap-Frog time-stepping: Asselin filter + swap  ==!