Changeset 10122

Timestamp:

2018-09-13T14:29:16+02:00 (6 years ago)

Author:

ldouriez

Message:

3 loops optimizations in BENCH version of zdfiwm.F90: BULL_OPTIM_ZDFIWM_TSDIFF, BULL_OPTIM_ZDFIWM_SSH, BULL_OPTIM_ZDFIWM_WKBHEIGHT_LOOP2. Disabled by default

File:

• NEMO/branches/2018/dev_r9759_HPC09_ESIWACE/tests/BENCH/MY_SRC/zdfiwm.F90 (modified) (5 diffs)

NEMO/branches/2018/dev_r9759_HPC09_ESIWACE/tests/BENCH/MY_SRC/zdfiwm.F90

@@ -123 +123 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zztmp        ! scalar workspace
+#if defined(BULL_OPTIM_ZDFIWM_TSDIFF)      
+      REAL(wp) ::   diffusivity_tmp1, diffusivity_tmp2
+#endif      
       REAL(wp), DIMENSION(jpi,jpj)     ::   zfact       ! Used for vertical structure
       REAL(wp), DIMENSION(jpi,jpj)     ::   zhdep       ! Ocean depth
@@ -157 +160 @@
 !!gm gde3w ==>>>  check for ssh taken into account.... seem OK gde3w_n=gdept_n - sshn
       DO jk = 2, jpkm1              ! complete with the level-dependent part
+#if defined(BULL_OPTIM_ZDFIWM_SSH)
+         DO jj = 1, jpj             
+            DO ji = 1, jpi
+               IF ( (zfact(ji,jj) .eq. 0._wp) ) THEN
+                  zemx_iwm(ji,jj,jk) = 0._wp
+               ELSE
+                  zemx_iwm(ji,jj,jk) = zfact(ji,jj) * (  EXP( ( gde3w_n(ji,jj,jk  ) - zhdep(ji,jj) ) / hcri_iwm(ji,jj) )                      &
+                       &                             - EXP( ( gde3w_n(ji,jj,jk-1) - zhdep(ji,jj) ) / hcri_iwm(ji,jj) )  ) * wmask(ji,jj,jk)   &
+                       &                          / ( gde3w_n(ji,jj,jk) - gde3w_n(ji,jj,jk-1) )
+               ENDIF
+            END DO
+         END DO
+#else         
          zemx_iwm(:,:,jk) = zfact(:,:) * (  EXP( ( gde3w_n(:,:,jk  ) - zhdep(:,:) ) / hcri_iwm(:,:) )                      &
             &                             - EXP( ( gde3w_n(:,:,jk-1) - zhdep(:,:) ) / hcri_iwm(:,:) )  ) * wmask(:,:,jk)   &
             &                          / ( gde3w_n(:,:,jk) - gde3w_n(:,:,jk-1) )
-
+#endif
 !!gm delta(gde3w_n) = e3t_n  !!  Please verify the grid-point position w versus t-point
 !!gm it seems to me that only 1/hcri_iwm  is used ==>  compute it one for all
@@ -234 +250 @@
       zwkb(:,:,1) = zhdep(:,:) * wmask(:,:,1)
       !
+#if defined(BULL_OPTIM_ZDFIWM_WKBHEIGHT_LOOP2)
+      zweight(:,:,1) = 0._wp
+      zweight(:,:,jpkm1+1:jk) = 0._wp
+
+      DO jk = 2, jpkm1
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               IF ( rn2(ji,jj,jk) <= 0 .OR. wmask(ji,jj,jk) == 0 ) THEN
+                  zweight(ji,jj,jk) = 0._wp
+               ELSE
+                  zweight(ji,jj,jk) = rn2(ji,jj,jk) * hbot_iwm(ji,jj) * wmask(ji,jj,jk) * (  EXP( -zwkb(ji,jj,jk) / hbot_iwm(ji,jj) ) - EXP( -zwkb(ji,jj,jk-1) / hbot_iwm(ji,jj) )  )
+               ENDIF
+            END DO
+         END DO
+      END DO
+#else      
       zweight(:,:,:) = 0._wp
       DO jk = 2, jpkm1
@@ -239 +271 @@
             &   * (  EXP( -zwkb(:,:,jk) / hbot_iwm(:,:) ) - EXP( -zwkb(:,:,jk-1) / hbot_iwm(:,:) )  )
       END DO
+#endif      
       !
       zfact(:,:) = 0._wp
@@ -322 +355 @@
       !      
       IF( ln_tsdiff ) THEN          !* Option for differential mixing of salinity and temperature
+#if defined(BULL_OPTIM_ZDFIWM_TSDIFF)
+         diffusivity_tmp1 = ( 0.505_wp + 0.495_wp *  &
+              &   TANH(    0.92_wp * (   LOG10(  1.e-20_wp  ) - 0.60_wp ) ) )
+#endif         
+         
          DO jk = 2, jpkm1              ! Calculate S/T diffusivity ratio as a function of Reb
             DO jj = 1, jpj
                DO ji = 1, jpi
+#if defined(BULL_OPTIM_ZDFIWM_TSDIFF)
+                  diffusivity_tmp2 = zReb(ji,jj,jk) * 5._wp * r1_6
+                  IF ( diffusivity_tmp2 > 1.e-20_wp ) THEN
+                     zav_ratio(ji,jj,jk) = ( 0.505_wp + 0.495_wp *                                                               &
+                          &   TANH(    0.92_wp * (   LOG10(   diffusivity_tmp2  ) - 0.60_wp   )    )                             &
+                          &                 ) * wmask(ji,jj,jk)
+                  ELSE
+                     zav_ratio(ji,jj,jk) = diffusivity_tmp1 * wmask(ji,jj,jk)
+                  ENDIF
+#else                  
                   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   )    )   &
                       &                 ) * wmask(ji,jj,jk)
+#endif                  
                END DO
             END DO