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

Timestamp:

Mar 15, 2012 10:35:09 AM (12 years ago)

Author:

raasch

Message:

Changed:

---

Original routine advec_particles split into several new subroutines and renamed
lpm.
init_particles renamed lpm_init
user_advec_particles renamed user_lpm_advec,
particle_boundary_conds renamed lpm_boundary_conds,
set_particle_attributes renamed lpm_set_attributes,
user_init_particles renamed user_lpm_init,
user_particle_attributes renamed user_lpm_set_attributes
(Makefile, lpm_droplet_collision, lpm_droplet_condensation, init_3d_model, modules, palm, read_var_list, time_integration, write_var_list, deleted: advec_particles, init_particles, particle_boundary_conds, set_particle_attributes, user_advec_particles, user_init_particles, user_particle_attributes, new: lpm, lpm_advec, lpm_boundary_conds, lpm_calc_liquid_water_content, lpm_data_output_particles, lpm_droplet_collision, lpm_drollet_condensation, lpm_exchange_horiz, lpm_extend_particle_array, lpm_extend_tails, lpm_extend_tail_array, lpm_init, lpm_init_sgs_tke, lpm_pack_arrays, lpm_read_restart_file, lpm_release_set, lpm_set_attributes, lpm_sort_arrays, lpm_write_exchange_statistics, lpm_write_restart_file, user_lpm_advec, user_lpm_init, user_lpm_set_attributes

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! advec_particles renamed lpm, first_call_advec_particles renamed first_call_lpm
 !
 ! Former revisions:
@@ -182 +182 @@
 
 !
-!--       Particle advection (only once during intermediate steps, because
-!--       it uses an Euler-step)
+!--       Particle transport/physics with the Lagrangian particle model
+!--       (only once during intermediate steps, because it uses an Euler-step)
           IF ( particle_advection  .AND.                         &
                simulated_time >= particle_advection_start  .AND. &
                intermediate_timestep_count == 1 )  THEN
-             CALL advec_particles
-             first_call_advec_particles = .FALSE.
+             CALL lpm
+             first_call_lpm = .FALSE.
           ENDIF
 
@@ -358 +358 @@
        ENDIF
        time_dots          = time_dots        + dt_3d
-       IF ( .NOT. first_call_advec_particles )  THEN
+       IF ( .NOT. first_call_lpm )  THEN
           time_dopts      = time_dopts       + dt_3d
        ENDIF
@@ -552 +552 @@
           IF ( time_dopts >= dt_dopts  .OR. &
                ( simulated_time >= particle_advection_start  .AND. &
-                 first_call_advec_particles ) )  THEN
+                 first_call_lpm ) )  THEN
              CALL data_output_ptseries
              time_dopts = MOD( time_dopts, MAX( dt_dopts, dt_3d ) )