Changeset 1822 for palm/trunk/SOURCE/mod_particle_attributes.f90

Timestamp:

Apr 7, 2016 7:49:42 AM (8 years ago)

Author:

hoffmann

Message:

changes in LPM and bulk cloud microphysics

File:

• palm/trunk/SOURCE/mod_particle_attributes.f90 (modified) (5 diffs)

palm/trunk/SOURCE/mod_particle_attributes.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
+! +collision_algorithm, all_or_nothing, average_impact
 ! 
-! 
+! Tails removed.
+!
 ! Former revisions:
 ! -----------------
@@ -47 +49 @@
     USE kinds
 
-    CHARACTER(LEN=15) ::  bc_par_lr = 'cyclic',  bc_par_ns = 'cyclic',         &
-                          bc_par_b  = 'reflect', bc_par_t  = 'absorb',         &
-                          collision_kernel = 'none'
+    CHARACTER(LEN=15) ::  bc_par_lr = 'cyclic'                    !< left/right boundary condition
+    CHARACTER(LEN=15) ::  bc_par_ns = 'cyclic'                    !< north/south boundary condition
+    CHARACTER(LEN=15) ::  bc_par_b  = 'reflect'                   !< bottom boundary condition
+    CHARACTER(LEN=15) ::  bc_par_t  = 'absorb'                    !< top boundary condition
+    CHARACTER(LEN=15) ::  collision_algorithm = 'all_or_nothing'  !< collision algorithm
+    CHARACTER(LEN=15) ::  collision_kernel = 'none'               !< collision kernel
 
-    INTEGER(iwp) ::  deleted_particles = 0, deleted_tails = 0,                 &
+    INTEGER(iwp) ::  deleted_particles = 0,                                    &
                      dissipation_classes = 10, ibc_par_lr,                     &
                      ibc_par_ns, ibc_par_b, ibc_par_t, iran_part = -1234567,   &
                      maximum_number_of_particles = 0,                          &
-                     maximum_number_of_tailpoints = 100,                       &
-                     maximum_number_of_tails = 0,                              &
                      min_nr_particle = 50,                                     &
                      mpi_particle_type,                                        &
                      number_of_particles = 0,                                  &
-                     number_of_particle_groups = 1, number_of_tails = 0,       &
-                     number_of_initial_tails = 0, number_of_sublayers = 20,    &
+                     number_of_particle_groups = 1,                            &
+                     number_of_sublayers = 20,                                 &
                      offset_ocean_nzt = 0,                                     &
                      offset_ocean_nzt_m1 = 0, particles_per_point = 1,         &
                      particle_file_count = 0, radius_classes = 20,             &
-                     skip_particles_for_tail = 100, sort_count = 0,            &
-                     total_number_of_particles, total_number_of_tails = 0,     &
+                     sort_count = 0,                                           &
+                     total_number_of_particles,                                &
                      trlp_count_sum, trlp_count_recv_sum, trrp_count_sum,      &
                      trrp_count_recv_sum, trsp_count_sum, trsp_count_recv_sum, &
@@ -73 +76 @@
     INTEGER(iwp), PARAMETER ::  max_number_of_particle_groups = 10
 
-    INTEGER(iwp), DIMENSION(:), ALLOCATABLE     ::  new_tail_id
     INTEGER(iwp), DIMENSION(:,:,:), ALLOCATABLE ::  prt_count
 
-    LOGICAL ::  hall_kernel = .FALSE., palm_kernel = .FALSE.,                  &
+    LOGICAL ::  all_or_nothing = .FALSE., average_impact = .FALSE.,            &
+                hall_kernel = .FALSE., palm_kernel = .FALSE.,                  &
                 particle_advection = .FALSE., random_start_position = .FALSE., &
                 read_particles_from_restartfile = .TRUE.,                      &
                 seed_follows_topography = .FALSE.,                             &
                 uniform_particles = .TRUE., use_kernel_tables = .FALSE.,       &
-                use_particle_tails = .FALSE., use_sgs_for_particles = .FALSE., &
-                wang_kernel = .FALSE., write_particle_statistics = .FALSE.
+                use_sgs_for_particles = .FALSE., wang_kernel = .FALSE.,        &
+                write_particle_statistics = .FALSE.
 
     LOGICAL, DIMENSION(max_number_of_particle_groups) ::                       &
                 vertical_particle_advection = .TRUE.
 
-    LOGICAL, DIMENSION(:), ALLOCATABLE ::  tail_mask
-
     REAL(wp) ::  alloc_factor = 20.0_wp, c_0 = 3.0_wp,                         &
                  dt_min_part = 0.0002_wp, dt_prel = 9999999.9_wp,              &
                  dt_write_particle_data = 9999999.9_wp,                        &
-                 dvrp_psize = 9999999.9_wp, end_time_prel = 9999999.9_wp,      &
+                 end_time_prel = 9999999.9_wp,                                 &
                  initial_weighting_factor = 1.0_wp,                            &
-                 maximum_tailpoint_age = 100000.0_wp,                          &
-                 minimum_tailpoint_distance = 0.0_wp,                          &
                  particle_advection_start = 0.0_wp,                            &
                  sgs_wfu_part = 0.3333333_wp, sgs_wfv_part = 0.3333333_wp,     &
@@ -108 +107 @@
                  pss = 9999999.9_wp, pst = 9999999.9_wp, radius = 9999999.9_wp
 
-    REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  particle_tail_coordinates
-
     REAL(wp), DIMENSION(:), ALLOCATABLE     ::  log_z_z0
 
     TYPE particle_type
         SEQUENCE
-#if defined( __twocachelines )
-        REAL(wp)     ::  radius
-        REAL(sp)     ::  x, y, z, speed_x, speed_y, speed_z
-        REAL(wp)     ::  weight_factor, rvar1, dt_sum
-        INTEGER(iwp) ::  class
-        LOGICAL      ::  particle_mask
-
-        REAL(wp)     ::  dvrp_psize, rvar2, rvar3
-        REAL(sp)     ::  age, origin_x, origin_y, origin_z, e_m, age_m
-        INTEGER(iwp) ::  group, tailpoints, tail_id, block_nr
-#else
         REAL(wp)     ::  radius, age, age_m, dt_sum, dvrp_psize, e_m,          &
                          origin_x, origin_y, origin_z, rvar1, rvar2, rvar3,    &
@@ -131 +117 @@
         LOGICAL      ::  particle_mask
         INTEGER(iwp) ::  block_nr
-#endif
-!-- One 32 Bit word for 64 Bit alignment in Type declaration
     END TYPE particle_type
 
-    TYPE(particle_type), DIMENSION(:), POINTER             ::  particles
-    TYPE(particle_type)                                    ::  zero_particle
+    TYPE(particle_type), DIMENSION(:), POINTER ::  particles
+    TYPE(particle_type)                        ::  zero_particle
 
     TYPE particle_groups_type