Changeset 320 for palm/trunk

Timestamp:

May 19, 2009 11:20:03 AM (16 years ago)

Author:

letzel

Message:

• Bugfix for timestep criterion in case of simulations with inhomogeneous plant canopy (timestep)

File:

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

palm/trunk/SOURCE/timestep.f90

@@ -239 +239 @@
 
           IF ( dt_plant_canopy_l > 0.0 ) THEN
+!
+!--          Invert dt_plant_canopy_l and apply a security timestep factor 0.1
              dt_plant_canopy_l = 0.1 / dt_plant_canopy_l
+          ELSE
+!
+!--          In case of inhomogeneous plant canopy, some processors may have no
+!--          canopy at all. Then use dt_max as dummy instead.
+             dt_plant_canopy_l = dt_max
           ENDIF
+
 !
 !--       Determine the global minumum
@@ -287 +295 @@
           stop_dt = .TRUE.
 
-          WRITE( message_string, * ) 'Time step has reached minimum limit.',   &
-                        '&dt      = ', dt_3d, ' s  Simulation is terminated.', &
-                        '&old_dt  = ', old_dt, ' s',                           &
-                        '&dt_u    = ', dt_u, ' s',                             &
-                        '&dt_v    = ', dt_v, ' s',                             &
-                        '&dt_w    = ', dt_w, ' s',                             &
-                        '&dt_diff = ', dt_diff, ' s',                          &
-                        '&u_max   = ', u_max, ' m/s   k=', u_max_ijk(1),       &
-                        '  j=', u_max_ijk(2), '  i=', u_max_ijk(3),            &
-                        '&v_max   = ', v_max, ' m/s   k=', v_max_ijk(1),       &
-                        '  j=', v_max_ijk(2), '  i=', v_max_ijk(3),            &
-                        '&w_max   = ', w_max, ' m/s   k=', w_max_ijk(1),       &
-                        '  j=', w_max_ijk(2), '  i=', w_max_ijk(3)
+          WRITE( message_string, * ) 'Time step has reached minimum limit.',  &
+               '&dt              = ', dt_3d, ' s  Simulation is terminated.', &
+               '&old_dt          = ', old_dt, ' s',                           &
+               '&dt_u            = ', dt_u, ' s',                             &
+               '&dt_v            = ', dt_v, ' s',                             &
+               '&dt_w            = ', dt_w, ' s',                             &
+               '&dt_diff         = ', dt_diff, ' s',                          &
+               '&dt_plant_canopy = ', dt_plant_canopy, ' s',                  &
+               '&u_max   = ', u_max, ' m/s   k=', u_max_ijk(1),               &
+               '  j=', u_max_ijk(2), '  i=', u_max_ijk(3),                    &
+               '&v_max   = ', v_max, ' m/s   k=', v_max_ijk(1),               &
+               '  j=', v_max_ijk(2), '  i=', v_max_ijk(3),                    &
+               '&w_max   = ', w_max, ' m/s   k=', w_max_ijk(1),               &
+               '  j=', w_max_ijk(2), '  i=', w_max_ijk(3)
           CALL message( 'timestep', 'PA0312', 0, 1, 0, 6, 0 )
 !