Changeset 2312 for palm/trunk/SOURCE/package_parin.f90

Timestamp:

Jul 14, 2017 8:26:51 PM (7 years ago)

Author:

hoffmann

Message:

various improvements of the LCM

File:

• palm/trunk/SOURCE/package_parin.f90 (modified) (12 diffs)

palm/trunk/SOURCE/package_parin.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
-! 
+!
+!
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Aerosol initialization improved.
+!
+! 2263 2017-06-08 14:59:01Z schwenkel
 ! Implemented splitting and merging algorithm
-! 
+!
 ! 2183 2017-03-17 14:29:15Z schwenkel
 !
 ! 2182 2017-03-17 14:27:40Z schwenkel
 ! Added parameters for simplified particle initialization.
-! 
+!
 ! 2000 2016-08-20 18:09:15Z knoop
 ! Forced header and separation lines into 80 columns
-! 
+!
 ! 1936 2016-06-13 13:37:44Z suehring
 ! +deallocate_memory, step_dealloc
-! 
+!
 ! 1871 2016-04-15 11:46:09Z hoffmann
 ! Initialization of aerosols added.
-! 
+!
 ! 1833 2016-04-07 14:23:03Z raasch
 ! reading of spectra_par moved to spectra_mod
-! 
+!
 ! 1831 2016-04-07 13:15:51Z hoffmann
 ! curvature_solution_effects added
@@ -50 +53 @@
 ! Reading of &radiation_par moved to radiation_model_mod.
 ! Reading of &canopy_par moved to plant_canopy_model_mod.
-! 
+!
 ! 822 2016-04-07 07:49:42Z hoffmann
 ! +collision_algorithm
@@ -57 +60 @@
 ! 1817 2016-04-06 15:44:20Z maronga
 ! Reading of &lsm_par moved to land_surface_model_mod.
-! 
+!
 ! 1788 2016-03-10 11:01:04Z maronga
 ! Parameter dewfall removed.
@@ -66 +69 @@
 ! 1757 2016-02-22 15:49:32Z maronga
 ! Added parameter unscheduled_radiation_calls
-! 
+!
 ! 1691 2015-10-26 16:17:44Z maronga
 ! Added skip_time_do_lsm, skip_time_do_radiation, and emissivity
-! 
+!
 ! 1682 2015-10-07 23:56:08Z knoop
-! Code annotations made doxygen readable 
-! 
+! Code annotations made doxygen readable
+!
 ! 1585 2015-04-30 07:05:52Z maronga
 ! Added several radiation_par parameters
@@ -81 +84 @@
 ! 1553 2015-03-03 17:33:54Z maronga
 ! Resorting of lsm_par
-! 
+!
 ! 1551 2015-03-03 14:18:16Z maronga
 ! Several changes in the liste for land surface model and radiation model
-! 
+!
 ! 1496 2014-12-02 17:25:50Z maronga
 ! Added support for the land surface model and radiation scheme
-! 
+!
 ! 1484 2014-10-21 10:53:05Z kanani
 ! Changes due to new module structure of the plant canopy model:
 !   module plant_canopy_model_mod added,
-!   new package/namelist canopy_par added, i.e. the canopy model is no longer 
+!   new package/namelist canopy_par added, i.e. the canopy model is no longer
 !   steered over the inipar-namelist,
 !   drag_coefficient, leaf_surface_concentration and scalar_exchange_coefficient
 !   renamed to canopy_drag_coeff, leaf_surface_conc and leaf_scalar_exch_coeff.
 ! Changed statement tags in CONTINUE-statement
-! 
+!
 ! 1367 2014-04-23 15:18:30Z witha
 ! Bugfix: module kinds must be used
@@ -103 +106 @@
 ! +alloc_factor, + min_nr_particle
 ! -dt_sort_particles, -maximum_number_of_particles
-! 
+!
 ! 1340 2014-03-25 19:45:13Z kanani
 ! REAL constants defined as wp-kinds
@@ -138 +141 @@
 !> software packages which are used optionally in the run.
 !>
-!> @todo Perform all actions in the respective submodules and remove 
+!> @todo Perform all actions in the respective submodules and remove
 !>       package_parin
 !------------------------------------------------------------------------------!
  SUBROUTINE package_parin
- 
+
 
     USE control_parameters,                                                    &
@@ -165 +168 @@
 
     USE particle_attributes,                                                   &
-        ONLY:  alloc_factor, bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,         &
-               collision_algorithm, collision_kernel,                          &
+        ONLY:  aero_type, aero_weight, alloc_factor, bc_par_b, bc_par_lr,      &
+               bc_par_ns, bc_par_t, collision_kernel,                          &
                curvature_solution_effects, deallocate_memory, density_ratio,   &
                dissipation_classes, dt_min_part, dt_prel,                      &
                dt_write_particle_data, end_time_prel, initial_weighting_factor,&
-               init_aerosol_probabilistic, max_number_particles_per_gridbox,   & 
-               merging, min_nr_particle, monodisperse_aerosols, n1, n2, n3,    &
+               log_sigma, max_number_particles_per_gridbox,                    &
+               merging, min_nr_particle, na,                                   &
                number_concentration, number_of_particle_groups,                &
                number_particles_per_gridbox, particles_per_point,              &
@@ -177 +180 @@
                psb, psl, psn, psr, pss, pst, radius, radius_classes,           &
                radius_merge, radius_split, random_start_position,              &
-               read_particles_from_restartfile, rm1, rm2, rm3,                 &
-               seed_follows_topography, splitting, splitting_factor,           & 
+               read_particles_from_restartfile, rm,                            &
+               seed_follows_topography, splitting, splitting_factor,           &
                splitting_factor_max, splitting_function, splitting_mode,       &
-               step_dealloc, s1, s2, s3, use_sgs_for_particles,                &
+               step_dealloc, use_sgs_for_particles,                            &
                vertical_particle_advection, weight_factor_merge,               &
-               weight_factor_split, write_particle_statistics                
+               weight_factor_split, write_particle_statistics
 
     IMPLICIT NONE
@@ -206 +209 @@
                                   vc_size_y, vc_size_z
 
-    NAMELIST /particles_par/      alloc_factor, bc_par_b, bc_par_lr,           &
-                                  bc_par_ns, bc_par_t, collision_algorithm,    &
+    NAMELIST /particles_par/      aero_type, aero_weight, alloc_factor,        &
+                                  bc_par_b, bc_par_lr,                         &
+                                  bc_par_ns, bc_par_t,                         &
                                   collision_kernel, curvature_solution_effects,&
                                   deallocate_memory, density_ratio,            &
@@ -214 +218 @@
                                   dt_write_particle_data,                      &
                                   end_time_prel, initial_weighting_factor,     &
-                                  init_aerosol_probabilistic,                  &
+                                  log_sigma,                                   &
                                   max_number_particles_per_gridbox, merging,   &
-                                  min_nr_particle, monodisperse_aerosols,      &
-                                  n1, n2, n3, number_concentration,            &
+                                  min_nr_particle,                             &
+                                  na, number_concentration,                    &
                                   number_of_particle_groups,                   &
                                   number_particles_per_gridbox,                &
@@ -224 +228 @@
                                   particle_maximum_age, pdx, pdy, pdz, psb,    &
                                   psl, psn, psr, pss, pst, radius,             &
-                                  radius_classes, radius_merge, radius_split,  &   
+                                  radius_classes, radius_merge, radius_split,  &
                                   random_start_position,                       &
-                                  read_particles_from_restartfile,             &
-                                  rm1, rm2, rm3,                               &
+                                  read_particles_from_restartfile, rm,         &
                                   seed_follows_topography,                     &
                                   splitting, splitting_factor,                 &
                                   splitting_factor_max, splitting_function,    &
-                                  splitting_mode, step_dealloc, s1, s2, s3,    &
+                                  splitting_mode, step_dealloc,                &
                                   use_sgs_for_particles,                       &
                                   vertical_particle_advection,                 &