Changeset 7931 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90

Timestamp:

2017-04-19T12:15:07+02:00 (7 years ago)

Author:

gm

Message:

#1880 (HPC-09): remove key_zdfddm + phasing with last changes of HPC08 branch

File:

• branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) (6 diffs)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90

@@ -163 +163 @@
       !                          ! ----------------------- !
       DO jk = 2, jpkm1              !* update momentum & tracer diffusivity with tidal mixing
-         avt(:,:,jk) = avt(:,:,jk) + zav_tide(:,:,jk) * wmask(:,:,jk)
+         avt(:,:,jk) = avs(:,:,jk) + zav_tide(:,:,jk) * wmask(:,:,jk)
          avm(:,:,jk) = avm(:,:,jk) + zav_tide(:,:,jk) * wmask(:,:,jk)
          DO jj = 2, jpjm1
@@ -591 +591 @@
 
    !! * Substitutions
-#  include "zdfddm_substitute.h90"
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -700 +699 @@
          emix_tmx(:,:,jk) = zfact(:,:) * (  EXP( ( gde3w_n(:,:,jk  ) - zhdep(:,:) ) / hcri_tmx(:,:) )                      &
             &                             - EXP( ( gde3w_n(:,:,jk-1) - zhdep(:,:) ) / hcri_tmx(:,:) )  ) * wmask(:,:,jk)   &
+!!gm delta(gde3w_n) = e3t_n  !!  Please verify the grid-point position w versus t-point
             &                          / ( gde3w_n(:,:,jk) - gde3w_n(:,:,jk-1) )
       END DO
@@ -824 +824 @@
       IF( kt == nit000 ) THEN        !* Control print at first time-step: diagnose the energy consumed by zav_wave
          ztpc = 0._wp
+!!gm used of glosum 3D....
          DO jk = 2, jpkm1
             DO jj = 1, jpj
@@ -860 +861 @@
          CALL iom_put( "av_ratio", zav_ratio )
          DO jk = 2, jpkm1           !* update momentum & tracer diffusivity with wave-driven mixing
-            fsavs(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk) * zav_ratio(:,:,jk)
-            avt  (:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk)
-            avm  (:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk)
+            avs(:,:,jk) = avs(:,:,jk) + zav_wave(:,:,jk) * zav_ratio(:,:,jk)
+            avt(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk)
+            avm(:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk)
          END DO
          !
       ELSE                          !* update momentum & tracer diffusivity with wave-driven mixing
          DO jk = 2, jpkm1
-            fsavs(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk)
-            avt  (:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk)
-            avm  (:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk)
+            avs(:,:,jk) = avs(:,:,jk) + zav_wave(:,:,jk)
+            avt(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk)
+            avm(:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk)
          END DO
       ENDIF
@@ -976 +977 @@
             &               'the viscous molecular value & a very small diffusive value, resp.'
       ENDIF
-      
-      IF( .NOT.lk_zdfddm )   CALL ctl_stop( 'STOP', 'zdf_tmx_init_new : key_zdftmx_new requires key_zdfddm' )
-      
+            
       !                             ! allocate tmx arrays
       IF( zdf_tmx_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_tmx_init : unable to allocate tmx arrays' )