Changeset 75 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Mar 22, 2007 9:54:05 AM (17 years ago)

Author:

raasch

Message:

preliminary update for changes concerning non-cyclic boundary conditions

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (6 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -7 +7 @@
 ! and counters,
 ! calls of prognostic_equations_.. changed to .._noopt, .._cache, and
-! .._vector, these calls are now controlled by switch loop_optimization
+! .._vector, these calls are now controlled by switch loop_optimization,
+! uxrp, vynp eliminated, 2nd+3rd argument removed from exchange horiz,
+! moisture renamed humidity
 !
 ! Former revisions:
@@ -136 +138 @@
 !--       Exchange of ghost points (lateral boundary conditions)
           CALL cpu_log( log_point(26), 'exchange-horiz-progn', 'start' )
-          CALL exchange_horiz( u_p, uxrp,    0 )
-          CALL exchange_horiz( v_p,    0, vynp )
-          CALL exchange_horiz( w_p,    0,    0 )
-          CALL exchange_horiz( pt_p,   0,    0 )
-          IF ( .NOT. constant_diffusion       )  CALL exchange_horiz( e_p, 0, 0)
-          IF ( moisture  .OR.  passive_scalar )  CALL exchange_horiz( q_p, 0, 0)
+          CALL exchange_horiz( u_p )
+          CALL exchange_horiz( v_p )
+          CALL exchange_horiz( w_p )
+          CALL exchange_horiz( pt_p )
+          IF ( .NOT. constant_diffusion       )  CALL exchange_horiz( e_p )
+          IF ( humidity  .OR.  passive_scalar )  CALL exchange_horiz( q_p )
           IF ( cloud_droplets )  THEN
-             CALL exchange_horiz( ql,    0, 0 )
-             CALL exchange_horiz( ql_c,  0, 0 )
-             CALL exchange_horiz( ql_v,  0, 0 )
-             CALL exchange_horiz( ql_vp, 0, 0 )
+             CALL exchange_horiz( ql )
+             CALL exchange_horiz( ql_c )
+             CALL exchange_horiz( ql_v )
+             CALL exchange_horiz( ql_vp )
           ENDIF
 
@@ -182 +184 @@
              IF ( time_disturb >= dt_disturb )  THEN
                 IF ( hom(nzb+5,1,var_hom,0) < disturbance_energy_limit )  THEN
-                   CALL disturb_field( nzb_u_inner, tend, u, uxrp, 0    )
-                   CALL disturb_field( nzb_v_inner, tend, v ,   0, vynp )
+                   CALL disturb_field( nzb_u_inner, tend, u )
+                   CALL disturb_field( nzb_v_inner, tend, v )
                 ELSEIF ( bc_lr /= 'cyclic'  .OR.  bc_ns /= 'cyclic' )  THEN
 !
@@ -189 +191 @@
 !--                near the inflow throughout the whole simulation
                    dist_range = 1
-                   CALL disturb_field( nzb_u_inner, tend, u, uxrp, 0    )
-                   CALL disturb_field( nzb_v_inner, tend, v ,   0, vynp )
+                   CALL disturb_field( nzb_u_inner, tend, u )
+                   CALL disturb_field( nzb_v_inner, tend, v )
                    dist_range = 0
                 ENDIF
@@ -208 +210 @@
 !--       In case of a non-cyclic lateral wall, set the boundary conditions for
 !--       the velocities at the outflow
-          IF ( bc_lr /= 'cyclic'  .OR.  bc_ns /= 'cyclic' )  THEN
-             CALL boundary_conds( 'outflow_uvw' )
-          ENDIF
+!          IF ( bc_lr /= 'cyclic'  .OR.  bc_ns /= 'cyclic' )  THEN
+!             CALL boundary_conds( 'outflow_uvw' )
+!          ENDIF
 
 !
 !--       If required, compute virtuell potential temperature
-          IF ( moisture ) CALL compute_vpt
+          IF ( humidity ) CALL compute_vpt
 
 !
@@ -235 +237 @@
 !--          Compute the diffusion coefficients
              CALL cpu_log( log_point(17), 'diffusivities', 'start' )
-             IF ( .NOT. moisture ) THEN
+             IF ( .NOT. humidity ) THEN
                 CALL diffusivities( pt )
              ELSE