Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.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/zpshde.F90 (modified) (3 diffs)

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

@@ -101 +101 @@
       IF( nn_timing == 1 )   CALL timing_start( 'zps_hde')
       !
-      DO jn = 1, kjpt
-!$OMP PARALLEL DO schedule(static) private(jj,ji)
-         DO jj = 1, jpjm1
-            DO ji = 1, jpim1
-               pgtu(ji,jj,jn)=0._wp   ;   zti (ji,jj,jn)=0._wp
-               pgtv(ji,jj,jn)=0._wp   ;   ztj (ji,jj,jn)=0._wp
-            END DO
-         END DO
-      END DO
-!$OMP PARALLEL DO schedule(static) private(jj,ji)
-      DO jj = 1, jpjm1
-         DO ji = 1, jpim1
-            zhi (ji,jj  )=0._wp
-            zhj (ji,jj  )=0._wp
-         END DO
-       END DO
+      pgtu(:,:,:)=0._wp   ;   zti (:,:,:)=0._wp   ;   zhi (:,:  )=0._wp
+      pgtv(:,:,:)=0._wp   ;   ztj (:,:,:)=0._wp   ;   zhj (:,:  )=0._wp
       !
       DO jn = 1, kjpt      !==   Interpolation of tracers at the last ocean level   ==!
          !
-!$OMP PARALLEL DO schedule(static) private(jj,ji,iku,ikv,ze3wu,ze3wv,zmaxu,zmaxv)
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
@@ -165 +150 @@
       !                
       IF( PRESENT( prd ) ) THEN    !==  horizontal derivative of density anomalies (rd)  ==!    (optional part)
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj,ji)
-         DO jj = 1, jpjm1
-            DO ji = 1, jpim1
-               pgru(ji,jj) = 0._wp
-               pgrv(ji,jj) = 0._wp                ! depth of the partial step level
-            END DO
-         END DO
-!$OMP END DO NOWAIT
-!$OMP DO schedule(static) private(jj,ji,iku,ikv,ze3wu,ze3wv)
+         pgru(:,:) = 0._wp
+         pgrv(:,:) = 0._wp                ! depth of the partial step level
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
@@ -189 +166 @@
             END DO
          END DO
-!$OMP END DO NOWAIT
-!$OMP END PARALLEL
          !
          CALL eos( zti, zhi, zri )        ! interpolated density from zti, ztj 
          CALL eos( ztj, zhj, zrj )        ! at the partial step depth output in  zri, zrj 
          !
-!$OMP PARALLEL DO schedule(static) private(jj,ji,iku,ikv,ze3wu,ze3wv)
          DO jj = 1, jpjm1                 ! Gradient of density at the last level 
             DO ji = 1, jpim1