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

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

@@ -96 +96 @@
 
       ! w-level of the mixing and mixed layers
-      zN2_c = grav * rho_c * r1_rau0           ! convert density criteria into N^2 criteria
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            nmln(ji,jj)  = nlb10               ! Initialization to the number of w ocean point
-            hmlp(ji,jj)  = 0._wp               ! here hmlp used as a dummy variable, integrating vertically N^2
-         END DO
-      END DO
+      nmln(:,:)  = nlb10               ! Initialization to the number of w ocean point
+      hmlp(:,:)  = 0._wp               ! here hmlp used as a dummy variable, integrating vertically N^2
+      zN2_c = grav * rho_c * r1_rau0   ! convert density criteria into N^2 criteria
       DO jk = nlb10, jpkm1
-!$OMP DO schedule(static) private(jj, ji, ikt)
          DO jj = 1, jpj                ! Mixed layer level: w-level 
             DO ji = 1, jpi
@@ -117 +110 @@
       !
       ! w-level of the turbocline and mixing layer (iom_use)
-!$OMP DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            imld(ji,jj) = mbkt(ji,jj) + 1        ! Initialization to the number of w ocean point
-         END DO
-      END DO
+      imld(:,:) = mbkt(:,:) + 1        ! Initialization to the number of w ocean point
       DO jk = jpkm1, nlb10, -1         ! from the bottom to nlb10 
-!$OMP DO schedule(static) private(jj, ji)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -132 +119 @@
       END DO
       ! depth of the mixing and mixed layers
-!$OMP DO schedule(static) private(jj, ji, iiki, iikn)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -142 +128 @@
          END DO
       END DO
-!$OMP END PARALLEL
       !
       IF( .NOT.l_offline ) THEN