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

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

@@ -112 +112 @@
          ! Define the mask 
          ! ---------------
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj,ji,zrw,zaw,zbw,zdt,zds)
          DO jj = 1, jpj                                ! R=zrau = (alpha / beta) (dk[t] / dk[s])
             DO ji = 1, jpi
@@ -130 +128 @@
             END DO
          END DO
-!$OMP END DO NOWAIT
-
-!$OMP DO schedule(static) private(jj,ji)
+
          DO jj = 1, jpj                                     ! indicators:
             DO ji = 1, jpi
@@ -159 +155 @@
          END DO
          ! mask zmsk in order to have avt and avs masked
-
-!$OMP DO schedule(static) private(jj,ji)
-         DO jj = 1, jpj                               
-            DO ji = 1, jpi
-               zmsks(ji,jj) = zmsks(ji,jj) * wmask(ji,jj,jk)
-            END DO
-         END DO
+         zmsks(:,:) = zmsks(:,:) * wmask(:,:,jk)
+
 
          ! Update avt and avs
          ! ------------------
          ! Constant eddy coefficient: reset to the background value
-!$OMP DO schedule(static) private(jj,ji,zinr,zrr,zavfs,zavft,zavdt,zavds)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -199 +189 @@
          ! --------------------------------
 !!gm to be changed following the definition of avm.
-!$OMP DO schedule(static) private(jj,ji)
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -210 +199 @@
             END DO
          END DO
-!$OMP END DO NOWAIT
-!$OMP END PARALLEL
          !                                                ! ===============
       END DO                                              !   End of slab
@@ -245 +232 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ios   ! local integer
-      INTEGER  ::   ji, jj , jk     ! dummy loop indices
       !!
       NAMELIST/namzdf_ddm/ rn_avts, rn_hsbfr
@@ -271 +257 @@
       IF( zdf_ddm_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_ddm_init : unable to allocate arrays' )
       !                               ! initialization to masked Kz
-!$OMP DO schedule(static) private(jk,jj,ji)
-      DO jk = 1, jpk                               
-         DO jj = 1, jpj                               
-            DO ji = 1, jpi
-               avs(ji,jj,jk) = rn_avt0 * wmask(ji,jj,jk)
-            END DO
-         END DO
-      END DO 
+      avs(:,:,:) = rn_avt0 * wmask(:,:,:) 
       !
    END SUBROUTINE zdf_ddm_init