Changeset 7295

Timestamp:

2016-11-21T17:14:56+01:00 (7 years ago)

Author:

till

Message:

reverting the changes made before (zmax_scale and zpdlr, in zdftke.F90)
sorry

File:

• branches/UKMO/dev_r5518_nn_etau_revision/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_nn_etau_revision/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -714 +714 @@
                   !                                          ! local Richardson number
                   zri   = MAX( rn2b(ji,jj,jk), 0._wp ) * zcoef / (zdku + zdkv + rn_bshear )
-! below a mod suggested by Colin Jones (implementation by TK)
-                  zpdlr = MAX(  0.05_wp,  1.0 / MAX( 1.0 , ( 1.0 + 10.0*zri ) ) )
+                  zpdlr = MAX(  0.1_wp,  0.2 / MAX( 0.2 , zri )  )
 !!gm and even better with the use of the "true" ri_crit=0.22222...  (this change the results!)
 !!gm              zpdlr = MAX(  0.1_wp,  ri_crit / MAX( ri_crit , zri )  )
@@ -832 +831 @@
             htau(:,:) = MAX(  0.5_wp, MIN( 15._wp, 45._wp* ABS( SIN( rpi/180._wp * gphit(:,:) ) ) )   )
          CASE( 4 )                                 ! F(latitude) : single sine curve per hemisphere
-            zmax_scale = 2._wp/3._wp               ! Amount to scale the maximum value by. Originally 1._wp
+            zmax_scale = 1._wp                     ! Amount to scale the maximum value by.
             zmin = 0.5_wp                          ! The minimum value
             zmax_h_n = 10._wp * zmax_scale         ! The hard maximum value (cutoff imposed on sine curve)