Changeset 1106 for palm/trunk/SOURCE/poisfft_hybrid.f90
- Timestamp:
- Mar 4, 2013 5:31:38 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/poisfft_hybrid.f90
r1037 r1106 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! calls of fft_x, fft_y replaced by fft_x_1d, fft_y_1d 23 23 ! 24 24 ! Former revisions: … … 334 334 CALL cpu_log( log_point_s(30), 'poisfft_hybrid_omp', 'start' ) 335 335 336 CALL cpu_log( log_point_s(7), 'fft_y ', 'start' )336 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'start' ) 337 337 338 338 !$OMP PARALLEL PRIVATE (i,iouter,ii,ir,iei,j,k,m,n,ffty_ar) … … 353 353 ENDDO 354 354 355 CALL fft_y ( ffty_ar(:,ir), 'forward' )355 CALL fft_y_1d( ffty_ar(:,ir), 'forward' ) 356 356 ENDDO 357 357 … … 371 371 !$OMP END PARALLEL 372 372 373 CALL cpu_log( log_point_s(7), 'fft_y ', 'pause' )373 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'pause' ) 374 374 375 375 #if defined( __parallel ) … … 385 385 #endif 386 386 387 CALL cpu_log( log_point_s(33), 'fft_x + tridia', 'start' )387 CALL cpu_log( log_point_s(33), 'fft_x_1d + tridia', 'start' ) 388 388 389 389 #if defined( __KKMP ) … … 406 406 ENDDO 407 407 408 CALL fft_x ( fftx_ar, 'forward' )408 CALL fft_x_1d( fftx_ar, 'forward' ) 409 409 410 410 DO i = nxl_a, nxr_a … … 422 422 ENDDO 423 423 424 CALL fft_x ( fftx_ar, 'backward' )424 CALL fft_x_1d( fftx_ar, 'backward' ) 425 425 426 426 m = nxl_a … … 438 438 #endif 439 439 440 CALL cpu_log( log_point_s(33), 'fft_x + tridia', 'stop' )440 CALL cpu_log( log_point_s(33), 'fft_x_1d + tridia', 'stop' ) 441 441 442 442 #if defined( __parallel ) … … 453 453 #endif 454 454 455 CALL cpu_log( log_point_s(7), 'fft_y ', 'continue' )455 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'continue' ) 456 456 457 457 !$OMP PARALLEL PRIVATE (i,iouter,ii,ir,iei,j,k,m,n,ffty_ar) … … 475 475 ii = nxl + i 476 476 ir = i - iouter + 1 477 CALL fft_y ( ffty_ar(:,ir), 'backward' )477 CALL fft_y_1d( ffty_ar(:,ir), 'backward' ) 478 478 479 479 DO j = nys_a, nyn_a … … 486 486 !$OMP END PARALLEL 487 487 488 CALL cpu_log( log_point_s(7), 'fft_y ', 'stop' )488 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'stop' ) 489 489 490 490 CALL cpu_log( log_point_s(30), 'poisfft_hybrid_omp', 'stop' ) … … 702 702 CALL cpu_log( log_point_s(30), 'poisfft_hybrid_nodes', 'start' ) 703 703 704 CALL cpu_log( log_point_s(7), 'fft_y ', 'start' )704 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'start' ) 705 705 706 706 ! … … 719 719 ENDDO 720 720 721 CALL fft_y ( ffty_ar(:,ir), 'forward' )721 CALL fft_y_1d( ffty_ar(:,ir), 'forward' ) 722 722 ENDDO 723 723 … … 738 738 ENDDO 739 739 740 CALL cpu_log( log_point_s(7), 'fft_y ', 'pause' )740 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'pause' ) 741 741 742 742 CALL cpu_log( log_point_s(32), 'alltoall_task', 'start' ) … … 767 767 CALL cascade( 2, j, nys_p, nyn_p ) 768 768 769 CALL cpu_log( log_point_s(33), 'fft_x + tridia', 'start' )769 CALL cpu_log( log_point_s(33), 'fft_x_1d + tridia', 'start' ) 770 770 DO k = 1, nz 771 771 … … 780 780 ENDDO 781 781 782 CALL fft_x ( fftx_ar, 'forward' )782 CALL fft_x_1d( fftx_ar, 'forward' ) 783 783 784 784 DO i = nxl_a, nxr_a … … 796 796 ENDDO 797 797 798 CALL fft_x ( fftx_ar, 'backward' )798 CALL fft_x_1d( fftx_ar, 'backward' ) 799 799 800 800 m = nxl_a … … 809 809 ENDDO 810 810 811 CALL cpu_log( log_point_s(33), 'fft_x + tridia', 'stop' )811 CALL cpu_log( log_point_s(33), 'fft_x_1d + tridia', 'stop' ) 812 812 nw2 = nw1 * SIZE( work1, 3 ) 813 813 CALL cpu_log( log_point_s(37), 'alltoall_node', 'continue' ) … … 833 833 CALL cpu_log( log_point_s(32), 'alltoall_task', 'stop' ) 834 834 835 CALL cpu_log( log_point_s(7), 'fft_y ', 'continue' )835 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'continue' ) 836 836 837 837 DO iouter = nxl_p, nxr_p, istride … … 855 855 ii = nxl + i 856 856 ir = i - iouter + 1 857 CALL fft_y ( ffty_ar(:,ir), 'backward' )857 CALL fft_y_1d( ffty_ar(:,ir), 'backward' ) 858 858 859 859 DO j = nys_a, nyn_a … … 865 865 ENDDO 866 866 867 CALL cpu_log( log_point_s(7), 'fft_y ', 'stop' )867 CALL cpu_log( log_point_s(7), 'fft_y_1d', 'stop' ) 868 868 869 869 CALL cpu_log( log_point_s(30), 'poisfft_hybrid_nodes', 'stop' )
Note: See TracChangeset
for help on using the changeset viewer.