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

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90

@@ -186 +186 @@
 
 !$OMP PARALLEL
-!$OMP WORKSHARE
-      delta_i(:,:) = 0._wp   ;
-      zpresh (:,:) = 0._wp   ;  
-      zpreshc(:,:) = 0._wp
-      u_ice2 (:,:) = 0._wp   ;   v_ice1(:,:) = 0._wp
-      divu_i (:,:) = 0._wp   ;   zdt   (:,:) = 0._wp   ;   zds(:,:) = 0._wp
-      shear_i(:,:) = 0._wp
-!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            delta_i(ji,jj) = 0._wp   ;
+            zpresh (ji,jj) = 0._wp   ;  
+            zpreshc(ji,jj) = 0._wp
+            u_ice2 (ji,jj) = 0._wp   ;   v_ice1(ji,jj) = 0._wp
+            divu_i (ji,jj) = 0._wp   ;   zdt   (ji,jj) = 0._wp   ;   zds(ji,jj) = 0._wp
+            shear_i(ji,jj) = 0._wp
+         END DO
+      END DO
 
 !$OMP DO schedule(static) private(jj,ji)
@@ -250 +253 @@
          zintb = REAL( nn_fsbc + 1 ) / REAL( nn_fsbc ) * 0.5_wp
          !
-!$OMP PARALLEL WORKSHARE
-         zpice(:,:) = ssh_m(:,:) + (  zintn * snwice_mass(:,:) +  zintb * snwice_mass_b(:,:)  ) * r1_rau0
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zpice(ji,jj) = ssh_m(ji,jj) + (  zintn * snwice_mass(ji,jj) +  zintb * snwice_mass_b(ji,jj)  ) * r1_rau0
+         END DO
+      END DO
          !
       ELSE                                    !== non-embedded sea ice: use ocean surface for slope calculation ==!
-!$OMP PARALLEL WORKSHARE
-         zpice(:,:) = ssh_m(:,:)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zpice(ji,jj) = ssh_m(ji,jj)
+            END DO
+         END DO
       ENDIF
 
@@ -332 +341 @@
 
       !-Initialise stress tensor 
-!$OMP PARALLEL WORKSHARE
-      zs1 (:,:) = stress1_i (:,:) 
-      zs2 (:,:) = stress2_i (:,:)
-      zs12(:,:) = stress12_i(:,:)
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zs1 (ji,jj) = stress1_i (ji,jj) 
+            zs2 (ji,jj) = stress2_i (ji,jj)
+            zs12(ji,jj) = stress12_i(ji,jj)
+         END DO
+      END DO
 
       !                                               !----------------------!
@@ -677 +689 @@
 !$OMP END DO NOWAIT
       ! * Store the stress tensor for the next time step
-!$OMP WORKSHARE
-      stress1_i (:,:) = zs1 (:,:)
-      stress2_i (:,:) = zs2 (:,:)
-      stress12_i(:,:) = zs12(:,:)
-!$OMP END WORKSHARE NOWAIT
+!$OMP DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            stress1_i (ji,jj) = zs1 (ji,jj)
+            stress2_i (ji,jj) = zs2 (ji,jj)
+            stress12_i(ji,jj) = zs12(ji,jj)
+         END DO
+      END DO
+!$OMP END DO NOWAIT
 !$OMP END PARALLEL
       ! Lateral boundary condition