Changeset 713 for palm/trunk/SOURCE/init_3d_model.f90

Timestamp:

Mar 30, 2011 2:21:21 PM (13 years ago)

Author:

suehring

Message:

reformatted advec_ws.f90, reformulate constants as broken numbers, bugfix in vertical advection of vertical velocity (concerning vector optimized routine)

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -7 +7 @@
 ! Current revisions:
 ! -----------------
-! 
+! ! Reformulate weight_substep and weight_pres as broken numbers.
 !
 ! Former revisions:
@@ -1353 +1353 @@
     IF ( TRIM(timestep_scheme) == 'runge-kutta-3' )  THEN      ! for RK3-method
 
-       weight_substep(1) = 0.166666666666666
-       weight_substep(2) = 0.3
-       weight_substep(3) = 0.533333333333333
-
-       weight_pres(1)    = 0.333333333333333
-       weight_pres(2)    = 0.416666666666666
-       weight_pres(3)    = 0.25
+       weight_substep(1) = 1./6.
+       weight_substep(2) = 3./10.
+       weight_substep(3) = 8./15.
+
+       weight_pres(1)    = 1./3.
+       weight_pres(2)    = 5./12.
+       weight_pres(3)    = 1./4.
 
     ELSEIF ( TRIM(timestep_scheme) == 'runge-kutta-2' )  THEN  ! for RK2-method
 
-       weight_substep(1) = 0.5
-       weight_substep(2) = 0.5
+       weight_substep(1) = 1./2.
+       weight_substep(2) = 1./2.
           
-       weight_pres(1)    = 0.5
-       weight_pres(2)    = 0.5          
+       weight_pres(1)    = 1./2.
+       weight_pres(2)    = 1./2.        
 
     ELSE                                     ! for Euler- and leapfrog-method