Changeset 6712

Timestamp:

2016-06-14T16:23:21+02:00 (8 years ago)

Author:

mocavero

Message:

update some OMP directives

Location:

branches/2016/dev_v3_6_STABLE_OMP/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/dynhpg.F90 (modified) (2 diffs)
• DYN/dynzad.F90 (modified) (2 diffs)
• DYN/dynzdf_imp.F90 (modified) (3 diffs)
• LDF/ldfslp.F90 (modified) (2 diffs)
• TRA/trazdf_imp.F90 (modified) (2 diffs)
• ZDF/zdftke.F90 (modified) (5 diffs)

branches/2016/dev_v3_6_STABLE_OMP/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -314 +314 @@
 
       ! interior value (2=<jk=<jpkm1)
+   DO jk = 2, jpkm1
 !$OMP PARALLEL DO private(ji,jj, zcoef1)
-     DO jk = 2, jpkm1
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -322 +322 @@
                zhpi(ji,jj,jk) = zhpi(ji,jj,jk-1)   &
                   &           + zcoef1 * (  ( rhd(ji+1,jj,jk) + rhd(ji+1,jj,jk-1) )   &
-                  &                      
-              - ( rhd(ji  ,jj,jk) + rhd(ji  ,jj,jk-1) )  ) / e1u(ji,jj)
+                  &                       - ( rhd(ji  ,jj,jk) + rhd(ji  ,jj,jk-1) )  ) / e1u(ji,jj)
 
                zhpj(ji,jj,jk) = zhpj(ji,jj,jk-1)   &

branches/2016/dev_v3_6_STABLE_OMP/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

@@ -81 +81 @@
          ztrdv(:,:,:) = va(:,:,:) 
       ENDIF
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)      
       DO jk = 2, jpkm1              ! Vertical momentum advection at level w and u- and v- vertical
+!$OMP PARALLEL DO schedule(static) private(jj, ji)      
          DO jj = 2, jpj                   ! vertical fluxes 
             DO ji = fs_2, jpi             ! vector opt.
@@ -88 +88 @@
             END DO
          END DO
+!$OMP PARALLEL DO schedule(static) private(jj, ji)      
          DO jj = 2, jpjm1                 ! vertical momentum advection at w-point
             DO ji = fs_2, fs_jpim1        ! vector opt.

branches/2016/dev_v3_6_STABLE_OMP/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

@@ -222 +222 @@
       END DO
       !
-!$OMP PARALLEL DO schedule(static) private(jj, ji)      
+!$OMP PARALLEL DO schedule(static) private(jj, ji, ze3ua)      
       DO jj = 2, jpjm1        !==  second recurrence:    SOLk = RHSk - Lk / Dk-1  Lk-1  ==
          DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -388 +388 @@
       !! restore bottom layer avmu(v) 
       IF( ln_bfrimp ) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
+!$OMP PARALLEL DO schedule(static) private(jj, ji, ikbu, ikbv)
         DO jj = 2, jpjm1
            DO ji = 2, jpim1
@@ -398 +398 @@
         END DO
         IF (ln_isfcav) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
+!$OMP PARALLEL DO schedule(static) private(jj, ji, ikbu, ikbv)
            DO jj = 2, jpjm1
               DO ji = 2, jpim1

branches/2016/dev_v3_6_STABLE_OMP/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -169 +169 @@
          !==   Local vertical density gradient at T-point   == !   (evaluated from N^2)
          ! interior value
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
+!$OMP PARALLEL DO schedule(static) private(jk)
        DO jk = 2, jpkm1
             !                                ! zdzr = d/dz(prd)= - ( prd ) / grav * mk(pn2) -- at t point
@@ -801 +801 @@
       !-----------------------------------------------------------------------
       !
-!$OMP PARALLEL DO schedule(static) private(jj, ji, iku, ikv, zbu, zbv, zau, zav, ik, zbw, zci, zcj, zai, zaj, zbi, zbj) 
+!$OMP PARALLEL DO schedule(static) private(jj, ji, iku, ikv, zbu, zbv, zau, zav, ik, ikm1, zbw, zci, zcj, zai, zaj, zbi, zbj) 
       DO jj = 2, jpjm1
          DO ji = 2, jpim1

branches/2016/dev_v3_6_STABLE_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90

@@ -204 +204 @@
          !         
          ! second recurrence:    Zk = Yk - Ik / Tk-1  Zk-1
-         !$OMP PARALLEL DO schedule(static) private(jj, ji)
+         !$OMP PARALLEL DO schedule(static) private(jj, ji, ze3tb, ze3tn)
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1
@@ -214 +214 @@
          END DO
          DO jk = 2, jpkm1
-         !$OMP PARALLEL DO schedule(static) private(jj, ji)
+         !$OMP PARALLEL DO schedule(static) private(jj, ji, ze3tb, ze3tn, zrhs)
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1

branches/2016/dev_v3_6_STABLE_OMP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -171 +171 @@
       !!              Bruchard OM 2002
       !!----------------------------------------------------------------------
+      INTEGER ::   ji, jj, jk   ! dummy loop indices
       INTEGER, INTENT(in) ::   kt   ! ocean time step
       !!----------------------------------------------------------------------
@@ -318 +319 @@
          zcof = 0.5 * 0.016 * 0.016 / ( zrhoa * zcdrag )
          imlc(:,:) = mbkt(:,:) + 1       ! Initialization to the number of w ocean point (=2 over land)
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zus)
        DO jk = jpkm1, 2, -1
             DO jj = 1, jpj               ! Last w-level at which zpelc>=0.5*us*us 
@@ -576 +576 @@
      !
       IF( ln_mxl0 ) THEN            ! surface mixing length = F(stress) : l=vkarmn*2.e5*taum/(rau0*g)
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zraug)
        DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1
@@ -650 +650 @@
          END DO
          DO jk = jpkm1, 2, -1     ! from the bottom to the surface :
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zemxl)
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -678 +678 @@
          END DO
 !CDIR NOVERRCHK
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zemxl, zemlp)
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zemlm, zemlp)
          DO jk = 2, jpkm1
 !CDIR NOVERRCHK