Changeset 276
- Timestamp:
- Mar 29, 2009 8:50:26 AM (16 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r266 r276 40 40 user_parin, user_read_restart_data, user_spectra ) 41 41 42 Maximum number of tails is calculated from maximum number of particles and 43 skip_particles_for_tail (init_particles) 44 42 45 First constant in array den also defined as type double. (eqn_state_seawater) 43 46 -
palm/trunk/SOURCE/advec_particles.f90
r275 r276 322 322 ' ql_c=',ql_c(k,j,i), ' &part(',n,')%wf=', & 323 323 particles(n)%weight_factor,' delta_r=',delta_r 324 CALL message( 'advec_particles', 'PA0143', 2, 2, 0, 6, 1 )324 CALL message( 'advec_particles', 'PA0143', 2, 2, -1, 6, 1 ) 325 325 ENDIF 326 326 … … 333 333 ' &d_radius=',d_radius,' delta_r=',delta_r,& 334 334 ' particle_radius=',particles(n)%radius 335 CALL message( 'advec_particles', 'PA0144', 2, 2, 0, 6, 1 )335 CALL message( 'advec_particles', 'PA0144', 2, 2, -1, 6, 1 ) 336 336 ENDIF 337 337 particles(n)%radius = new_r … … 426 426 WRITE( message_string, * ) 'collision_efficiency ' , & 427 427 'out of range:' ,effective_coll_efficiency 428 CALL message( 'advec_particles', 'PA0145', 2, 2, 0,&428 CALL message( 'advec_particles', 'PA0145', 2, 2, -1, & 429 429 6, 1 ) 430 430 END IF … … 1925 1925 '&but this is not allowed with ' // & 1926 1926 'NetCDF output switched on' 1927 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )1927 CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 ) 1928 1928 ELSE 1929 1929 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory dt_prel' … … 1945 1945 '&but this is not allowed wi' // & 1946 1946 'th NetCDF output switched on' 1947 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )1947 CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 ) 1948 1948 ELSE 1949 1949 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory dt_prel' … … 2330 2330 '&but this is not allowed with ' // & 2331 2331 'NetCDF output switched on' 2332 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )2332 CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 ) 2333 2333 ELSE 2334 2334 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trrp' … … 2358 2358 '&but this is not allowed wi'// & 2359 2359 'th NetCDF output switched on' 2360 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )2360 CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 ) 2361 2361 ELSE 2362 2362 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trrpt' … … 2407 2407 '&but this is not allowed with '// & 2408 2408 'NetCDF output switched on' 2409 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )2409 CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 ) 2410 2410 ELSE 2411 2411 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trlp' … … 2435 2435 '&but this is not allowed wi'// & 2436 2436 'th NetCDF output switched on' 2437 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )2437 CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 ) 2438 2438 ELSE 2439 2439 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trlpt' … … 2771 2771 '&but this is not allowed with '// & 2772 2772 'NetCDF output switched on' 2773 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )2773 CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 ) 2774 2774 ELSE 2775 2775 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trnp' … … 2799 2799 '&but this is not allowed wi' // & 2800 2800 'th NetCDF output switched on' 2801 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )2801 CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 ) 2802 2802 ELSE 2803 2803 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trnpt' … … 2814 2814 trnpt_count_recv*tlength, MPI_REAL, pnorth, 1, & 2815 2815 comm2d, status, ierr ) 2816 2816 2817 ! 2817 2818 !-- Update the tail ids for the transferred particles … … 2848 2849 '&but this is not allowed with ' // & 2849 2850 'NetCDF output switched on' 2850 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 1 )2851 CALL message( 'advec_particles', 'PA0146', 2, 2, -1, 6, 1 ) 2851 2852 ELSE 2852 2853 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trsp' … … 2876 2877 '&but this is not allowed wi'// & 2877 2878 'th NetCDF output switched on' 2878 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 1 )2879 CALL message( 'advec_particles', 'PA0147', 2, 2, -1, 6, 1 ) 2879 2880 ELSE 2880 2881 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trspt' … … 3079 3080 3080 3081 WRITE( message_string, * ) 'particle too fast. n = ', n 3081 CALL message( 'advec_particles', 'PA0148', 2, 2, 0, 6, 1 )3082 CALL message( 'advec_particles', 'PA0148', 2, 2, -1, 6, 1 ) 3082 3083 ENDIF 3083 3084 ENDIF -
palm/trunk/SOURCE/init_particles.f90
r274 r276 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! Output of messages replaced by message handling routine 6 ! Maximum number of tails is calculated from maximum number of particles and 7 ! skip_particles_for_tail, 8 ! output of messages replaced by message handling routine 7 9 ! Bugfix: arrays for tails are allocated with a minimum size of 10 tails if 8 10 ! there is no tail initially … … 442 444 IF ( use_particle_tails ) THEN 443 445 ! 444 !-- Choose the maximum number of tails significantly larger than the 445 !-- one initially required 446 factor = 10.0 447 value = number_of_tails 448 DO WHILE ( value / 10.0 >= 1.0 ) 449 factor = factor * 10.0 450 value = value / 10.0 451 ENDDO 452 maximum_number_of_tails = factor * INT( value ) 446 !-- Choose the maximum number of tails with respect to the maximum number 447 !-- of particles and skip_particles_for_tail 448 maximum_number_of_tails = maximum_number_of_particles / & 449 skip_particles_for_tail 450 453 451 ! 454 452 !-- Create a minimum number of tails in case that there is no tail
Note: See TracChangeset
for help on using the changeset viewer.