Changeset 116 for palm/trunk/SOURCE

Timestamp:

Oct 11, 2007 2:30:27 AM (17 years ago)

Author:

raasch

Message:

further preliminary updates concerning particle sorting and documentation

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (1 diff)
• advec_particles.f90 (modified) (3 diffs)
• check_parameters.f90 (modified) (2 diffs)
• init_grid.f90 (modified) (1 diff)
• modules.f90 (modified) (3 diffs)
• package_parin.f90 (modified) (1 diff)
• read_var_list.f90 (modified) (3 diffs)
• write_var_list.f90 (modified) (3 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -7 +7 @@
 (user_interface).
 
-init_grid, init_pegrid, modules, user_interface
+Frequence of sorting particles can be controlled with new particles_par
+parameter dt_sort_particles. Sorting is moved from the SGS timestep loop in
+advec_particles after the end of this loop.
+
+advec_particles, check_parameters, init_grid, init_pegrid, modules, package_parin, read_var_list, user_interface, write_var_list
 
 

palm/trunk/SOURCE/advec_particles.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! Sorting of particles is controlled by dt_sort_particles and moved from
+! the SGS timestep loop after the end of this loop.
 ! Bugfix: pleft/pright changed to pnorth/psouth in sendrecv of particle tail
 ! numbers along y
@@ -3254 +3256 @@
 !    ENDDO
 
-!
-!--    Sort particles in the sequence the gridboxes are stored in the memory
-       CALL sort_particles
-
 !    WRITE ( 9, * ) '*** advec_particles: ##9'
 !    CALL local_flush( 9 )
@@ -3286 +3284 @@
 
     ENDDO   ! timestep loop
+
+
+!
+!-- Sort particles in the sequence the gridboxes are stored in the memory
+    time_sort_particles = time_sort_particles + dt_3d
+    IF ( time_sort_particles >= dt_sort_particles )  THEN
+       CALL sort_particles
+       time_sort_particles = MOD( time_sort_particles, &
+                                  MAX( dt_sort_particles, dt_3d ) )
+    ENDIF
 
 

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! Multigrid solver allows topography
+! Multigrid solver allows topography, checking of dt_sort_particles
 !
 ! Former revisions:
@@ -1500 +1500 @@
 
 !
+!-- Check the interval for sorting particles.
+!-- Using particles as cloud droplets requires sorting after each timestep.
+    IF ( dt_sort_particles /= 0.0  .AND.  cloud_droplets )  THEN
+       dt_sort_particles = 0.0
+       IF ( myid == 0 )  THEN
+          PRINT*, '+++ WARNING: check_parameters:'
+          PRINT*, '    dt_sort_particles is reset to 0.0 because ', &
+                       'of cloud_droplets = .TRUE.'
+       ENDIF
+    ENDIF
+
+!
 !-- Set the default intervals for data output, if necessary
 !-- NOTE: dt_dosp has already been set in package_parin

palm/trunk/SOURCE/init_grid.f90

@@ -789 +789 @@
 !--       Bit 4:  wall to the left
 !--       Bit 5:  wall to the right
-!--       Bit 6:  inside / outside building (1/0)
+!--       Bit 6:  inside building
 
           flags = 0

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Actual revisions:
 ! -----------------
-! +flags, wall_flags_1..10
+! +dt_sort_particles, time_sort_particles, flags, wall_flags_1..10
 !
 ! Former revisions:
@@ -876 +876 @@
     LOGICAL, DIMENSION(:), ALLOCATABLE ::  particle_mask, tail_mask
 
-    REAL    ::  c_0 = 3.0, dt_min_part = 0.0002,                               &
+    REAL    ::  c_0 = 3.0, dt_min_part = 0.0002, dt_sort_particles = 0.0,      &
                 dt_write_particle_data = 9999999.9, dvrp_psize = 9999999.9,    &
                 end_time_prel = 9999999.9, initial_weighting_factor = 1.0,     &
@@ -883 +883 @@
                 particle_advection_start = 0.0, sgs_wfu_part = 0.3333333,      &
                 sgs_wfv_part = 0.3333333, sgs_wfw_part = 0.3333333,            &
-                time_write_particle_data = 0.0
+                time_sort_particles = 0.0, time_write_particle_data = 0.0
 
     REAL, DIMENSION(max_number_of_particle_groups) ::  &

palm/trunk/SOURCE/package_parin.f90

@@ -45 +45 @@
     NAMELIST /particles_par/      bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,    &
                                   density_ratio, radius, dt_dopts,             &
-                                  dt_min_part, dt_prel,                        &
+                                  dt_min_part, dt_prel, dt_sort_particles,     &
                                   dt_write_particle_data, dvrp_psize,          &
                                   end_time_prel, initial_weighting_factor,     &

palm/trunk/SOURCE/read_var_list.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +time_sort_particles
 !
 ! Former revisions:
@@ -46 +46 @@
     USE indices
     USE model_1d
+    USE particle_attributes
     USE pegrid
     USE profil_parameter
@@ -395 +396 @@
           CASE ( 'time_run_control' )
              READ ( 13 )  time_run_control
+          CASE ( 'time_sort_particles' )
+             READ ( 13 )  time_sort_particles
           CASE ( 'timestep_scheme' )
              READ ( 13 )  timestep_scheme

palm/trunk/SOURCE/write_var_list.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +time_sort_particles
 !
 ! Former revisions:
@@ -46 +46 @@
     USE indices
     USE model_1d
+    USE particle_attributes
     USE pegrid
     USE profil_parameter
@@ -341 +342 @@
     WRITE ( 14 )  'time_run_control              '
     WRITE ( 14 )  time_run_control
+    WRITE ( 14 )  'time_sort_particles           '
+    WRITE ( 14 )  time_sort_particles
     WRITE ( 14 )  'timestep_scheme               '
     WRITE ( 14 )  timestep_scheme