Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

Timestamp:

2017-03-03T12:46:59+01:00 (7 years ago)

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -88 +88 @@
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
       !
-      INTEGER :: ji, jj, jk   ! dummy loop index
+      INTEGER ::   jk   ! dummy loop index
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zun, zvn, zwn
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   ztrdt, ztrds   ! 3D workspace
@@ -98 +98 @@
       !
       !                                          ! set time step
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-      DO jk = 1, jpk
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               zun(ji,jj,jk) = 0.0
-               zvn(ji,jj,jk) = 0.0
-               zwn(ji,jj,jk) = 0.0
-            END DO
-         END DO
-      END DO
+      zun(:,:,:) = 0.0
+      zvn(:,:,:) = 0.0
+      zwn(:,:,:) = 0.0
       !    
       IF( neuler == 0 .AND. kt == nit000 ) THEN     ! at nit000
@@ -117 +110 @@
       !                                         !==  effective transport  ==!
       IF( ln_wave .AND. ln_sdw )  THEN
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1                                                       ! eulerian transport + Stokes Drift
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  zun(ji,jj,jk) = e2u(ji,jj) * e3u_n(ji,jj,jk) * ( un(ji,jj,jk) + usd(ji,jj,jk) )
-                  zvn(ji,jj,jk) = e1v(ji,jj) * e3v_n(ji,jj,jk) * ( vn(ji,jj,jk) + vsd(ji,jj,jk) )
-                  zwn(ji,jj,jk) = e1e2t(ji,jj) * ( wn(ji,jj,jk) + wsd(ji,jj,jk) )
-               END DO
-            END DO
+            zun(:,:,jk) = e2u  (:,:) * e3u_n(:,:,jk) * ( un(:,:,jk) + usd(:,:,jk) )
+            zvn(:,:,jk) = e1v  (:,:) * e3v_n(:,:,jk) * ( vn(:,:,jk) + vsd(:,:,jk) )
+            zwn(:,:,jk) = e1e2t(:,:)                 * ( wn(:,:,jk) + wsd(:,:,jk) )
          END DO
       ELSE
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  zun(ji,jj,jk) = e2u  (ji,jj) * e3u_n(ji,jj,jk) * un(ji,jj,jk)    ! eulerian transport only
-                  zvn(ji,jj,jk) = e1v  (ji,jj) * e3v_n(ji,jj,jk) * vn(ji,jj,jk)
-                  zwn(ji,jj,jk) = e1e2t(ji,jj)                   * wn(ji,jj,jk)
-               END DO
-            END DO
+            zun(:,:,jk) = e2u  (:,:) * e3u_n(:,:,jk) * un(:,:,jk)               ! eulerian transport only
+            zvn(:,:,jk) = e1v  (:,:) * e3v_n(:,:,jk) * vn(:,:,jk)
+            zwn(:,:,jk) = e1e2t(:,:)                 * wn(:,:,jk)
          END DO
       ENDIF
       !
       IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN                                ! add z-tilde and/or vvl corrections
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  zun(ji,jj,jk) = zun(ji,jj,jk) + un_td(ji,jj,jk)
-                  zvn(ji,jj,jk) = zvn(ji,jj,jk) + vn_td(ji,jj,jk)
-               END DO
-            END DO
-         END DO
-      ENDIF
-      !
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            zun(ji,jj,jpk) = 0._wp                                              ! no transport trough the bottom
-            zvn(ji,jj,jpk) = 0._wp
-            zwn(ji,jj,jpk) = 0._wp
-         END DO
-      END DO
+         zun(:,:,:) = zun(:,:,:) + un_td(:,:,:)
+         zvn(:,:,:) = zvn(:,:,:) + vn_td(:,:,:)
+      ENDIF
+      !
+      zun(:,:,jpk) = 0._wp                                                      ! no transport trough the bottom
+      zvn(:,:,jpk) = 0._wp
+      zwn(:,:,jpk) = 0._wp
       !
       IF( ln_ldfeiv .AND. .NOT. ln_traldf_triad )   &
@@ -176 +147 @@
       IF( l_trdtra )   THEN                    !* Save ta and sa trends
          CALL wrk_alloc( jpi, jpj, jpk, ztrdt, ztrds )
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ztrdt(ji,jj,jk) = tsa(ji,jj,jk,jp_tem)
-                  ztrds(ji,jj,jk) = tsa(ji,jj,jk,jp_sal)
-               END DO
-            END DO
-         END DO
+         ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
+         ztrds(:,:,:) = tsa(:,:,:,jp_sal)
       ENDIF
       !
@@ -205 +169 @@
       !
       IF( l_trdtra )   THEN                      ! save the advective trends for further diagnostics
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ztrdt(ji,jj,jk) = tsa(ji,jj,jk,jp_tem) - ztrdt(ji,jj,jk)
-                  ztrds(ji,jj,jk) = tsa(ji,jj,jk,jp_sal) - ztrds(ji,jj,jk)
-               END DO
-            END DO
+            ztrdt(:,:,jk) = tsa(:,:,jk,jp_tem) - ztrdt(:,:,jk)
+            ztrds(:,:,jk) = tsa(:,:,jk,jp_sal) - ztrds(:,:,jk)
          END DO
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_totad, ztrdt )