Changeset 9616 for branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

Timestamp:

2018-05-22T11:09:09+02:00 (6 years ago)

Author:

andmirek

Message:

#2001 few additionale changes

File:

• branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -109 +109 @@
       !
       !                                                ! ===============
+!$OMP PARALLEL 
       DO jk = 2, jpkm1                                 ! Horizontal slab
          !                                             ! ===============
          ! Define the mask 
          ! ---------------
+!$OMP DO PRIVATE(zrw, zaw, zbw, zdt, zds)
          DO jj = 1, jpj                                ! R=zrau = (alpha / beta) (dk[t] / dk[s])
             DO ji = 1, jpi
@@ -130 +132 @@
          END DO
 
+!$OMP DO
          DO jj = 1, jpj                                     ! indicators:
             DO ji = 1, jpi
@@ -156 +159 @@
          END DO
          ! mask zmsk in order to have avt and avs masked
-         zmsks(:,:) = zmsks(:,:) * wmask(:,:,jk)
-
+!$OMP DO 
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+                zmsks(ji,jj) = zmsks(ji,jj) * wmask(ji,jj,jk)
+            END DO
+         ENDDO
 
          ! Update avt and avs
          ! ------------------
          ! Constant eddy coefficient: reset to the background value
-!CDIR NOVERRCHK
+!$OMP DO PRIVATE(zinr, zrr, zavfs, zavft, zavdt, zavds)
          DO jj = 1, jpj
-!CDIR NOVERRCHK
             DO ji = 1, jpi
                zinr = 1._wp / zrau(ji,jj)
@@ -192 +198 @@
          ! --------------------------------
 !!gm to be changed following the definition of avm.
+!$OMP DO 
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -204 +211 @@
          !                                                ! ===============
       END DO                                              !   End of slab
+!$OMP END PARALLEL
       !                                                   ! ===============
       !