Changeset 2305 for palm/trunk/SOURCE/lpm_init.f90

Timestamp:

Jul 6, 2017 11:18:47 AM (7 years ago)

Author:

hoffmann

Message:

Improved calculation of particle IDs.

File:

• palm/trunk/SOURCE/lpm_init.f90 (modified) (11 diffs)

palm/trunk/SOURCE/lpm_init.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Improved calculation of particle IDs.
+! 
+! 2274 2017-06-09 13:27:48Z Giersch
 !  Changed error messages
 ! 
@@ -44 +47 @@
 ! 2182 2017-03-17 14:27:40Z schwenkel
 ! Added parameters for simplified particle initialization.
-! 
+!
 ! 2122 2017-01-18 12:22:54Z hoffmann
 ! Improved initialization of equilibrium aerosol radii 
@@ -157 +160 @@
  MODULE lpm_init_mod
  
+    USE, INTRINSIC ::  ISO_C_BINDING
 
     USE arrays_3d,                                                             &
@@ -187 +191 @@
                 ibc_par_lr, ibc_par_ns, ibc_par_t, iran_part, log_z_z0,        &
                 max_number_of_particle_groups, min_nr_particle,                &
-                mpi_particle_type, number_concentration,                       &
+                number_concentration,                                          &
                 number_particles_per_gridbox,  number_of_particles,            &
                 number_of_particle_groups, number_of_sublayers,                &
@@ -243 +247 @@
     INTEGER(iwp) ::  k                           !<
 
-#if defined( __parallel )
-    INTEGER(iwp), DIMENSION(3) ::  blocklengths  !<
-    INTEGER(iwp), DIMENSION(3) ::  displacements !<
-    INTEGER(iwp), DIMENSION(3) ::  types         !<
-#endif
-
     REAL(wp) ::  div                             !< 
     REAL(wp) ::  height_int                      !<
@@ -255 +253 @@
     REAL(wp) ::  z0_av_local                     !<
 
-#if defined( __parallel )
-!
-!-- Define MPI derived datatype for FORTRAN datatype particle_type (see module
-!-- particle_attributes). Integer length is 4 byte, Real is 8 byte
-    blocklengths(1)  = 19;  blocklengths(2)  =   6;  blocklengths(3)  =   1
-    displacements(1) =  0;  displacements(2) = 152;  displacements(3) = 176
-
-    types(1) = MPI_REAL
-    types(2) = MPI_INTEGER
-    types(3) = MPI_UB
-    CALL MPI_TYPE_STRUCT( 3, blocklengths, displacements, types, &
-                          mpi_particle_type, ierr )
-    CALL MPI_TYPE_COMMIT( mpi_particle_type, ierr )
-#endif
 
 !
@@ -541 +525 @@
 !
 !--    initialize counter for particle IDs 
-       grid_particles%id_counter = 0
+       grid_particles%id_counter = 1
 
 !
@@ -551 +535 @@
                                       0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
                                       0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,          &
-                                      0, 0, 0, 0, .FALSE., -1 )
+                                      0, 0, 0_idp, .FALSE., -1 )
 
        particle_groups = particle_groups_type( 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp )
@@ -697 +681 @@
 
                             DO  j = 1, particles_per_point
+
 
                                n = n + 1
@@ -731 +716 @@
                                tmp_particle%class         = 1
                                tmp_particle%group         = i
-                               tmp_particle%id1           = 0 
-                               tmp_particle%id2           = 0 
+                               tmp_particle%id            = 0_idp
                                tmp_particle%particle_mask = .TRUE.
                                tmp_particle%block_nr      = -1
@@ -858 +842 @@
              DO  n = local_start(kp,jp,ip), number_of_particles  !only new particles 
 
-                particles(n)%id1 = 10000_iwp * grid_particles(kp,jp,ip)%id_counter + kp
-                particles(n)%id2 = 10000_iwp * jp + ip
-
+                particles(n)%id = 10000_idp**3 * grid_particles(kp,jp,ip)%id_counter + &
+                                  10000_idp**2 * kp + 10000_idp * jp + ip
+!
+!--             Count the number of particles that have been released before
                 grid_particles(kp,jp,ip)%id_counter =                          &
                                          grid_particles(kp,jp,ip)%id_counter + 1