Changeset 7698 for trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2017-02-18T10:02:03+01:00 (7 years ago)

Author:

mocavero

Message:

update trunk with OpenMP parallelization

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (12 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -47 +47 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
-   !! $Id$ 
+   !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -137 +137 @@
       ! ----------------------------
       !
-      tmask(:,:,:) = 0._wp
+!$OMP PARALLEL
+!$OMP 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
+            END DO
+         END DO
+      END DO
+!$OMP DO schedule(static) private(jj, ji, iktop, ikbot)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -147 +156 @@
          END DO  
       END DO  
+!$OMP END PARALLEL
 !SF  add here lbc_lnk: bug not still understood : cause now domain configuration is read !
 !!gm I don't understand why...  
@@ -161 +171 @@
       ! ------------------------
       IF ( ln_bdy .AND. ln_mask_file ) THEN
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1
             DO jj = 1, jpj
@@ -173 +184 @@
       ! ----------------------------------------
       ! NB: at this point, fmask is designed for free slip lateral boundary condition
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
          DO jj = 1, jpjm1
@@ -192 +204 @@
       ! Ocean/land mask at wu-, wv- and w points    (computed from tmask)
       !-----------------------------------------
-      wmask (:,:,1) = tmask(:,:,1)     ! surface
-      wumask(:,:,1) = umask(:,:,1)
-      wvmask(:,:,1) = vmask(:,:,1)
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            wmask (ji,jj,1) = tmask(ji,jj,1)     ! surface
+            wumask(ji,jj,1) = umask(ji,jj,1)
+            wvmask(ji,jj,1) = vmask(ji,jj,1)
+         END DO
+      END DO
+!$OMP DO schedule(static) private(jk,jj,ji)
       DO jk = 2, jpk                   ! interior values
-         wmask (:,:,jk) = tmask(:,:,jk) * tmask(:,:,jk-1)
-         wumask(:,:,jk) = umask(:,:,jk) * umask(:,:,jk-1)   
-         wvmask(:,:,jk) = vmask(:,:,jk) * vmask(:,:,jk-1)
-      END DO
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               wmask (ji,jj,jk) = tmask(ji,jj,jk) * tmask(ji,jj,jk-1)
+               wumask(ji,jj,jk) = umask(ji,jj,jk) * umask(ji,jj,jk-1)   
+               wvmask(ji,jj,jk) = vmask(ji,jj,jk) * vmask(ji,jj,jk-1)
+            END DO
+         END DO
+      END DO
+!$OMP END PARALLEL
 
 
@@ -216 +240 @@
       !
       !                          ! halo mask : 0 on the halo and 1 elsewhere
-      tmask_h(:,:) = 1._wp                  
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            tmask_h(ji,jj) = 1._wp                  
+         END DO
+      END DO
       tmask_h( 1 :iif,   :   ) = 0._wp      ! first columns
       tmask_h(iil:jpi,   :   ) = 0._wp      ! last  columns (including mpp extra columns)
@@ -241 +270 @@
       !
       !                          ! interior mask : 2D ocean mask x halo mask 
-      tmask_i(:,:) = ssmask(:,:) * tmask_h(:,:)
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            tmask_i(ji,jj) = ssmask(ji,jj) * tmask_h(ji,jj)
+         END DO
+      END DO
 
 
@@ -250 +284 @@
          CALL wrk_alloc( jpi,jpj,   zwf )
          !
+!$OMP PARALLEL
          DO jk = 1, jpk
-            zwf(:,:) = fmask(:,:,jk)         
+!$OMP DO schedule(static) private(jj, ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zwf(ji,jj) = fmask(ji,jj,jk)         
+               END DO
+            END DO
+!$OMP DO schedule(static) private(jj, ji)
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -260 +301 @@
                END DO
             END DO
+!$OMP DO schedule(static) private(jj)
             DO jj = 2, jpjm1
                IF( fmask(1,jj,jk) == 0._wp ) THEN
@@ -268 +310 @@
                ENDIF
             END DO         
+!$OMP DO schedule(static) private(ji)
             DO ji = 2, jpim1
                IF( fmask(ji,1,jk) == 0._wp ) THEN
@@ -277 +320 @@
             END DO
          END DO
+!$OMP END PARALLEL
          !
          CALL wrk_dealloc( jpi,jpj,   zwf )