Changeset 3560 for palm/trunk/SOURCE/lpm.f90

Timestamp:

Nov 23, 2018 9:20:21 AM (6 years ago)

Author:

raasch

Message:

bugfix to guarantee correct particle releases in case that the release interval is smaller than the model timestep

File:

• palm/trunk/SOURCE/lpm.f90 (modified) (4 diffs)

palm/trunk/SOURCE/lpm.f90

@@ -27 +27 @@
 ! -----------------
 ! $Id$
+! bugfix to guarantee correct particle releases in case that the release
+! interval is smaller than the model timestep
+! 
+! 2801 2018-02-14 16:01:55Z thiele
 ! Changed lpm from subroutine to module.
 ! Introduce particle transfer in nested models.
@@ -172 +176 @@
     USE particle_attributes,                                                   &
         ONLY:  collision_kernel, deleted_particles, deallocate_memory,         &
-               dt_write_particle_data, dt_prel, end_time_prel,                 &
-               grid_particles, merging,  number_of_particles,                  &
+               dt_write_particle_data, dt_prel, end_time_prel, grid_particles, &
+               last_particle_release_time, merging, number_of_particles,       &
                number_of_particle_groups, particles, particle_groups,          &
-               prt_count, splitting, step_dealloc, time_prel,                  &
-               time_write_particle_data, trlp_count_sum, trlp_count_recv_sum,  &
-               trnp_count_sum, trnp_count_recv_sum, trrp_count_sum,            & 
-               trrp_count_recv_sum, trsp_count_sum, trsp_count_recv_sum,       &
-               use_sgs_for_particles, write_particle_statistics
+               prt_count, splitting, step_dealloc, time_write_particle_data,   &
+               trlp_count_sum, trlp_count_recv_sum, trnp_count_sum,            &
+               trnp_count_recv_sum, trrp_count_sum, trrp_count_recv_sum,       &
+               trsp_count_sum, trsp_count_recv_sum, use_sgs_for_particles,     &
+               write_particle_statistics
                               
     USE pegrid
@@ -274 +278 @@
 !
 !-- If necessary, release new set of particles
-    IF ( time_prel >= dt_prel  .AND.  end_time_prel > simulated_time )  THEN
-
-       CALL lpm_create_particle(PHASE_RELEASE)
-!
-!--    The MOD function allows for changes in the output interval with
-!--    restart runs.
-       time_prel = MOD( time_prel, MAX( dt_prel, dt_3d ) )
+    IF ( ( simulated_time - last_particle_release_time ) >= dt_prel  .AND. end_time_prel > simulated_time ) &
+    THEN
+
+       DO WHILE ( ( simulated_time - last_particle_release_time ) >= dt_prel )
+
+          CALL lpm_create_particle( phase_release )
+          last_particle_release_time = last_particle_release_time + dt_prel
+
+       ENDDO
 
     ENDIF
@@ -429 +435 @@
 
 !
-!--    Increment time since last release
-       IF ( dt_3d_reached )  time_prel = time_prel + dt_3d
-!
 !--    Apply splitting and merging algorithm
        IF ( cloud_droplets )  THEN