Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90

@@ -67 +67 @@
          &                 ln_traldf_level, ln_traldf_hor  , ln_traldf_iso,   &
          &                 ln_traldf_grif , ln_traldf_gdia,                   &
+         &                 ln_triad_iso   , ln_botmix_grif,                   &
          &                 rn_aht_0       , rn_ahtb_0      , rn_aeiv_0,       &
          &                 rn_slpmax
@@ -93 +94 @@
          WRITE(numout,*) '      eddy induced velocity coef.   rn_aeiv_0       = ', rn_aeiv_0
          WRITE(numout,*) '      maximum isoppycnal slope      rn_slpmax       = ', rn_slpmax
-         WRITE(numout,*) '   + griffies operator internal controls not set via the namelist (experimental): '
-         WRITE(numout,*) '      calculate triads twice        l_triad_iso     = ', l_triad_iso
-         WRITE(numout,*) '      no Shapiro filter             l_no_smooth     = ', l_no_smooth
+         WRITE(numout,*) '      pure lateral mixing in ML     ln_triad_iso    = ', ln_triad_iso
+         WRITE(numout,*) '      lateral mixing on bottom      ln_botmix_grif  = ', ln_botmix_grif
          WRITE(numout,*)
       ENDIF