Changeset 2709 for palm/trunk/SOURCE

Timestamp:

Dec 19, 2017 12:49:40 PM (7 years ago)

Author:

suehring

Message:

Bugfixes in CFL check; non-allocated array used in 1D decomposition

File:

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

palm/trunk/SOURCE/lpm_exchange_horiz.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix in CFL check.
+! Further bugfix, non-allocated array used in case of 1D decomposition.
 ! 
 ! Former revisions:
@@ -441 +442 @@
 !      
 !--    This MPI_SENDRECV should work even with odd mixture on 32 and 64 Bit 
-!--    variables in structure particle_type (due to the calculation of par_size)
+!--    variables in structure particle_type (due to the calculation of par_size).
+!--    Please note, in case of 1D decomposition ( only 1 core along 
+!--    x dimension), array trlp is not allocated, leading to program crash. 
+!--    Hence, check if array is allocated and allocate it temporarily if 
+!--    if required.
+       IF ( .NOT. ALLOCATED( trlp ) )  ALLOCATE( trlp(1:1) )
+
        par_size = c_sizeof(trlp(1))
 #endif
@@ -1130 +1137 @@
     IMPLICIT NONE
     
-    INTEGER(iwp)  ::  i
-    INTEGER(iwp)  ::  j
-    INTEGER(iwp)  ::  k
-    INTEGER(iwp)  ::  n
-    
+    INTEGER(iwp)  ::  i !< running index, x-direction
+    INTEGER(iwp)  ::  j !< running index, y-direction
+    INTEGER(iwp)  ::  k !< running index, z-direction
+    INTEGER(iwp)  ::  n !< running index, number of particles
+
     DO  i = nxl, nxr
        DO  j = nys, nyn
@@ -1142 +1149 @@
              particles => grid_particles(k,j,i)%particles(1:number_of_particles)         
              DO n = 1, number_of_particles
-                IF(ABS(particles(n)%speed_x) >                                 &
-                   (dx/(particles(n)%age-particles(n)%age_m))  .OR.            &
-                   ABS(particles(n)%speed_y) >                                 & 
-                   (dx/(particles(n)%age-particles(n)%age_m))  .OR.            &
-                   ABS(particles(n)%speed_z) >                                 &
-                   ((zw(k)-zw(k-1))/(particles(n)%age-particles(n)%age_m))) THEN
-                   WRITE( message_string, * )                                  &
-                   'Particle violated CFL-criterion: particle with id ',       &
-                   particles(n)%id,' will be deleted!'   
-                   CALL message( 'lpm_check_cfl', 'PA0475', 0, 1, 0, 6, 0 )
-                   particles(n)%particle_mask= .FALSE.
+!
+!--             Note, check for CFL does not work at first particle timestep 
+!--             when both, age and age_m are zero. 
+                IF ( particles(n)%age - particles(n)%age_m > 0.0_wp )  THEN  
+                   IF(ABS(particles(n)%speed_x) >                              &
+                      (dx/(particles(n)%age-particles(n)%age_m))  .OR.         &
+                      ABS(particles(n)%speed_y) >                              & 
+                      (dy/(particles(n)%age-particles(n)%age_m))  .OR.         &
+                      ABS(particles(n)%speed_z) >                              &
+                      ((zw(k)-zw(k-1))/(particles(n)%age-particles(n)%age_m))) &
+                   THEN
+                      WRITE( message_string, * )                               &
+                      'Particle violated CFL-criterion: particle with id ',    &
+                      particles(n)%id,' will be deleted!'   
+                      CALL message( 'lpm_check_cfl', 'PA0475', 0, 1, 0, 6, 0 )
+                      particles(n)%particle_mask= .FALSE.
+                   ENDIF
                 ENDIF
              ENDDO