Changeset 1430

Timestamp:

2009-05-07T16:23:43+02:00 (15 years ago)

Author:

rblod

Message:

dev_004_VVL:sync: synchro with trunk (r1418), see ticket #425

Location:

branches/dev_004_VVL/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (3 diffs)
• ZDF/zdf_oce.F90 (modified) (1 diff)
• ZDF/zdftmx.F90 (added)
• step.F90 (modified) (2 diffs)

branches/dev_004_VVL/NEMO/OPA_SRC/DIA/diawri.F90

@@ -369 +369 @@
          CALL histdef( nid_W, "votkeavt", "Vertical Eddy Diffusivity"          , "m2/s"   ,   &  ! avt
             &          jpi, jpj, nh_W, ipk, 1, ipk, nz_W, 32, clop, zsto, zout )
-
+# if defined key_zdftmx 
+         CALL histdef( nid_W, "votidavt", "Tidal Vertical Eddy Diffusivity"    , "m2/s"   ,   &  ! avt_tide
+            &          jpi, jpj, nh_W, ipk, 1, ipk, nz_W, 32, clop, zsto, zout )
+
+         CALL histdef( nid_W, "voitfavt", "Tidal ITF Vertical Eddy Diffusivity", "m2/s"   ,   &  ! avt_tide_itf
+            &          jpi, jpj, nh_W, ipk, 1, ipk, nz_W, 32, clop, zsto, zout )
+# endif
          CALL histdef( nid_W, "votkeevd", "Enhanced Vertical Diffusivity",       "m2/s"   ,   &  ! avt_evd
             &          jpi, jpj, nh_W, ipk, 1, ipk, nz_W, 32, clop, zsto, zout )
@@ -499 +505 @@
       CALL iom_put("votkeavm",avmu)    ! T vert. eddy visc. coef.
       CALL iom_put("votkeevm",avmu_evd)    ! T enhan. vert. eddy visc. coef.
+#   if defined key_zdftmx
+      CALL iom_put("votidavt",av_tide)    ! vert. mix. related to internal tides
+      CALL iom_put("voitfavt",av_tide_itf)    ! ITF vert. mix. related to internal tides
+#   endif
       IF( lk_zdfddm ) THEN
          CALL iom_put("voddmavs",fsavs(:,:,:) )    ! S vert. eddy diff. coef.
@@ -597 +607 @@
 #   endif
       CALL histwrite( nid_W, "votkeavt", it, avt            , ndim_T, ndex_T )    ! T vert. eddy diff. coef.
+# if defined key_zdftmx 
+      CALL histwrite( nid_W, "votidavt", it, av_tide        , ndim_T, ndex_T )    ! vert. mix. related to internal tides
+      CALL histwrite( nid_W, "voitfavt", it, av_tide_itf    , ndim_T, ndex_T )    ! ITF vert. mix. related to internal tides
+# endif
       CALL histwrite( nid_W, "votkeevd", it, avt_evd        , ndim_T, ndex_T )    ! T enhan. vert. eddy diff. coef.
       CALL histwrite( nid_W, "votkeavm", it, avmu           , ndim_T, ndex_T )    ! T vert. eddy visc. coef.

branches/dev_004_VVL/NEMO/OPA_SRC/ZDF/zdf_oce.F90

@@ -45 +45 @@
       avt_evd,           &  !: convection: enhanced vertical diffusivity coeff. at w-point
       avmu_evd              !: convection: enhanced vertical viscosity   coeff. at w-point
+#if defined key_zdftmx
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   av_tide, av_tide_itf   !: Tidal mixing
+#endif
  
    REAL(wp), PUBLIC, DIMENSION(jpk) ::   &   !:

branches/dev_004_VVL/NEMO/OPA_SRC/step.F90

@@ -85 +85 @@
    USE ldfeiv          ! eddy induced velocity coef.      (ldf_eiv routine)
 
+   USE zdftmx          ! tide-induced vertical mixing     (zdf_tmx routine)
    USE zdfbfr          ! bottom friction                  (zdf_bfr routine)
    USE zdftke          ! TKE vertical mixing              (zdf_tke routine)
@@ -253 +254 @@
          &              CALL zdf_ddm( kstp )                 ! double diffusive mixing
 
+      IF( lk_zdftmx )   CALL zdf_tmx( kstp )                 ! tidal vertical mixing
+
                         CALL zdf_bfr( kstp )                 ! bottom friction