Changeset 262 for palm/trunk/SOURCE

Timestamp:

Mar 18, 2009 8:32:37 AM (16 years ago)

Author:

raasch

Message:

further updates for dvr output, bugfix in advec_particles concerning particle boundary condition

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (1 diff)
• advec_particles.f90 (modified) (2 diffs)
• data_output_dvrp.f90 (modified) (4 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -45 +45 @@
 ------
 
+Bugfix: error in check, if particles moved further than one subdomain length.
+This check must not be applied for newly released particles. (advec_particles)
+
 Bugfix: several tail counters are initialized, particle_tail_coordinates is
 only written to file if its third index is > 0, arrays for tails are allocated

palm/trunk/SOURCE/advec_particles.f90

@@ -5 +5 @@
 ! -----------------
 ! Output of messages replaced by message handling routine
+! Bugfix: error in check, if particles moved further than one subdomain length.
+!         This check must not be applied for newly released particles
 ! Bugfix: several tail counters are initialized, particle_tail_coordinates is
 ! only written to file if its third index is > 0
@@ -3066 +3068 @@
 !
 !--       Stop if particles have moved further than the length of one 
-!--       PE subdomain
-          IF ( ABS(particles(n)%speed_x) >                                  & 
-               ((nxr-nxl+2)*dx)/(particles(n)%age-particles(n)%age_m)  .OR. &
-               ABS(particles(n)%speed_y) >                                  &
-               ((nyn-nys+2)*dy)/(particles(n)%age-particles(n)%age_m) )  THEN
-
-               WRITE( message_string, * )  'particle too fast.  n = ',  n 
-               CALL message( 'advec_particles', 'PA0148', 2, 2, 0, 6, 0 )
+!--       PE subdomain (newly released particles have age = age_m!)
+          IF ( particles(n)%age /= particles(n)%age_m )  THEN
+             IF ( ABS(particles(n)%speed_x) >                                  &
+                  ((nxr-nxl+2)*dx)/(particles(n)%age-particles(n)%age_m)  .OR. &
+                  ABS(particles(n)%speed_y) >                                  &
+                  ((nyn-nys+2)*dy)/(particles(n)%age-particles(n)%age_m) )  THEN
+
+                  WRITE( message_string, * )  'particle too fast.  n = ',  n 
+                  CALL message( 'advec_particles', 'PA0148', 2, 2, 0, 6, 0 )
+             ENDIF
           ENDIF
 

palm/trunk/SOURCE/data_output_dvrp.f90

@@ -32 +32 @@
 ! Current revisions:
 ! -----------------
-! Output of messages replaced by message handling routine.
+! Clipping of dvr-output implemented,
+! output of messages replaced by message handling routine.
 ! TEST: different colours for isosurfaces
 !
@@ -167 +168 @@
 !--       number of particles and tails to be plotted; otherwise, all
 !--       particles/tails are plotted. dvrp_mask is used to mark the partikles.
-          IF ( .NOT. use_particle_tails )  THEN
+!          IF ( .NOT. use_particle_tails )  THEN
              ALLOCATE( dvrp_mask(number_of_particles) )
-          ELSE
-             ALLOCATE( dvrp_mask(number_of_tails*maximum_number_of_tailpoints) )
-          ENDIF
+!          ELSE
+!             ALLOCATE( dvrp_mask(number_of_tails*maximum_number_of_tailpoints) )
+!          ENDIF
           dvrp_mask = .TRUE.
           IF ( dvrp_total_overlap )  THEN
@@ -202 +203 @@
                             dvrp_not = dvrp_not + 1
                          ELSE
-                            dvrp_mask(k) = .FALSE.
+                            dvrp_mask(n) = .FALSE.
                          ENDIF
                       ENDIF
@@ -532 +533 @@
              CALL DVRP_DATA( m-1, local_pf, 1, nx_dvrp, ny_dvrp, nz_dvrp, &
                              cyclic_dvrp, cyclic_dvrp, cyclic_dvrp )
-!             CALL DVRP_SLICER( m-1, section_mode, slicer_position )
-             tmp_pos = 1.0
-             CALL DVRP_SLICER( m-1, 2, tmp_pos )
+             tmp_pos = slicer_position
+             CALL DVRP_SLICER( m-1, section_mode, tmp_pos )
+!             tmp_pos = 1.0
+!             CALL DVRP_SLICER( m-1, 2, tmp_pos )
              WRITE (9,*) 'nx_dvrp=', nx_dvrp
              WRITE (9,*) 'ny_dvrp=', ny_dvrp