Changeset 7525 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

Timestamp:

2017-01-04T17:47:47+01:00 (7 years ago)

Author:

mocavero

Message:

changes after review

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) (8 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -128 +128 @@
       IF( l_trdtra ) THEN      ! trends diagnostic: save the input temperature trend
          CALL wrk_alloc( jpi,jpj,jpk,   ztrdt ) 
-!$OMP PARALLEL WORKSHARE
-         ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
-!$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
+                     ztrdt(ji,jj,jk) = tsa(ji,jj,jk,jp_tem)
+                  END DO
+               END DO
+            END DO
       ENDIF
       !
@@ -144 +149 @@
          ELSE                                           ! No restart or restart not found: Euler forward time stepping
             z1_2 = 1._wp
-!$OMP PARALLEL WORKSHARE
-            qsr_hc_b(:,:,:) = 0._wp
-!$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
+                     qsr_hc_b(ji,jj,jk) = 0._wp
+                  END DO
+               END DO
+            END DO
          ENDIF
       ELSE                             !==  Swap of qsr heat content  ==!
          z1_2 = 0.5_wp
-!$OMP PARALLEL WORKSHARE
-         qsr_hc_b(:,:,:) = qsr_hc(:,:,:)
-!$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
+                     qsr_hc_b(ji,jj,jk) = qsr_hc(ji,jj,jk)
+                  END DO
+               END DO
+            END DO
       ENDIF
       !
@@ -161 +176 @@
       CASE( np_BIO )                   !==  bio-model fluxes  ==!
          !
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
          DO jk = 1, nksr
-            qsr_hc(:,:,jk) = r1_rau0_rcp * ( etot3(:,:,jk) - etot3(:,:,jk+1) )
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  qsr_hc(ji,jj,jk) = r1_rau0_rcp * ( etot3(ji,jj,jk) - etot3(ji,jj,jk+1) )
+               END DO
+             END DO
          END DO
          !
@@ -198 +217 @@
             END DO
          ELSE                                !* constant chrlorophyll
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
            DO jk = 1, nksr + 1
-              zchl3d(:,:,jk) = 0.05 
+              DO jj = 1, jpj
+                 DO ji = 1, jpi
+                    zchl3d(ji,jj,jk) = 0.05 
+                 ENDDO
+              ENDDO
             ENDDO
          ENDIF
@@ -305 +328 @@
          !
 !$OMP PARALLEL
-!$OMP WORKSHARE
-         zetot(:,:,nksr+1:jpk) = 0._wp     ! below ~400m set to zero
-!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jj,ji)
+         DO jj = 1, jpj 
+            DO ji = 1, jpi   ! vector opt.
+               zetot(ji,jj,nksr+1:jpk) = 0._wp     ! below ~400m set to zero
+            END DO
+         END DO
          DO jk = nksr, 1, -1
 !$OMP DO schedule(static) private(jj,ji)
@@ -329 +355 @@
       !
       IF( l_trdtra ) THEN     ! qsr tracers trends saved for diagnostics
-!$OMP PARALLEL WORKSHARE
-         ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)
-!$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
+                  ztrdt(ji,jj,jk) = tsa(ji,jj,jk,jp_tem) - ztrdt(ji,jj,jk)
+               END DO
+            END DO
+         END DO
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_qsr, ztrdt )
          CALL wrk_dealloc( jpi,jpj,jpk,   ztrdt ) 
@@ -458 +489 @@
       END SELECT
       !
-!$OMP PARALLEL WORKSHARE
-      qsr_hc(:,:,:) = 0._wp     ! now qsr heat content set to zero where it will not be computed
-!$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
+               qsr_hc(ji,jj,jk) = 0._wp     ! now qsr heat content set to zero where it will not be computed
+            END DO
+         END DO
+      END DO
       !
       ! 1st ocean level attenuation coefficient (used in sbcssm)
@@ -466 +502 @@
          CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev'  , fraqsr_1lev  )
       ELSE
-!$OMP PARALLEL WORKSHARE
-         fraqsr_1lev(:,:) = 1._wp   ! default : no penetration
-!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               fraqsr_1lev(ji,jj) = 1._wp   ! default : no penetration
+            END DO
+         END DO
       ENDIF
       !