Changeset 7525 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.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/dynnxt.F90 (modified) (7 diffs)

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

@@ -132 +132 @@
             END DO
          END DO
-!$OMP DO schedule(static) private(jk)
+!$OMP DO schedule(static) private(jk,jj,ji)
          DO jk = 1, jpkm1
-            ua(:,:,jk) = ( ua(:,:,jk) - zue(:,:) * r1_hu_a(:,:) + ua_b(:,:) ) * umask(:,:,jk)
-            va(:,:,jk) = ( va(:,:,jk) - zve(:,:) * r1_hv_a(:,:) + va_b(:,:) ) * vmask(:,:,jk)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  ua(ji,jj,jk) = ( ua(ji,jj,jk) - zue(ji,jj) * r1_hu_a(ji,jj) + ua_b(ji,jj) ) * umask(ji,jj,jk)
+                  va(ji,jj,jk) = ( va(ji,jj,jk) - zve(ji,jj) * r1_hv_a(ji,jj) + va_b(ji,jj) ) * vmask(ji,jj,jk)
+               END DO
+            END DO
          END DO
 !$OMP END DO NOWAIT
@@ -145 +149 @@
             ! In the forward case, this is done below after asselin filtering   
             ! so that asselin contribution is removed at the same time 
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
             DO jk = 1, jpkm1
-               un(:,:,jk) = ( un(:,:,jk) - un_adv(:,:) + un_b(:,:) )*umask(:,:,jk)
-               vn(:,:,jk) = ( vn(:,:,jk) - vn_adv(:,:) + vn_b(:,:) )*vmask(:,:,jk)
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     un(ji,jj,jk) = ( un(ji,jj,jk) - un_adv(ji,jj) + un_b(ji,jj) )*umask(ji,jj,jk)
+                     vn(ji,jj,jk) = ( vn(ji,jj,jk) - vn_adv(ji,jj) + vn_b(ji,jj) )*vmask(ji,jj,jk)
+                  END DO
+               END DO
             END DO  
          ENDIF
@@ -198 +206 @@
                   zua(ji,jj,jk) = un(ji,jj,jk)             ! save the now velocity before the asselin filter
                   zva(ji,jj,jk) = vn(ji,jj,jk)             ! (caution: there will be a shift by 1 timestep in the
-               END DO
-            END DO
-         END DO
-         !                                  !  computation of the asselin filter trends)
+                                                           !  computation of the asselin filter trends)
+               END DO
+            END DO
+         END DO
       ENDIF
 
@@ -208 +216 @@
       IF( neuler == 0 .AND. kt == nit000 ) THEN        !* Euler at first time-step: only swap
 !$OMP PARALLEL
-!$OMP DO schedule(static) private(jk)
+!$OMP DO schedule(static) private(jk,jj,ji)
          DO jk = 1, jpkm1
-            un(:,:,jk) = ua(:,:,jk)                          ! un <-- ua
-            vn(:,:,jk) = va(:,:,jk)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  un(ji,jj,jk) = ua(ji,jj,jk)                          ! un <-- ua
+                  vn(ji,jj,jk) = va(ji,jj,jk)
+               END DO
+            END DO
          END DO
 !$OMP END DO NOWAIT
          IF(.NOT.ln_linssh ) THEN
-!$OMP DO schedule(static) private(jk)
+!$OMP DO schedule(static) private(jk,jj,ji)
             DO jk = 1, jpkm1
-               e3t_b(:,:,jk) = e3t_n(:,:,jk)
-               e3u_b(:,:,jk) = e3u_n(:,:,jk)
-               e3v_b(:,:,jk) = e3v_n(:,:,jk)
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     e3t_b(ji,jj,jk) = e3t_n(ji,jj,jk)
+                     e3u_b(ji,jj,jk) = e3u_n(ji,jj,jk)
+                     e3v_b(ji,jj,jk) = e3v_n(ji,jj,jk)
+                  END DO
+               END DO
             END DO
 !$OMP END DO NOWAIT
@@ -256 +272 @@
                END DO
             ELSE
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
                DO jk = 1, jpkm1
-                  e3t_b(:,:,jk) = e3t_n(:,:,jk) + atfp * ( e3t_b(:,:,jk) - 2._wp * e3t_n(:,:,jk) + e3t_a(:,:,jk) )
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi    
+                        e3t_b(ji,jj,jk) = e3t_n(ji,jj,jk) + atfp * ( e3t_b(ji,jj,jk) - 2._wp * e3t_n(ji,jj,jk) + e3t_a(ji,jj,jk) )
+                     END DO
+                  END DO
                END DO
                ! Add volume filter correction: compatibility with tracer advection scheme
@@ -365 +385 @@
                END DO
             END DO
-!$OMP DO schedule(static) private(jk)
+!$OMP DO schedule(static) private(jk,jj,ji)
             DO jk = 1, jpkm1
-               ub(:,:,jk) = ub(:,:,jk) - (zue(:,:) * r1_hu_n(:,:) - un_b(:,:)) * umask(:,:,jk)
-               vb(:,:,jk) = vb(:,:,jk) - (zve(:,:) * r1_hv_n(:,:) - vn_b(:,:)) * vmask(:,:,jk)
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     ub(ji,jj,jk) = ub(ji,jj,jk) - (zue(ji,jj) * r1_hu_n(ji,jj) - un_b(ji,jj)) * umask(ji,jj,jk)
+                     vb(ji,jj,jk) = vb(ji,jj,jk) - (zve(ji,jj) * r1_hv_n(ji,jj) - vn_b(ji,jj)) * vmask(ji,jj,jk)
+                  END DO
+               END DO
             END DO
 !$OMP END DO NOWAIT
@@ -446 +470 @@
       ENDIF
       IF( l_trddyn ) THEN                ! 3D output: asselin filter trends on momentum
-!$OMP DO schedule(static) private(jk, jj, ji)
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1
             DO jj = 1, jpj