Changeset 3311 for palm/trunk/SOURCE/timestep.f90

Timestamp:

Oct 5, 2018 12:34:56 PM (6 years ago)

Author:

raasch

Message:

Stokes drift is regarded in timestep calculation, check if ocean mode is used for invalid combinations

File:

• palm/trunk/SOURCE/timestep.f90 (modified) (3 diffs)

palm/trunk/SOURCE/timestep.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Stokes drift is regarded in timestep calculation
+! 
+! 3274 2018-09-24 15:42:55Z knoop
 ! Modularization of all bulk cloud physics code components
 ! 
@@ -136 +139 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  dzu, dzw, kh, km, u, v, w
+        ONLY:  dzu, dzw, kh, km, u, u_stokes_zu, v, v_stokes_zu, w
 
     USE control_parameters,                                                    &
@@ -278 +281 @@
              DO  k = nzb+1, nzt
                 dt_u_l = MIN( dt_u_l, ( dx     /                               &
-                                 ( ABS( u(k,j,i) - u_gtrans ) + 1.0E-10_wp ) ) )
+                                 ( ABS( u(k,j,i) - u_gtrans + u_stokes_zu(k) ) &
+                                   + 1.0E-10_wp ) ) )
                 dt_v_l = MIN( dt_v_l, ( dy     /                               &
-                                 ( ABS( v(k,j,i) - v_gtrans ) + 1.0E-10_wp ) ) )
+                                 ( ABS( v(k,j,i) - v_gtrans + v_stokes_zu(k) ) &
+                                   + 1.0E-10_wp ) ) )
                 dt_w_l = MIN( dt_w_l, ( dzu(k) /                               &
                                  ( ABS( w(k,j,i) )            + 1.0E-10_wp ) ) )