Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.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/LDF/ldfc1d_c2d.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90

@@ -148 +148 @@
             IF(lwp) WRITE(numout,*) '              momentum laplacian coeffcients = rn_aht0/e_equ * max(e1,e2)'
             za00 = pah0 / zd_max
-!$OMP PARALLEL DO schedule(static) private(jj,ji,zemax1,zemax2)
             DO jj = 1, jpj 
                DO ji = 1, jpi 
@@ -160 +159 @@
             IF(lwp) WRITE(numout,*) '              momentum bilaplacian coeffcients = rn_bht0/e_equ * max(e1,e2)**3'
             za00 = pah0 / ( zd_max * zd_max * zd_max )
-!$OMP PARALLEL DO schedule(static) private(jj,ji,zemax1,zemax2)
             DO jj = 1, jpj
                DO ji = 1, jpi
@@ -173 +171 @@
          ENDIF
          !                                !  deeper values  (LAP and BLP cases)
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
          DO jk = 2, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  pah1(ji,jj,jk) = pah1(ji,jj,1) * tmask(ji,jj,jk) 
-                  pah2(ji,jj,jk) = pah2(ji,jj,1) * fmask(ji,jj,jk) 
-               END DO
-            END DO
+            pah1(:,:,jk) = pah1(:,:,1) * tmask(:,:,jk) 
+            pah2(:,:,jk) = pah2(:,:,1) * fmask(:,:,jk) 
          END DO
          !
@@ -187 +180 @@
             IF(lwp) WRITE(numout,*) '              tracer laplacian coeffcients = rn_aht0/e_equ * max(e1,e2)'
             za00 = pah0 / zd_max
-!$OMP PARALLEL DO schedule(static) private(jj,ji,zemax1,zemax2)
             DO jj = 1, jpj 
                DO ji = 1, jpi 
@@ -199 +191 @@
             IF(lwp) WRITE(numout,*) '              tracer bilaplacian coeffcients = rn_bht0/e_equ * max(e1,e2)**3'
             za00 = pah0 / ( zd_max * zd_max * zd_max )
-!$OMP PARALLEL DO schedule(static) private(jj,ji,zemax1,zemax2)
             DO jj = 1, jpj
                DO ji = 1, jpi
@@ -212 +203 @@
          ENDIF
          !                                !  deeper values  (LAP and BLP cases)
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
          DO jk = 2, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  pah1(ji,jj,jk) = pah1(ji,jj,1) * umask(ji,jj,jk) 
-                  pah2(ji,jj,jk) = pah2(ji,jj,1) * vmask(ji,jj,jk) 
-               END DO
-            END DO
+            pah1(:,:,jk) = pah1(:,:,1) * umask(:,:,jk) 
+            pah2(:,:,jk) = pah2(:,:,1) * vmask(:,:,jk) 
          END DO
          !