Changeset 230 for palm/trunk
- Timestamp:
- Feb 6, 2009 9:32:58 AM (16 years ago)
- Location:
- palm/trunk
- Files:
-
- 1 added
- 2 edited
-
DOC/tec/message_identifiers (added)
-
SOURCE/CURRENT_MODIFICATIONS (modified) (1 diff)
-
SOURCE/advec_particles.f90 (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r229 r230 6 6 ------- 7 7 8 Output of messages replaced by message handling routine 9 10 advec_particles, sort_particles 8 11 9 12 Errors: -
palm/trunk/SOURCE/advec_particles.f90
r229 r230 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! Output of messages replaced by message handling routine 6 7 ! Bugfix: several tail counters are initialized, particle_tail_coordinates is 7 8 ! only written to file if its third index is > 0 … … 314 315 ( rho_surface * dx * dy * dz ) 315 316 IF ( ql_c(k,j,i) > 100.0 ) THEN 316 print*,'+++ advec_particlesk=',k,' j=',j,' i=',i, &317 ' ql_c=',ql_c(k,j,i), ' part(',n,')%wf=', &317 WRITE( message_string, * ) 'k=',k,' j=',j,' i=',i, & 318 ' ql_c=',ql_c(k,j,i), ' &part(',n,')%wf=', & 318 319 particles(n)%weight_factor,' delta_r=',delta_r 319 #if defined( __parallel ) 320 CALL MPI_ABORT( comm2d, 9999, ierr ) 321 #else 322 STOP 323 #endif 320 CALL message( 'advec_particles', 'PA0143', 2, 2, 0, 6, 0 ) 324 321 ENDIF 325 322 … … 328 325 IF ( ( new_r - particles(n)%radius ) < 0.0 .AND. new_r < 0.0 ) & 329 326 THEN 330 print*,'+++ advec_particles#1 k=',k,' j=',j,' i=',i, &327 WRITE( message_string, * ) '#1 k=',k,' j=',j,' i=',i, & 331 328 ' e_s=',e_s, ' e_a=',e_a,' t_int=',t_int, & 332 ' d_radius=',d_radius,' delta_r=',delta_r,&329 ' &d_radius=',d_radius,' delta_r=',delta_r,& 333 330 ' particle_radius=',particles(n)%radius 334 #if defined( __parallel ) 335 CALL MPI_ABORT( comm2d, 9999, ierr ) 336 #else 337 STOP 338 #endif 331 CALL message( 'advec_particles', 'PA0144', 2, 2, 0, 6, 0 ) 339 332 ENDIF 340 333 particles(n)%radius = new_r … … 427 420 effective_coll_efficiency < 0.0 ) & 428 421 THEN 429 print*,'+++ advec_particles collision_efficiency ', & 430 'out of range:', effective_coll_efficiency 431 #if defined( __parallel ) 432 CALL MPI_ABORT( comm2d, 9999, ierr ) 433 #else 434 STOP 435 #endif 436 ENDIF 422 WRITE( message_string, * ) 'collision_efficiency ' , & 423 'out of range:' ,effective_coll_efficiency 424 CALL message( 'advec_particles', 'PA0145', 2, 2, 0, 6, 0 ) 425 END IF 437 426 438 427 ! … … 1927 1916 maximum_number_of_particles ) THEN 1928 1917 IF ( netcdf_output ) THEN 1929 PRINT*, '+++ advec_particles: maximum_number_of_particles ', & 1930 'needs to be increased' 1931 PRINT*, ' but this is not allowed with ', & 1932 'NetCDF output switched on' 1933 #if defined( __parallel ) 1934 CALL MPI_ABORT( comm2d, 9999, ierr ) 1935 #else 1936 CALL local_stop 1937 #endif 1918 message_string = 'maximum_number_of_particles ' // & 1919 'needs to be increased ' // & 1920 '&but this is not allowed with ' // & 1921 'NetCDF output switched on' 1922 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 0 ) 1938 1923 ELSE 1939 1924 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory dt_prel' … … 1951 1936 maximum_number_of_tails ) THEN 1952 1937 IF ( netcdf_output ) THEN 1953 PRINT*, '+++ advec_particles: maximum_number_of_tails ', & 1954 'needs to be increased' 1955 PRINT*, ' but this is not allowed wi', & 1956 'th NetCDF output switched on' 1957 #if defined( __parallel ) 1958 CALL MPI_ABORT( comm2d, 9999, ierr ) 1959 #else 1960 CALL local_stop 1961 #endif 1938 message_string = 'maximum_number_of_tails ' // & 1939 'needs to be increased ' // & 1940 '&but this is not allowed wi' // & 1941 'th NetCDF output switched on' 1942 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 0 ) 1962 1943 ELSE 1963 1944 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory dt_prel' … … 2340 2321 THEN 2341 2322 IF ( netcdf_output ) THEN 2342 PRINT*, '+++ advec_particles: maximum_number_of_particles ',&2343 'needs to be increased'2344 PRINT*, ' but this is not allowed with ',&2345 2346 CALL MPI_ABORT( comm2d, 9999, ierr)2323 message_string = 'maximum_number_of_particles ' // & 2324 'needs to be increased ' // & 2325 '&but this is not allowed with ' // & 2326 'NetCDF output switched on' 2327 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 0 ) 2347 2328 ELSE 2348 2329 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trrp' … … 2368 2349 THEN 2369 2350 IF ( netcdf_output ) THEN 2370 PRINT*, '+++ advec_particles: maximum_number_of_tails ',&2371 'needs to be increased'2372 PRINT*, ' but this is not allowed wi',&2373 2374 CALL MPI_ABORT( comm2d, 9999, ierr)2351 message_string = 'maximum_number_of_tails ' // & 2352 'needs to be increased ' // & 2353 '&but this is not allowed wi'// & 2354 'th NetCDF output switched on' 2355 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 0 ) 2375 2356 ELSE 2376 2357 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trrpt' … … 2417 2398 THEN 2418 2399 IF ( netcdf_output ) THEN 2419 PRINT*, '+++ advec_particles: maximum_number_of_particles ',&2420 'needs to be increased'2421 PRINT*, ' but this is not allowed with ',&2422 2423 CALL MPI_ABORT( comm2d, 9999, ierr)2400 message_string = 'maximum_number_of_particles ' // & 2401 'needs to be increased ' // & 2402 '&but this is not allowed with '// & 2403 'NetCDF output switched on' 2404 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 0 ) 2424 2405 ELSE 2425 2406 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trlp' … … 2445 2426 THEN 2446 2427 IF ( netcdf_output ) THEN 2447 PRINT*, '+++ advec_particles: maximum_number_of_tails ',&2448 'needs to be increased'2449 PRINT*, ' but this is not allowed wi',&2450 2451 CALL MPI_ABORT( comm2d, 9999, ierr )2428 message_string = 'maximum_number_of_tails ' // & 2429 'needs to be increased ' // & 2430 '&but this is not allowed wi'// & 2431 'th NetCDF output switched on' 2432 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 0 ) 2452 2433 ELSE 2453 2434 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trlpt' … … 2781 2762 THEN 2782 2763 IF ( netcdf_output ) THEN 2783 PRINT*, '+++ advec_particles: maximum_number_of_particles ',&2784 'needs to be increased'2785 PRINT*, ' but this is not allowed with ',&2786 2787 CALL MPI_ABORT( comm2d, 9999, ierr )2764 message_string = 'maximum_number_of_particles ' // & 2765 'needs to be increased ' // & 2766 '&but this is not allowed with '// & 2767 'NetCDF output switched on' 2768 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 0 ) 2788 2769 ELSE 2789 2770 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trnp' … … 2809 2790 THEN 2810 2791 IF ( netcdf_output ) THEN 2811 PRINT*, '+++ advec_particles: maximum_number_of_tails ',&2812 'needs to be increased'2813 PRINT*, ' but this is not allowed wi',&2814 2815 CALL MPI_ABORT( comm2d, 9999, ierr )2792 message_string = 'maximum_number_of_tails ' // & 2793 'needs to be increased ' // & 2794 '&but this is not allowed wi' // & 2795 'th NetCDF output switched on' 2796 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 0 ) 2816 2797 ELSE 2817 2798 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trnpt' … … 2858 2839 THEN 2859 2840 IF ( netcdf_output ) THEN 2860 PRINT*, '+++ advec_particles: maximum_number_of_particles ',&2861 'needs to be increased'2862 PRINT*, ' but this is not allowed with ',&2863 2864 CALL MPI_ABORT( comm2d, 9999, ierr )2841 message_string = 'maximum_number_of_particles ' // & 2842 'needs to be increased ' // & 2843 '&but this is not allowed with ' // & 2844 'NetCDF output switched on' 2845 CALL message( 'advec_particles', 'PA0146', 2, 2, 0, 6, 0 ) 2865 2846 ELSE 2866 2847 ! WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trsp' … … 2886 2867 THEN 2887 2868 IF ( netcdf_output ) THEN 2888 PRINT*, '+++ advec_particles: maximum_number_of_tails ',&2889 'needs to be increased'2890 PRINT*, ' but this is not allowed wi',&2891 2892 CALL MPI_ABORT( comm2d, 9999, ierr)2869 message_string = 'maximum_number_of_tails ' // & 2870 'needs to be increased ' // & 2871 '&but this is not allowed wi'// & 2872 'th NetCDF output switched on' 2873 CALL message( 'advec_particles', 'PA0147', 2, 2, 0, 6, 0 ) 2893 2874 ELSE 2894 2875 ! WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trspt' … … 3091 3072 ((nyn-nys+2)*dy)/(particles(n)%age-particles(n)%age_m) ) THEN 3092 3073 3093 PRINT*, '+++ advec_particles: particle too fast. n = ', n 3094 #if defined( __parallel ) 3095 CALL MPI_ABORT( comm2d, 9999, ierr ) 3096 #else 3097 CALL local_stop 3098 #endif 3074 WRITE( message_string, * ) 'particle too fast. n = ', n 3075 CALL message( 'advec_particles', 'PA0148', 2, 2, 0, 6, 0 ) 3099 3076 ENDIF 3100 3077 … … 3908 3885 IF ( i < nxl .OR. i > nxr .OR. j < nys .OR. j > nyn .OR. k < nzb+1 .OR. & 3909 3886 k > nzt ) THEN 3910 PRINT*, '+++ sort_particles: particle out of range: i=', i, ' j=', & 3911 j, ' k=', k 3912 PRINT*, ' nxl=', nxl, ' nxr=', nxr, & 3913 ' nys=', nys, ' nyn=', nyn, & 3914 ' nzb=', nzb, ' nzt=', nzt 3887 WRITE( message_string, * ) ' particle out of range: i=', i, ' j=', & 3888 j, ' k=', k, & 3889 ' &nxl=', nxl, ' nxr=', nxr, & 3890 ' nys=', nys, ' nyn=', nyn, & 3891 ' nzb=', nzb, ' nzt=', nzt 3892 CALL message( 'sort_particles', 'PA0149', 1, 2, 0, 6, 0 ) 3915 3893 ENDIF 3916 3894
Note: See TracChangeset
for help on using the changeset viewer.
