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

Timestamp:

Mar 13, 2007 3:52:49 AM (17 years ago)

Author:

raasch

Message:

preliminary changes concerning update of BC-scheme

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -5 +5 @@
 ! -----------------
 ! Move call of user_actions( 'after_integration' ) below increment of times
-! and counters
+! and counters,
+! calls of prognostic_equations_.. changed to .._noopt, .._cache, and
+! .._vector, these calls are now controlled by switch loop_optimization
 !
 ! Former revisions:
@@ -98 +100 @@
 !--       in the other versions a good vectorization is prohibited due to
 !--       inlining problems.
-          IF ( host(1:3) == 'nec' )  THEN
-             CALL prognostic_equations_vec
+          IF ( loop_optimization == 'vector' )  THEN
+             CALL prognostic_equations_vector
           ELSE
              IF ( momentum_advec == 'ups-scheme'  .OR.  &
@@ -105 +107 @@
                   scalar_advec == 'bc-scheme' )        &
              THEN
-                CALL prognostic_equations
+                CALL prognostic_equations_noopt
              ELSE
-                CALL prognostic_equations_fast
+                CALL prognostic_equations_cache
              ENDIF
           ENDIF
@@ -114 +116 @@
 !--       Particle advection (only once during intermediate steps, because
 !--       it uses an Euler-step)
-          IF ( simulated_time >= particle_advection_start  .AND. &
+          IF ( particle_advection  .AND.                         &
+               simulated_time >= particle_advection_start  .AND. &
                intermediate_timestep_count == 1 )  THEN
              CALL advec_particles