Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/timestep_scheme_steering.f90

    r674 r1001  
    33!------------------------------------------------------------------------------!
    44! Current revisions:
    5 ! -----------------
     5! ------------------
     6! all actions concerning leapfrog scheme removed
    67!
    78! Former revisions:
     
    5253       ENDIF
    5354
    54     ELSE
    55 
    56        IF ( .NOT. dt_fixed )  THEN
     55    ELSEIF ( timestep_scheme == 'euler' )  THEN
    5756!
    58 !--       Leapfrog and Euler schemes
    59 !--       Determine whether after the time step adjustment the Euler- or the
    60 !--       leapfrog scheme will be applied. The very first time step must always
    61 !--       be an Euler step.
    62           IF ( dt_changed )  THEN
    63              IF ( timestep_scheme == 'leapfrog+euler'  .OR. &
    64                   timestep_scheme == 'euler' .OR. simulated_time == 0.0 )  THEN
    65                 tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
    66              ELSE
    67                 tsc(1:5) = (/ 0.0, 2.0, 0.0, 0.0, 2.0 /)
    68              ENDIF
    69           ELSE
    70 !
    71 !--          No time step change, hence continue with the scheme set by the
    72 !--          user.
    73              IF ( timestep_scheme == 'euler' )  THEN
    74                 tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
    75              ELSE
    76                 tsc(1:5) = (/ 0.0, 2.0, 0.0, 0.0, 2.0 /)
    77              ENDIF
    78           ENDIF
    79 
    80        ELSE
    81 
    82 !
    83 !--       Fixed time step:
    84 !
    85 !--       In any case, the very first time step must always be an Euler step.
    86           timestep_reason = 'F'
    87           IF ( simulated_time == 0.0 )  THEN
    88              dt_changed = .TRUE.
    89              tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
    90           ELSE
    91              dt_changed = .FALSE.
    92              IF ( timestep_scheme == 'euler' )  THEN
    93                 tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
    94              ELSE
    95                 tsc(1:5) = (/ 0.0, 2.0, 0.0, 0.0, 2.0 /)
    96              ENDIF
    97           ENDIF
    98 
    99        ENDIF
     57!--    Euler scheme
     58       tsc(1:5) = (/ 1.0, 1.0, 0.0, 0.0, 1.0 /)
    10059
    10160    ENDIF
Note: See TracChangeset for help on using the changeset viewer.