Changeset 7753 for trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

Timestamp:

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

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -61 +61 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.7 , NEMO Consortium (2015)
-   !! $Id$
+   !! $Id$ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -76 +76 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
-      INTEGER ::   jk, jj, ji   ! dummy loop index
+      INTEGER ::   jk   ! dummy loop index
       CHARACTER (len=22) ::   charout
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zun, zvn, zwn  ! effective velocity
@@ -86 +86 @@
       !                                               !==  effective transport  ==!
       IF( l_offline ) THEN
-!$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) = un(ji,jj,jk)     ! effective transport already in un/vn/wn
-                  zvn(ji,jj,jk) = vn(ji,jj,jk)
-                  zwn(ji,jj,jk) = wn(ji,jj,jk)
-               END DO
-            END DO
-         END DO
+         zun(:,:,:) = un(:,:,:)     ! effective transport already in un/vn/wn
+         zvn(:,:,:) = vn(:,:,:)
+         zwn(:,:,:) = wn(:,:,:)
       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
-                  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
+            zvn(:,:,jk) = e1v  (:,:) * e3v_n(:,:,jk) * vn(:,:,jk)
+            zwn(:,:,jk) = e1e2t(:,:)                 * wn(:,:,jk)
          END DO
          !
          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
+            zun(:,:,:) = zun(:,:,:) + un_td(:,:,:)
+            zvn(:,:,:) = zvn(:,:,:) + vn_td(:,:,:)
          ENDIF
          !
@@ -126 +107 @@
          IF( ln_mle    )   CALL tra_adv_mle( kt, nittrc000, zun, zvn, zwn, 'TRC' )  ! add the mle transport
          !
-!$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(:,:,jpk) = 0._wp                                                       ! no transport trough the bottom
+         zvn(:,:,jpk) = 0._wp
+         zwn(:,:,jpk) = 0._wp
          !
       ENDIF