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

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

@@ -106 +106 @@
             !
             ! vertical mixing coef.: avt for temperature, avs for salinity and passive tracers
-            IF( cdtype == 'TRA' .AND. jn == jp_tem ) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     zwt(ji,jj,2:jpk) = avt  (ji,jj,2:jpk)
-                  END DO
-               END DO
-            ELSE                                            
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     zwt(ji,jj,2:jpk) = fsavs(ji,jj,2:jpk)
-                  END DO
-               END DO
+            IF( cdtype == 'TRA' .AND. jn == jp_tem ) THEN   ;   zwt(:,:,2:jpk) = avt  (:,:,2:jpk)
+            ELSE                                            ;   zwt(:,:,2:jpk) = fsavs(:,:,2:jpk)
             ENDIF
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  zwt(ji,jj,1) = 0._wp
-               END DO
-            END DO
+            zwt(:,:,1) = 0._wp
             !
             IF( l_ldfslp ) THEN            ! isoneutral diffusion: add the contribution 
                IF( ln_traldf_msc  ) THEN     ! MSC iso-neutral operator 
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
                   DO jk = 2, jpkm1
                      DO jj = 2, jpjm1
@@ -139 +121 @@
                   END DO
                ELSE                          ! standard or triad iso-neutral operator
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
                   DO jk = 2, jpkm1
                      DO jj = 2, jpjm1
@@ -151 +132 @@
             !
             ! Diagonal, lower (i), upper (s)  (including the bottom boundary condition since avt is masked)
-!$OMP PARALLEL 
-!$OMP DO schedule(static) private(jk, jj, ji)
             DO jk = 1, jpkm1
                DO jj = 2, jpjm1
@@ -183 +162 @@
             !   used as a work space array: its value is modified.
             !
-!$OMP DO schedule(static) private(jj, ji)
             DO jj = 2, jpjm1        !* 1st recurrence:   Tk = Dk - Ik Sk-1 / Tk-1   (increasing k)
                DO ji = fs_2, fs_jpim1            ! done one for all passive tracers (so included in the IF instruction)
@@ -189 +167 @@
                END DO
             END DO
-!$OMP END DO NOWAIT 
             DO jk = 2, jpkm1
-!$OMP DO schedule(static) private(jj, ji)
                DO jj = 2, jpjm1
                   DO ji = fs_2, fs_jpim1
@@ -198 +174 @@
                END DO
             END DO
-!$OMP END PARALLEL 
             !
          ENDIF 
          !         
-!$OMP PARALLEL 
-!$OMP DO schedule(static) private(jj, ji)
          DO jj = 2, jpjm1           !* 2nd recurrence:    Zk = Yk - Ik / Tk-1  Zk-1
             DO ji = fs_2, fs_jpim1
@@ -210 +183 @@
          END DO
          DO jk = 2, jpkm1
-!$OMP DO schedule(static) private(jj, ji, zrhs)
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1
@@ -219 +191 @@
          END DO
          !
-!$OMP DO schedule(static) private(jj, ji)
          DO jj = 2, jpjm1           !* 3d recurrence:    Xk = (Zk - Sk Xk+1 ) / Tk   (result is the after tracer)
             DO ji = fs_2, fs_jpim1
@@ -226 +197 @@
          END DO
          DO jk = jpk-2, 1, -1
-!$OMP DO schedule(static) private(jj, ji)
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1
@@ -234 +204 @@
             END DO
          END DO
-!$OMP END PARALLEL 
          !                                            ! ================= !
       END DO                                          !  end tracer loop  !