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

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -92 +92 @@
       IF( l_trddyn ) THEN           ! Save ua and va trends
          CALL wrk_alloc( jpi,jpj,jpk,   ztrdu, ztrdv )
-!$OMP PARALLEL WORKSHARE
-         ztrdu(:,:,:) = ua(:,:,:) 
-         ztrdv(:,:,:) = va(:,:,:) 
-!$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
+                 ztrdu(ji,jj,jk) = ua(ji,jj,jk)
+                 ztrdv(ji,jj,jk) = va(ji,jj,jk)
+              END DO
+           END DO
+        END DO
       ENDIF
-      
-         zhke(:,:,jpk) = 0._wp
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zhke(ji,jj,jpk) = 0._wp
+         END DO
+      END DO
       
       SELECT CASE ( kscheme )             !== Horizontal kinetic energy at T-point  ==!
@@ -149 +158 @@
       !
       IF( l_trddyn ) THEN                 ! save the Kinetic Energy trends for diagnostic
-!$OMP PARALLEL WORKSHARE
-         ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)
-         ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
-!$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
+                    ztrdu(ji,jj,jk) = ua(ji,jj,jk) - ztrdu(ji,jj,jk)
+                    ztrdv(ji,jj,jk) = va(ji,jj,jk) - ztrdv(ji,jj,jk)
+                 END DO
+              END DO
+           END DO
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_keg, kt )
          CALL wrk_dealloc( jpi,jpj,jpk,   ztrdu, ztrdv )