Changeset 8279 for branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90

Timestamp:

2017-07-04T17:46:48+02:00 (7 years ago)

Author:

mocavero

Message:

Implementation of OMP coarse-grained parallelization on ZDF new package

File:

• branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (modified) (12 diffs)

branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90

@@ -150 +150 @@
       !                        !* Critical slope mixing: distribute energy over the time-varying ocean depth,
       !                                                 using an exponential decay from the seafloor.
-      DO jj = k_Jstr, k_Jend
-         DO ji = k_Istr, k_Iend     ! part independent of the level
+      DO jj = tnldj, tnlej
+         DO ji = tnldi, tnlei     ! part independent of the level
             zhdep(ji,jj) = gdepw_0(ji,jj,mbkt(ji,jj)+1)       ! depth of the ocean
             zfact(ji,jj) = rau0 * (  1._wp - EXP( -zhdep(ji,jj) / hcri_iwm(ji,jj) )  )
@@ -158 +158 @@
       END DO
       DO jk = 2, jpkm1              ! complete with the level-dependent part
-         DO jj = k_Jstr, k_Jend
-            DO ji = k_Istr, k_Iend
+         DO jj = tnldj, tnlej
+            DO ji = tnldi, tnlei
                emix_iwm(ji,jj,jk) = zfact(ji,jj) * wmask(ji,jj,jk)                              & 
                   &   * (  EXP( ( gde3w_n(ji,jj,jk  ) - zhdep(ji,jj) ) / hcri_iwm(ji,jj) )      &
@@ -185 +185 @@
          !
          WHERE( zfact(WRK_2D) /= 0 )   zfact(WRK_2D) = epyc_iwm(WRK_2D) / ( rau0 * zfact(WRK_2D) )
-!         DO jj = k_Jstr, k_Jend
-!            DO ji = k_Istr, k_Iend
+!         DO jj = tnldj, tnlej
+!            DO ji = tnldi, tnlei
 !               IF( zfact(ji,jj) /= 0 )   zfact(ji,jj) = epyc_iwm(ji,jj) / ( rau0 * zfact(ji,jj) )
 !            END DO
@@ -203 +203 @@
          !
          WHERE( zfact(WRK_2D) /= 0 )   zfact(WRK_2D) = epyc_iwm(WRK_2D) / ( rau0 * zfact(WRK_2D) )
-!         DO jj = k_Jstr, k_Jend
-!            DO ji = k_Istr, k_Iend
+!         DO jj = tnldj, tnlej
+!            DO ji = tnldi, tnlei
 !               IF( zfact(ji,jj) /= 0 )   zfact(ji,jj) = epyc_iwm(ji,jj) / ( rau0 * zfact(ji,jj) )
 !            END DO
@@ -224 +224 @@
 !         zfact(WRK_2D)    = zfact(WRK_2D) + e3w_n(WRK_2D,jk) * SQRT(  MAX( 0._wp, rn2(WRK_2D,jk) )  )
 !         zwkb (WRK_2D,jk) = zfact(WRK_2D)
-         DO jj = k_Jstr, k_Jend
-            DO ji = k_Istr, k_Iend
+         DO jj = tnldj, tnlej
+            DO ji = tnldi, tnlei
                zztemp = zfact(ji,jj) + e3w_n(ji,jj,jk) * SQRT(  MAX( 0._wp, rn2(ji,jj,jk) )  )
                zfact(ji,jj)    = zztemp
@@ -234 +234 @@
       !
       DO jk = 2, jpkm1
-         DO jj = k_Jstr, k_Jend
-            DO ji = k_Istr, k_Iend
+         DO jj = tnldj, tnlej
+            DO ji = tnldi, tnlei
                IF( zfact(ji,jj) /= 0 )   zwkb(ji,jj,jk) = zhdep(ji,jj) * ( zfact(ji,jj) - zwkb(ji,jj,jk) )   &
                   &                                     * wmask(ji,jj,jk) / zfact(ji,jj)
@@ -245 +245 @@
       zweight(WRK_3D) = 0._wp
       DO jk = 2, jpkm1
-         zweight(WRK_2D,jk) = MAX( 0._wp, rn2(WRK_2D,jk) ) * hbot_iwm(:,:)     &
+         zweight(WRK_2D,jk) = MAX( 0._wp, rn2(WRK_2D,jk) ) * hbot_iwm(WRK_2D)  &
             &               * (  EXP( -zwkb(WRK_2D,jk  ) / hbot_iwm(WRK_2D) )  &
             &                  - EXP( -zwkb(WRK_2D,jk-1) / hbot_iwm(WRK_2D) )  )
@@ -256 +256 @@
       !
       WHERE( zfact(WRK_2D) /= 0 )   zfact(WRK_2D) = ebot_iwm(WRK_2D) / ( rau0 * zfact(WRK_2D) )
-!      DO jj = k_Jstr, k_Jend
-!         DO ji = k_Istr, k_Iend
+!      DO jj = tnldj, tnlej
+!         DO ji = tnldi, tnlei
 !            IF( zfact(ji,jj) /= 0 )   zfact(ji,jj) = ebot_iwm(ji,jj) / ( rau0 * zfact(ji,jj) )
 !         END DO
@@ -290 +290 @@
       IF( ln_mevar ) THEN              ! Variable mixing efficiency case : modify zav_wave in the
          DO jk = 2, jpkm1              ! energetic (Reb > 480) and buoyancy-controlled (Reb <10.224 ) regimes
-            DO jj = k_Jstr, k_Jend
-               DO ji = k_Istr, k_Iend
+            DO jj = tnldj, tnlej
+               DO ji = tnldi, tnlei
                   IF( zReb(ji,jj,jk) > 480.00_wp ) THEN
                      zav_wave(ji,jj,jk) = 3.6515_wp * znu_w(ji,jj,jk) * SQRT( zReb(ji,jj,jk) )
@@ -310 +310 @@
 !!gm used of glosum 3D....
          DO jk = 2, jpkm1
-            DO jj = k_Jstr, k_Jend
-               DO ji = k_Istr, k_Iend
+            DO jj = tnldj, tnlej
+               DO ji = tnldi, tnlei
                   zztemp = zztemp + e3w_n(ji,jj,jk) * e1e2t(ji,jj)   &
                      &         * MAX( 0._wp, rn2(ji,jj,jk) ) * zav_wave(ji,jj,jk) * wmask(ji,jj,jk) * tmask_i(ji,jj)
@@ -317 +317 @@
             END DO
          END DO
-         IF( lk_mpp )   CALL mpp_sum( zztemp )
+!         IF( lk_mpp )   CALL mpp_sum( zztemp )
          zztemp = rau0 * zztemp ! Global integral of rauo * Kz * N^2 = power contributing to mixing 
          !
@@ -335 +335 @@
       IF( ln_tsdiff ) THEN          !* Option for differential mixing of salinity and temperature
          DO jk = 2, jpkm1              ! Calculate S/T diffusivity ratio as a function of Reb
-            DO jj = k_Jstr, k_Jend
-               DO ji = k_Istr, k_Iend
+            DO jj = tnldj, tnlej
+               DO ji = tnldi, tnlei
                   zav_ratio(ji,jj,jk) = ( 0.505_wp + 0.495_wp *                                                                  &
                       &   TANH(    0.92_wp * (   LOG10(  MAX( 1.e-20_wp, zReb(ji,jj,jk) * 5._wp * r1_6 )  ) - 0.60_wp   )    )   &