Changeset 1001 for palm/trunk/SOURCE/timestep_scheme_steering.f90

Timestamp:

Sep 13, 2012 2:08:46 PM (9 years ago)

Author:

raasch

Message:

leapfrog timestep scheme and upstream-spline advection scheme completely removed from the code,
reading of dt_fixed from restart file removed

File:

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

palm/trunk/SOURCE/timestep_scheme_steering.f90

@@ -3 +3 @@
 !------------------------------------------------------------------------------!
 ! Current revisions:
-! -----------------
+! ------------------
+! all actions concerning leapfrog scheme removed
 !
 ! Former revisions:
@@ -52 +53 @@
        ENDIF
 
-    ELSE
-
-       IF ( .NOT. dt_fixed )  THEN
+    ELSEIF ( timestep_scheme == 'euler' )  THEN
 !
-!--       Leapfrog and Euler schemes
-!--       Determine whether after the time step adjustment the Euler- or the
-!--       leapfrog scheme will be applied. The very first time step must always
-!--       be an Euler step.
-          IF ( dt_changed )  THEN
-             IF ( timestep_scheme == 'leapfrog+euler'  .OR. &
-                  timestep_scheme == 'euler' .OR. simulated_time == 0.0 )  THEN
-                tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
-             ELSE
-                tsc(1:5) = (/ 0.0, 2.0, 0.0, 0.0, 2.0 /)
-             ENDIF
-          ELSE
-!
-!--          No time step change, hence continue with the scheme set by the
-!--          user.
-             IF ( timestep_scheme == 'euler' )  THEN
-                tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
-             ELSE
-                tsc(1:5) = (/ 0.0, 2.0, 0.0, 0.0, 2.0 /)
-             ENDIF
-          ENDIF
-
-       ELSE
-
-!
-!--       Fixed time step:
-!
-!--       In any case, the very first time step must always be an Euler step.
-          timestep_reason = 'F'
-          IF ( simulated_time == 0.0 )  THEN
-             dt_changed = .TRUE.
-             tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
-          ELSE
-             dt_changed = .FALSE.
-             IF ( timestep_scheme == 'euler' )  THEN
-                tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
-             ELSE
-                tsc(1:5) = (/ 0.0, 2.0, 0.0, 0.0, 2.0 /)
-             ENDIF
-          ENDIF
-
-       ENDIF
+!--    Euler scheme
+       tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
 
     ENDIF