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

Timestamp:

Jan 18, 2011 4:19:48 PM (14 years ago)

Author:

suehring

Message:

Right computation of the pressure using Runge-Kutta weighting coefficients. Consideration of the pressure gradient during the time integration removed. Removed bugfix concerning velocity variances.

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -7 +7 @@
 ! Current revisions:
 ! -----------------
-!
+! weight_substep (moved from advec_ws) and weight_pres added.
+! Allocate p_sub when using Multigrid or SOR solver.
+! Call of ws_init moved behind the if requests.
 ! Former revisions:
 ! -----------------
@@ -208 +210 @@
               w_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg),  &
               w_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+!
+!-- Following array is required to buffer the perturbation pressure during 
+!-- Runge-Kutta 3rd order time integration.
+    IF ( psolver == 'multigrid' .OR. psolver == 'sor' )  THEN
+       ALLOCATE( p_sub(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+    ENDIF
 
     IF ( timestep_scheme(1:5) /= 'runge' )  THEN
@@ -425 +433 @@
 
     ENDIF
-
+    
+!
+!-- Allocate arrays containing the RK coefficient for right evaluation of 
+!-- perturbation pressure and turbulent fluxes. At this point it is needed
+!-- for right pressure correction during initialization. Further below 
+!-- the real values will be set.
+    ALLOCATE (weight_substep(1:intermediate_timestep_count_max),           &
+              weight_pres(1:intermediate_timestep_count_max) )
+    weight_substep = 1.
+    weight_pres = 1.
+    intermediate_timestep_count = 1 ! needed for simulated_time=0
+       
 !
 !-- Initialize model variables
@@ -823 +842 @@
           IF ( precipitation )  precipitation_amount = 0.0
        ENDIF
+       
+!
+!--    Initialize quantities for special advections schemes
+       CALL init_advec
 
 !
@@ -1304 +1327 @@
 
 !
-!-- Initialize quantities for special advections schemes
-    CALL init_advec
-    IF ( momentum_advec == 'ws-scheme' .OR.  &
-         scalar_advec == 'ws-scheme' ) CALL ws_init
+!-- Initialize the ws-scheme.    
+    IF ( ws_scheme_sca .OR. ws_scheme_mom )  CALL ws_init        
+
+!
+!-- Setting weighting factors for right evaluation of perturbation pressure 
+!-- and turbulent quantities during the RK substeps.                
+    IF ( TRIM(timestep_scheme) == 'runge-kutta-3' )  THEN    ! RK3       
+       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          
+    ELSEIF ( TRIM(timestep_scheme) == 'runge-kutta-2' )  THEN  ! RK2       
+       weight_substep(1) = 0.5
+       weight_substep(2) = 0.5
+          
+       weight_pres(1) = 0.5
+       weight_pres(2) = 0.5          
+    ELSE                                                  ! Euler and Leapfrog       
+       weight_substep(1) = 1.0      
+       weight_pres(1) = 1.0                   
+    ENDIF
 
 !