Changeset 7508 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

Timestamp:

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

Author:

mocavero

Message:

changes on code duplication and workshare construct

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (10 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -112 +112 @@
          IF ( ln_loglayer.AND. .NOT.ln_linssh ) THEN ! "log layer" bottom friction coefficient
 
-!$OMP PARALLEL DO private(jj,ji,ikbt,ztmp)
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ikbt,ztmp)
             DO jj = 1, jpj
                DO ji = 1, jpi
@@ -124 +124 @@
 ! (ISF)
             IF ( ln_isfcav ) THEN
-!$OMP PARALLEL DO private(jj,ji,ikbt,ztmp)
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ikbt,ztmp)
                DO jj = 1, jpj
                   DO ji = 1, jpi
@@ -137 +137 @@
             !   
          ELSE
-!$OMP PARALLEL WORKSHARE
-            zbfrt(:,:) = bfrcoef2d(:,:)
-            ztfrt(:,:) = tfrcoef2d(:,:)
-!$OMP END PARALLEL WORKSHARE
-         ENDIF
-
-!$OMP PARALLEL DO private(jj,ji,ikbu,ikbv,zvu,zuv,zecu,zecv)
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zbfrt(ji,jj) = bfrcoef2d(ji,jj)
+                  ztfrt(ji,jj) = tfrcoef2d(ji,jj)
+               END DO
+            END DO
+         ENDIF
+
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ikbu,ikbv,zvu,zuv,zecu,zecv)
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
@@ -178 +181 @@
 
          IF( ln_isfcav ) THEN
-!$OMP PARALLEL DO private(jj,ji,ikbu,ikbv,zvu,zuv,zecu,zecv)
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ikbu,ikbv,zvu,zuv,zecu,zecv)
             DO jj = 2, jpjm1
                DO ji = 2, jpim1
@@ -272 +275 @@
       CASE( 0 )
          IF(lwp) WRITE(numout,*) '      free-slip '
-!$OMP PARALLEL WORKSHARE
-         bfrua(:,:) = 0.e0
-         bfrva(:,:) = 0.e0
-         tfrua(:,:) = 0.e0
-         tfrva(:,:) = 0.e0
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  bfrua(ji,jj) = 0.e0
+                  bfrva(ji,jj) = 0.e0
+                  tfrua(ji,jj) = 0.e0
+                  tfrva(ji,jj) = 0.e0
+               END DO
+            END DO
          !
       CASE( 1 )
@@ -304 +310 @@
          ENDIF
          !
-!$OMP PARALLEL WORKSHARE
-         bfrua(:,:) = - bfrcoef2d(:,:)
-         bfrva(:,:) = - bfrcoef2d(:,:)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  bfrua(ji,jj) = - bfrcoef2d(ji,jj)
+                  bfrva(ji,jj) = - bfrcoef2d(ji,jj)
+               END DO
+            END DO
          !
          IF ( ln_isfcav ) THEN
@@ -320 +329 @@
             ENDIF
             !
-!$OMP PARALLEL WORKSHARE
-            tfrua(:,:) = - tfrcoef2d(:,:)
-            tfrva(:,:) = - tfrcoef2d(:,:)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  tfrua(ji,jj) = - tfrcoef2d(ji,jj)
+                  tfrva(ji,jj) = - tfrcoef2d(ji,jj)
+               END DO
+            END DO
          END IF
          !
@@ -383 +395 @@
          !
          IF( ln_loglayer.AND. ln_linssh ) THEN ! set "log layer" bottom friction once for all
-!$OMP PARALLEL DO private(jj,ji,ikbt,ztmp)
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ikbt,ztmp)
             DO jj = 1, jpj
                DO ji = 1, jpi
@@ -393 +405 @@
             END DO
             IF ( ln_isfcav ) THEN
-!$OMP PARALLEL DO private(jj,ji,ikbt,ztmp)
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ikbt,ztmp)
                DO jj = 1, jpj
                   DO ji = 1, jpi
@@ -433 +445 @@
       zmaxtfr = -1.e10_wp    ! initialise tracker for maximum of bottom friction coefficient
       !
-!$OMP PARALLEL DO private(jj,ji,ikbu,ikbv,zfru,zfrv,ictu,ictv,zminbfr,zmaxbfr,zmintfr,zmaxtfr)
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ikbu,ikbv,zfru,zfrv,ictu,ictv,zminbfr,zmaxbfr,zmintfr,zmaxtfr)
       DO jj = 2, jpjm1
          DO ji = 2, jpim1