Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.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/DOM/dtatsd.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

@@ -161 +161 @@
          ij0 = 101   ;   ij1 = 109                       ! Reduced T & S in the Alboran Sea
          ii0 = 141   ;   ii1 = 155
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
          DO jj = mj0(ij0), mj1(ij1)
             DO ji = mi0(ii0), mi1(ii1)
@@ -182 +181 @@
 !!gm end
       !
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-      DO jk = 1, jpk
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               ptsd(ji,jj,jk,jp_tem) = sf_tsd(jp_tem)%fnow(ji,jj,jk)    ! NO mask
-               ptsd(ji,jj,jk,jp_sal) = sf_tsd(jp_sal)%fnow(ji,jj,jk)
-            END DO
-         END DO
-      END DO
+      ptsd(:,:,:,jp_tem) = sf_tsd(jp_tem)%fnow(:,:,:)    ! NO mask
+      ptsd(:,:,:,jp_sal) = sf_tsd(jp_sal)%fnow(:,:,:) 
       !
       IF( ln_sco ) THEN                   !==   s- or mixed s-zps-coordinate   ==!
@@ -201 +193 @@
          ENDIF
          !
-!$OMP PARALLEL DO schedule(static) private(jj, ji, jk, zl, jkk, zi)
          DO jj = 1, jpj                         ! vertical interpolation of T & S
             DO ji = 1, jpi
@@ -235 +226 @@
       ELSE                                !==   z- or zps- coordinate   ==!
          !                             
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ptsd(ji,jj,jk,jp_tem) = ptsd(ji,jj,jk,jp_tem) * tmask(ji,jj,jk)    ! Mask
-                  ptsd(ji,jj,jk,jp_sal) = ptsd(ji,jj,jk,jp_sal) * tmask(ji,jj,jk)
-               END DO
-            END DO
-         END DO
+         ptsd(:,:,:,jp_tem) = ptsd(:,:,:,jp_tem) * tmask(:,:,:)    ! Mask
+         ptsd(:,:,:,jp_sal) = ptsd(:,:,:,jp_sal) * tmask(:,:,:)
          !
          IF( ln_zps ) THEN                      ! zps-coordinate (partial steps) interpolation at the last ocean level
-!$OMP PARALLEL DO schedule(static) private(jj, ji, ik, zl)
             DO jj = 1, jpj
                DO ji = 1, jpi