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

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

@@ -83 +83 @@
       IF( l_trddyn )   THEN                      ! temporary save of ta and sa 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
       !
@@ -134 +139 @@
             zgrau0r     = - grav * r1_rau0
 !$OMP PARALLEL
-!$OMP WORKSHARE
-            zpice(:,:) = (  zintp * snwice_mass(:,:) + ( 1.- zintp ) * snwice_mass_b(:,:)  ) * zgrau0r
-!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jj, ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zpice(ji,jj) = (  zintp * snwice_mass(ji,jj) + ( 1.- zintp ) * snwice_mass_b(ji,jj)  ) * zgrau0r
+               END DO
+            END DO
 !$OMP DO schedule(static) private(jj, ji)
             DO jj = 2, jpjm1
@@ -170 +178 @@
       !                    
       IF( l_trddyn )   THEN                  ! save the surface pressure gradient trends for further diagnostics
-!$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_spg, kt )
          CALL wrk_dealloc( jpi,jpj,jpk,   ztrdu, ztrdv )