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

Timestamp:

2016-06-28T11:53:56+02:00 (8 years ago)

Author:

mocavero

Message:

GYRE hybrid parallelization

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (7 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
       !
-      tmask(:,:,:) = 0._wp
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
          DO jj = 1, jpj
             DO ji = 1, jpi
+               tmask(ji,jj,jk) = 0._wp
                IF( REAL( mbathy(ji,jj) - jk, wp ) + 0.1_wp >= 0._wp )   tmask(ji,jj,jk) = 1._wp
             END DO  
@@ -156 +157 @@
       
       ! (ISF) define barotropic mask and mask the ice shelf point
+!$OMP PARALLEL 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)
       DO jk = 1, jpk
          DO jj = 1, jpj
@@ -170 +173 @@
       ! Interior domain mask (used for global sum)
       ! --------------------
+!$OMP PARALLEL 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
       iif = jpreci                         ! ???
       iil = nlci - jpreci + 1
@@ -206 +211 @@
       ! 2. Ocean/land mask at u-,  v-, and z-points (computed from tmask)
       ! -------------------------------------------
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
          DO jj = 1, jpjm1
@@ -219 +225 @@
       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)
       DO jj = 1, jpjm1
          DO ji = 1, fs_jpim1   ! vector loop
@@ -241 +248 @@
       wumask(:,:,1) = umask(:,:,1)
       wvmask(:,:,1) = vmask(:,:,1)
+!$OMP PARALLEL DO schedule(static) private(jk)
       DO jk = 2, jpk                   ! interior values
          wmask (:,:,jk) = tmask(:,:,jk) * tmask(:,:,jk-1)
@@ -249 +257 @@
       ! Lateral boundary conditions on velocity (modify fmask)
       ! ---------------------------------------     
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
          zwf(:,:) = fmask(:,:,jk)