Changeset 70 for palm

Timestamp:

Mar 18, 2007 11:46:30 PM (18 years ago)

Author:

raasch

Message:

bugs fixed for particle code and bc-scheme

Location:

palm/trunk/SOURCE

Files:

• init_particles.f90 (modified) (1 diff)
• palm.f90 (modified) (2 diffs)
• prognostic_equations.f90 (modified) (3 diffs)

palm/trunk/SOURCE/init_particles.f90

@@ -59 +59 @@
 !-- length 100, nevertheless, 120 bytes are needed on T3E since integer seems
 !-- to be 8 bytes long there)
-    blocklengths(1)  = 18; blocklengths(2)  = 4; blocklengths(3)  =  1
+    blocklengths(1)  = 19; blocklengths(2)  = 4; blocklengths(3)  =  1
 #if defined( __t3eb )
     displacements(1) = 0; displacements(2) = 152; displacements(3) = 184

palm/trunk/SOURCE/palm.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! __vtk directives removed, open unit 9 for debug output
+! __vtk directives removed, write_particles is called only in case of particle
+! advection switched on, open unit 9 for debug output
 !
 ! Former revisions:
@@ -141 +142 @@
 !
 !-- If required, write binary particle data
-    CALL write_particles
+    IF ( particle_advection )  CALL write_particles
 
 !

palm/trunk/SOURCE/prognostic_equations.f90

@@ -316 +316 @@
 !
 !-- pt-tendency terms with communication
+    sat = tsc(1)
+    sbt = tsc(2)
     IF ( scalar_advec == 'bc-scheme' )  THEN
-!
-!--    Bott-Chlond scheme always uses Euler time step. Thus:
-       sat = 1.0
-       sbt = 1.0
+
+       IF ( timestep_scheme(1:5) /= 'runge' )  THEN
+!
+!--       Bott-Chlond scheme always uses Euler time step when leapfrog is
+!--       switched on. Thus:
+          sat = 1.0
+          sbt = 1.0
+       ENDIF
        tend = 0.0
        CALL advec_s_bc( pt, 'pt' )
     ELSE
-       sat = tsc(1)
-       sbt = tsc(2)
        IF ( tsc(2) /= 2.0  .AND.  scalar_advec == 'ups-scheme' )  THEN
           tend = 0.0
@@ -411 +415 @@
 !
 !--    Scalar/q-tendency terms with communication
+       sat = tsc(1)
+       sbt = tsc(2)
        IF ( scalar_advec == 'bc-scheme' )  THEN
-!
-!--       Bott-Chlond scheme always uses Euler time step. Thus:
-          sat = 1.0
-          sbt = 1.0
+
+          IF ( timestep_scheme(1:5) /= 'runge' )  THEN
+!
+!--          Bott-Chlond scheme always uses Euler time step when leapfrog is
+!--          switched on. Thus:
+             sat = 1.0
+             sbt = 1.0
+          ENDIF
           tend = 0.0
           CALL advec_s_bc( q, 'q' )
        ELSE
-          sat = tsc(1)
-          sbt = tsc(2)
           IF ( tsc(2) /= 2.0 )  THEN
              IF ( scalar_advec == 'ups-scheme' )  THEN
@@ -507 +515 @@
 !--    TKE-tendency terms with communication
        CALL production_e_init
+
+       sat = tsc(1)
+       sbt = tsc(2)
        IF ( .NOT. use_upstream_for_tke )  THEN
           IF ( scalar_advec == 'bc-scheme' )  THEN
-!
-!--          Bott-Chlond scheme always uses Euler time step. Thus:
-             sat = 1.0
-             sbt = 1.0
+
+             IF ( timestep_scheme(1:5) /= 'runge' )  THEN
+!
+!--             Bott-Chlond scheme always uses Euler time step when leapfrog is
+!--             switched on. Thus:
+                sat = 1.0
+                sbt = 1.0
+             ENDIF
              tend = 0.0
              CALL advec_s_bc( e, 'e' )
           ELSE
-             sat = tsc(1)
-             sbt = tsc(2)
              IF ( tsc(2) /= 2.0 )  THEN
                 IF ( scalar_advec == 'ups-scheme' )  THEN