Changeset 276 for palm/trunk

Timestamp:

Mar 29, 2009 8:50:26 AM (16 years ago)

Author:

raasch

Message:

bugfix and change concerning particle advection

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (1 diff)
• advec_particles.f90 (modified) (15 diffs)
• init_particles.f90 (modified) (2 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -40 +40 @@
 user_parin, user_read_restart_data, user_spectra )
 
+Maximum number of tails is calculated from maximum number of particles and
+skip_particles_for_tail (init_particles)
+
 First constant in array den also defined as type double. (eqn_state_seawater)
 

palm/trunk/SOURCE/advec_particles.f90

@@ -322 +322 @@
                           ' ql_c=',ql_c(k,j,i), ' &part(',n,')%wf=', &
                           particles(n)%weight_factor,' delta_r=',delta_r
-             CALL message( 'advec_particles', 'PA0143', 2, 2, 0, 6, 1 )
+             CALL message( 'advec_particles', 'PA0143', 2, 2, -1, 6, 1 )
           ENDIF
 
@@ -333 +333 @@
                           ' &d_radius=',d_radius,' delta_r=',delta_r,&
                           ' particle_radius=',particles(n)%radius
-             CALL message( 'advec_particles', 'PA0144', 2, 2, 0, 6, 1 )
+             CALL message( 'advec_particles', 'PA0144', 2, 2, -1, 6, 1 )
           ENDIF
           particles(n)%radius = new_r
@@ -426 +426 @@
                          WRITE( message_string, * )  'collision_efficiency ' , &
                                    'out of range:' ,effective_coll_efficiency
-                         CALL message( 'advec_particles', 'PA0145', 2, 2, 0,   &
+                         CALL message( 'advec_particles', 'PA0145', 2, 2, -1,  &
                                        6, 1 )
                       END IF
@@ -1925 +1925 @@
                                  '&but this is not allowed with ' // &
                                  'NetCDF output switched on'
-                CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )
+                CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 )
              ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory dt_prel'
@@ -1945 +1945 @@
                                     '&but this is not allowed wi' // &
                                     'th NetCDF output switched on'
-                   CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )
+                   CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 )
                 ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory dt_prel'
@@ -2330 +2330 @@
                                   '&but this is not allowed with ' //  &
                                   'NetCDF output switched on'
-                CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )
+                CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 )
              ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trrp'
@@ -2358 +2358 @@
                                     '&but this is not allowed wi'// &
                                     'th NetCDF output switched on'
-                CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )
+                   CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 )
                 ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trrpt'
@@ -2407 +2407 @@
                                  '&but this is not allowed with '// &
                                  'NetCDF output switched on'
-                CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )
+                CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 )
              ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trlp'
@@ -2435 +2435 @@
                                     '&but this is not allowed wi'// &
                                     'th NetCDF output switched on'
-                   CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 ) 
+                   CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 ) 
                 ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trlpt'
@@ -2771 +2771 @@
                                  '&but this is not allowed with '// &
                                  'NetCDF output switched on'
-                CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 ) 
+                CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 ) 
              ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trnp'
@@ -2799 +2799 @@
                                     '&but this is not allowed wi' // &
                                     'th NetCDF output switched on'
-                   CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 ) 
+                   CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 ) 
                 ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trnpt'
@@ -2814 +2814 @@
                                 trnpt_count_recv*tlength, MPI_REAL, pnorth, 1, &
                                 comm2d, status, ierr )
+
 !
 !--          Update the tail ids for the transferred particles
@@ -2848 +2849 @@
                                  '&but this is not allowed with ' // &
                                  'NetCDF output switched on'
-               CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )  
+               CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 )  
              ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trsp'
@@ -2876 +2877 @@
                                     '&but this is not allowed wi'// &
                                     'th NetCDF output switched on'
-                   CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )
+                   CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 )
                 ELSE
 !    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trspt'
@@ -3079 +3080 @@
 
                   WRITE( message_string, * )  'particle too fast.  n = ',  n 
-                  CALL message( 'advec_particles', 'PA0148', 2, 2, 0, 6, 1 )
+                  CALL message( 'advec_particles', 'PA0148', 2, 2, -1, 6, 1 )
              ENDIF
           ENDIF

palm/trunk/SOURCE/init_particles.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! Output of messages replaced by message handling routine
+! Maximum number of tails is calculated from maximum number of particles and
+! skip_particles_for_tail,
+! output of messages replaced by message handling routine
 ! Bugfix: arrays for tails are allocated with a minimum size of 10 tails if
 ! there is no tail initially
@@ -442 +444 @@
        IF ( use_particle_tails )  THEN
 !
-!--       Choose the maximum number of tails significantly larger than the
-!--       one initially required
-          factor = 10.0
-          value  = number_of_tails
-          DO WHILE ( value / 10.0 >= 1.0 )
-             factor = factor * 10.0
-             value  = value / 10.0
-          ENDDO
-          maximum_number_of_tails = factor * INT( value )
+!--       Choose the maximum number of tails with respect to the maximum number
+!--       of particles and skip_particles_for_tail
+          maximum_number_of_tails = maximum_number_of_particles / &
+                                    skip_particles_for_tail
+
 !
 !--       Create a minimum number of tails in case that there is no tail