Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2016-10-18T15:32:04+02:00 (8 years ago)

Author:

mocavero

Message:

ORCA2_LIM_PISCES hybrid version update

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (8 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -146 +146 @@
       ! N.B. tmask has already the right boundary conditions since mbathy is ok
       !
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
          DO jj = 1, jpj
@@ -157 +158 @@
       
       ! (ISF) define barotropic mask and mask the ice shelf point
-!$OMP PARALLEL WORKSHARE
+!$OMP WORKSHARE
       ssmask(:,:)=tmask(:,:,1) ! at this stage ice shelf is not masked
-!$OMP END PARALLEL WORKSHARE      
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+!$OMP END WORKSHARE      
+!$OMP DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
          DO jj = 1, jpj
@@ -173 +174 @@
       ! Interior domain mask (used for global sum)
       ! --------------------
-!$OMP PARALLEL WORKSHARE
+!$OMP WORKSHARE
       tmask_i(:,:) = ssmask(:,:)            ! (ISH) tmask_i = 1 even on the ice shelf
 
       tmask_h(:,:) = 1._wp                 ! 0 on the halo and 1 elsewhere
-!$OMP END PARALLEL WORKSHARE
+!$OMP END WORKSHARE NOWAIT
+!$OMP END PARALLEL
       iif = jpreci                         ! ???
       iil = nlci - jpreci + 1
@@ -211 +213 @@
       ! 2. Ocean/land mask at u-,  v-, and z-points (computed from tmask)
       ! -------------------------------------------
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
          DO jj = 1, jpjm1
@@ -225 +228 @@
       END DO
       ! (ISF) MIN(1,SUM(umask)) is here to check if you have effectively at least 1 wet cell at u point
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
+!$OMP DO schedule(static) private(jj, ji)
       DO jj = 1, jpjm1
          DO ji = 1, fs_jpim1   ! vector loop
@@ -236 +239 @@
          END DO
       END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
       CALL lbc_lnk( umask  , 'U', 1._wp )      ! Lateral boundary conditions
       CALL lbc_lnk( vmask  , 'V', 1._wp )
@@ -245 +250 @@
       ! 3. Ocean/land mask at wu-, wv- and w points 
       !----------------------------------------------
+!$OMP PARALLEL
+!$OMP WORKSHARE
       wmask (:,:,1) = tmask(:,:,1)     ! surface
       wumask(:,:,1) = umask(:,:,1)
       wvmask(:,:,1) = vmask(:,:,1)
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jk)
       DO jk = 2, jpk                   ! interior values
          wmask (:,:,jk) = tmask(:,:,jk) * tmask(:,:,jk-1)
@@ -254 +262 @@
          wvmask(:,:,jk) = vmask(:,:,jk) * vmask(:,:,jk-1)
       END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
 
       ! Lateral boundary conditions on velocity (modify fmask)