Changeset 7508 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90

Timestamp:

2016-12-19T13:15:59+01:00 (8 years ago)

Author:

mocavero

Message:

changes on code duplication and workshare construct

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) (2 diffs)

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

@@ -42 +42 @@
       CHARACTER(len=1), INTENT(in   ) ::   cdgrid       ! grid name 'T', 'U', 'V', 'W'
       !
-      INTEGER :: ik         ! working level
+      INTEGER :: ik, jj, ji         ! working level
       INTEGER , DIMENSION(2) ::   iloc
       REAL(wp)               ::   zlon, zmini
@@ -52 +52 @@
       CALL wrk_alloc( jpi,jpj,   zglam, zgphi, zmask, zdist )
       !
-      zmask(:,:) = 0._wp
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zmask(ji,jj) = 0._wp
+         END DO
+      END DO
       ik = 1
       IF ( PRESENT(kkk) ) ik=kkk
       SELECT CASE( cdgrid )
       CASE( 'U' )
-!$OMP PARALLEL WORKSHARE
-      zglam(:,:) = glamu(:,:) ; zgphi(:,:) = gphiu(:,:) ; zmask(nldi:nlei,nldj:nlej) = umask(nldi:nlei,nldj:nlej,ik)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zglam(ji,jj) = glamu(ji,jj) ; zgphi(ji,jj) = gphiu(ji,jj)
+         END DO
+      END DO
+      zmask(nldi:nlei,nldj:nlej) = umask(nldi:nlei,nldj:nlej,ik)
       CASE( 'V' )  
-!$OMP PARALLEL WORKSHARE
-      zglam(:,:) = glamv(:,:) ; zgphi(:,:) = gphiv(:,:) ; zmask(nldi:nlei,nldj:nlej) = vmask(nldi:nlei,nldj:nlej,ik)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zglam(ji,jj) = glamv(ji,jj) ; zgphi(ji,jj) = gphiv(ji,jj)
+         END DO
+      END DO
+      zmask(nldi:nlei,nldj:nlej) = vmask(nldi:nlei,nldj:nlej,ik)
       CASE( 'F' )  
-!$OMP PARALLEL WORKSHARE
-      zglam(:,:) = glamf(:,:) ; zgphi(:,:) = gphif(:,:) ; zmask(nldi:nlei,nldj:nlej) = fmask(nldi:nlei,nldj:nlej,ik)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zglam(ji,jj) = glamf(ji,jj) ; zgphi(ji,jj) = gphif(ji,jj)
+         END DO
+      END DO
+      zmask(nldi:nlei,nldj:nlej) = fmask(nldi:nlei,nldj:nlej,ik)
       CASE DEFAULT 
-!$OMP PARALLEL WORKSHARE
-      zglam(:,:) = glamt(:,:) ; zgphi(:,:) = gphit(:,:) ; zmask(nldi:nlei,nldj:nlej) = tmask(nldi:nlei,nldj:nlej,ik)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zglam(ji,jj) = glamt(ji,jj) ; zgphi(ji,jj) = gphit(ji,jj)
+         END DO
+      END DO
+      zmask(nldi:nlei,nldj:nlej) = tmask(nldi:nlei,nldj:nlej,ik)
       END SELECT
 
       IF (jphgr_msh /= 2 .AND. jphgr_msh /= 3) THEN
          zlon       = MOD( plon       + 720., 360. )                                     ! plon between    0 and 360
-         zglam(:,:) = MOD( zglam(:,:) + 720., 360. )                                     ! glam between    0 and 360
-         IF( zlon > 270. )   zlon = zlon - 360.                                          ! zlon between  -90 and 270
-         IF( zlon <  90. )   WHERE( zglam(:,:) > 180. ) zglam(:,:) = zglam(:,:) - 360.   ! glam between -180 and 180
-         zglam(:,:) = zglam(:,:) - zlon
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zglam, zlon)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zglam(ji,jj) = MOD( zglam(ji,jj) + 720., 360. )                                     ! glam between    0 and 360
+               IF( zlon > 270. )   zlon = zlon - 360.                                          ! zlon between  -90 and 270
+               IF( zlon <  90. ) THEN
+                 IF( zglam(ji,jj) > 180. ) zglam(ji,jj) = zglam(ji,jj) - 360.   ! glam between -180 and 180
+               END IF
+               zglam(ji,jj) = zglam(ji,jj) - zlon
+            END DO
+         END DO
       ELSE
-         zglam(:,:) = zglam(:,:) - plon
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zglam(ji,jj) = zglam(ji,jj) - plon
+            END DO
+         END DO
       END IF
-!$OMP PARALLEL WORKSHARE
-      zgphi(:,:) = zgphi(:,:) - plat
-      zdist(:,:) = zglam(:,:) * zglam(:,:) + zgphi(:,:) * zgphi(:,:)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zgphi(ji,jj) = zgphi(ji,jj) - plat
+            zdist(ji,jj) = zglam(ji,jj) * zglam(ji,jj) + zgphi(ji,jj) * zgphi(ji,jj)
+         END DO
+      END DO
       IF( lk_mpp ) THEN  
          CALL mpp_minloc( zdist(:,:), zmask, zmini, kii, kjj)