Changeset 7508 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.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/ZDF/zdfevd.F90 (modified) (4 diffs)

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

@@ -68 +68 @@
       CALL wrk_alloc( jpi,jpj,jpk,   zavt_evd, zavm_evd ) 
       !
-!$OMP PARALLEL WORKSHARE
-      zavt_evd(:,:,:) = avt(:,:,:)           ! set avt prior to evd application
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zavt_evd(ji,jj,jk) = avt(ji,jj,jk)           ! set avt prior to evd application
+               END DO
+            END DO
+         END DO 
       !
       SELECT CASE ( nn_evdm )
@@ -77 +82 @@
          !
 !$OMP PARALLEL
-!$OMP WORKSHARE
-         zavm_evd(:,:,:) = avm(:,:,:)           ! set avm prior to evd application
-!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jk, jj, ji)
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zavm_evd(ji,jj,jk) = avm(ji,jj,jk)           ! set avm prior to evd application
+               END DO
+            END DO
+         END DO 
          !
 !$OMP DO schedule(static) private(jk, jj, ji)
@@ -101 +111 @@
          CALL lbc_lnk( avmu, 'U', 1. )   ;   CALL lbc_lnk( avmv, 'V', 1. )
          !
-!$OMP PARALLEL WORKSHARE
-         zavm_evd(:,:,:) = avm(:,:,:) - zavm_evd(:,:,:)   ! change in avm due to evd
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zavm_evd(ji,jj,jk) = avm(ji,jj,jk) - zavm_evd(ji,jj,jk)   ! change in avm due to evd
+               END DO
+            END DO
+         END DO 
          CALL iom_put( "avm_evd", zavm_evd )              ! output this change
          !
@@ -120 +135 @@
       END SELECT 
 
-!$OMP PARALLEL WORKSHARE
-      zavt_evd(:,:,:) = avt(:,:,:) - zavt_evd(:,:,:)   ! change in avt due to evd
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zavt_evd(ji,jj,jk) = avt(ji,jj,jk) - zavt_evd(ji,jj,jk)   ! change in avt due to evd
+               END DO
+            END DO
+         END DO 
       CALL iom_put( "avt_evd", zavt_evd )              ! output this change
       !