Changeset 1416 for palm/trunk/SOURCE

Timestamp:

Jun 4, 2014 4:04:03 PM (10 years ago)

Author:

suehring

Message:

Bugfixes concerning new particle structure

Location:

palm/trunk/SOURCE

Files:

• lpm.f90 (modified) (3 diffs)
• user_lpm_advec.f90 (modified) (3 diffs)
• user_lpm_init.f90 (modified) (2 diffs)

palm/trunk/SOURCE/lpm.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! user_lpm_advec is called for each gridpoint.
+! Bugfix: in order to prevent an infinite loop, time_loop_done is set .TRUE. 
+! at the head of the do-loop.  
 ! 
 ! Former revisions:
@@ -223 +225 @@
        CALL cpu_log( log_point_s(44), 'lpm_advec', 'start' )
        CALL cpu_log( log_point_s(44), 'lpm_advec', 'pause' )
+       
+       grid_particles(:,:,:)%time_loop_done = .TRUE.
 !
 !--    If particle advection includes SGS velocity components, calculate the
@@ -287 +291 @@
 !--             User-defined actions after the calculation of the new particle 
 !--             position
-                CALL user_lpm_advec
+                CALL user_lpm_advec(i,j,k)
 !
 !--             Apply boundary conditions to those particles that have crossed 

palm/trunk/SOURCE/user_lpm_advec.f90

@@ -1 @@
- SUBROUTINE user_lpm_advec
+ SUBROUTINE user_lpm_advec( ip, jp, kp )
 
 !--------------------------------------------------------------------------------!
@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Provide template for new particle structure.
+! Moreover, user_lpm_advec is called for each gridpoint.
 ! 
 ! Former revisions:
@@ -65 +66 @@
 !
 !-- Here the user-defined actions follow
-!     DO  ip = nxl, nxr
-!        DO  jp = nys, nyn
-!           DO  kp = nzb+1, nzt
-!              number_of_particles = prt_count(kp,jp,ip)
-!              particles => grid_particles(kp,jp,ip)%particles(1:number_of_particles)
-!              IF ( number_of_particles <= 0 )  CYCLE
-!              DO  n = 1, number_of_particles
+!   number_of_particles = prt_count(kp,jp,ip)
+!   particles => grid_particles(kp,jp,ip)%particles(1:number_of_particles)
+!   IF ( number_of_particles <= 0 )  CYCLE
+!   DO  n = 1, number_of_particles
 !
-!              ENDDO
-!           ENDDO
-!        ENDDO
-!     ENDDO
-    
+!   ENDDO
 
  END SUBROUTINE user_lpm_advec

palm/trunk/SOURCE/user_lpm_init.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! load module indices
 ! 
 ! Former revisions:
@@ -49 +49 @@
 ! Modification of initial particles by the user.
 !------------------------------------------------------------------------------!
+    USE indices
 
     USE kinds