Changeset 825 for palm/trunk/SOURCE/modules.f90

Timestamp:

Feb 19, 2012 3:03:44 AM (12 years ago)

Author:

raasch

Message:

New:
---

droplet growth by condensation may include curvature and solution effects.
Steered by new inipar-parameter curvature_solution_effects.
(advec_particles, check_parameters, header, init_cloud_physics, init_particles, modules, parin, read_var_list, write_var_list)

mean/min/max particle radius added as output quantity. (data_output_ptseries, modules)

Changed:

---

Initialisation of temporary particle array for resorting removed.
(advec_particles)

particle attributes speed_x|y|z_sgs renamed rvar1|2|3.
(advec_particles, data_output_ptseries, modules, init_particles, particle_boundary_conds)

routine wang_kernel and respective module renamed lpm_collision_kernels.
Package (particle) parameters wang_collision_kernel and turbulence_effects_on_collision
replaced by parameter collision_kernel.
(Makefile, advec_particles, check_parameters, diffusion_e, init_3d_model, modules, package_parin, time_integration, new: lpm_collision_kernels, deleted: wang_kernel)

Errors:

---

File:

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

palm/trunk/SOURCE/modules.f90

@@ -6 +6 @@
 ! +bfactor, curvature_solution_effects, eps_ros, molecular_weight_of_water,
 ! vanthoff, -b_cond in cloud_parameters,
-! dopts_num increased to 27, particle attributes speed_x|y|z_sgs renamed
+! dopts_num increased to 29, particle attributes speed_x|y|z_sgs renamed
 ! rvar1|2|3
+! wang_collision_kernel and turbulence_effects_on_collision replaced by
+! collision_kernel, hall_kernel, palm_kernel, wang_kernel
 !
 ! Former revisions:
@@ -1047 +1049 @@
 #endif
 
-    INTEGER, PARAMETER ::  dopr_norm_num = 7, dopts_num = 27, dots_max = 100
+    INTEGER, PARAMETER ::  dopr_norm_num = 7, dopts_num = 29, dots_max = 100
 
     INTEGER ::  dots_num = 23
@@ -1062 +1064 @@
           (/ 'tnpt   ', 'x_     ', 'y_     ', 'z_     ', 'z_abs  ', 'u      ', &
              'v      ', 'w      ', 'u"     ', 'v"     ', 'w"     ', 'npt_up ', &
-             'w_up   ', 'w_down ', 'radius ', 'npt_max', 'npt_min', 'x*2    ', &
-             'y*2    ', 'z*2    ', 'u*2    ', 'v*2    ', 'w*2    ', 'u"2    ', &
-             'v"2    ', 'w"2    ', 'npt*2  ' /)
+             'w_up   ', 'w_down ', 'radius ', 'r_min  ', 'r_max  ', 'npt_max', &
+             'npt_min', 'x*2    ', 'y*2    ', 'z*2    ', 'u*2    ', 'v*2    ', &
+             'w*2    ', 'u"2    ', 'v"2    ', 'w"2    ', 'npt*2  ' /)
 
     CHARACTER (LEN=7), DIMENSION(dopts_num) :: dopts_unit = &
           (/ 'number ', 'm      ', 'm      ', 'm      ', 'm      ', 'm/s    ', &
              'm/s    ', 'm/s    ', 'm/s    ', 'm/s    ', 'm/s    ', 'number ', &
-             'm/s    ', 'm/s    ', 'm      ', 'number ', 'number ', 'm2     ', &
-             'm2     ', 'm2     ', 'm2/s2  ', 'm2/s2  ', 'm2/s2  ', 'm2/s2  ', &
-             'm2/s2  ', 'm2/s2  ', 'number2' /)
+             'm/s    ', 'm/s    ', 'm      ', 'm      ', 'm      ', 'number ', &
+             'number ', 'm2     ', 'm2     ', 'm2     ', 'm2/s2  ', 'm2/s2  ', &
+             'm2/s2  ', 'm2/s2  ', 'm2/s2  ', 'm2/s2  ', 'number2' /)
 
     CHARACTER (LEN=7), DIMENSION(dots_max) :: dots_label = &
@@ -1184 +1186 @@
 
     CHARACTER (LEN=15)  ::  bc_par_lr = 'cyclic',  bc_par_ns = 'cyclic', &
-                            bc_par_b  = 'reflect', bc_par_t  = 'absorb'
+                            bc_par_b  = 'reflect', bc_par_t  = 'absorb', &
+                            collision_kernel = 'none'
 
 #if defined( __parallel )
@@ -1206 +1209 @@
     INTEGER, DIMENSION(:,:,:), ALLOCATABLE ::  prt_count, prt_start_index
 
-    LOGICAL ::  turbulence_effects_on_collision = .FALSE.,                     &
+    LOGICAL ::  hall_kernel = .FALSE., palm_kernel = .FALSE.,                  &
                 particle_advection = .FALSE., random_start_position = .FALSE., &
                 read_particles_from_restartfile = .TRUE.,                      &
                 uniform_particles = .TRUE., use_particle_tails = .FALSE.,      &
                 use_sgs_for_particles = .FALSE.,                               &
-                wang_collision_kernel = .FALSE.,                               &
-                write_particle_statistics = .FALSE.
+                wang_kernel = .FALSE., write_particle_statistics = .FALSE.
 
     LOGICAL, DIMENSION(max_number_of_particle_groups) ::                       &