diff --git a/allvars.h b/allvars.h index 9ebf91ad6d69f5d1a02c823485b7aecfa3d31b4e..f796578d3c1738c15caf931862b72c28f9b18bf8 100644 --- a/allvars.h +++ b/allvars.h @@ -104,6 +104,8 @@ extern struct op char outfile2[NAME_LEN]; char outfile3[NAME_LEN]; char fftfile[NAME_LEN]; + char fftfile_writedata1[NAME_LEN]; + char fftfile_writedata2[NAME_LEN]; char fftfile2[NAME_LEN]; char fftfile3[NAME_LEN]; char logfile[NAME_LEN]; diff --git a/allvars_nccl.h b/allvars_nccl.h index 67b5ed69aa69ed4c44c78efbcd1bd92bd44a4f11..0bd174ef5152531a01ea6a3a7f6c71427a99da21 100644 --- a/allvars_nccl.h +++ b/allvars_nccl.h @@ -102,6 +102,8 @@ extern struct op char outfile2[NAME_LEN]; char outfile3[NAME_LEN]; char fftfile[NAME_LEN]; + char fftfile_writedata1[NAME_LEN]; + char fftfile_writedata2[NAME_LEN]; char fftfile2[NAME_LEN]; char fftfile3[NAME_LEN]; char logfile[NAME_LEN]; diff --git a/allvars_rccl.h b/allvars_rccl.h index bf3a33820d8023728d67d991912c085573beac57..6e09fcae29beb32ac26369abbad053b426fb5a16 100644 --- a/allvars_rccl.h +++ b/allvars_rccl.h @@ -105,6 +105,8 @@ extern struct op char outfile2[NAME_LEN]; char outfile3[NAME_LEN]; char fftfile[NAME_LEN]; + char fftfile_writedata1[NAME_LEN]; + char fftfile_writedata2[NAME_LEN]; char fftfile2[NAME_LEN]; char fftfile3[NAME_LEN]; char logfile[NAME_LEN]; diff --git a/data/paramfile.txt b/data/paramfile.txt index 5c891292fdfe5f42e04fc04f86f555fa4307930f..8e1a29bced83119f8ceaed8cee472e2839d1aaea 100644 --- a/data/paramfile.txt +++ b/data/paramfile.txt @@ -1,10 +1,10 @@ ndatasets 1 -Datapath1 /data/LOFAR_MERGE/hpc_imaging/data/newgauss2noconj_t201806301100_SBL180.binMS/ +Datapath1 /leonardo_scratch/large/userexternal/ederubei/hpc_imaging/data/tail01_L720378_SB001_uv_12DFF03B0t_121MHz_12DFF03BFt_143MHz_120ch_flag.binMS/ #Datapath2 /beegfs/lofar/cgheller/L798046_SB244_uv.uncorr_130B27932t_123MHz.pre-cal.binMS/ #Datapath3 /beegfs/lofar/cgheller/L798046_SB244_uv.uncorr_130B27932t_125MHz.pre-cal.binMS/ -num_threads 4 +num_threads 1 w_support 7 -reduce_method 1 +reduce_method 0 grid_size_x 4096 grid_size_y 4096 num_w_planes 8 @@ -20,6 +20,8 @@ outfile1 coords.txt outfile2 grid_real.bin outfile3 grid_img.bin fftfile fft.txt +fftfile_writedata1 ffted_real.bin +fftfile_writedata2 ffted_img.bin fftfile2 fft_real.bin fftfile3 fft_img.bin logfile run.log diff --git a/fourier_transform.c b/fourier_transform.c index 83efcaf32aca07317db78171ea5b000c21aac64a..11dab417e9be756d028b124cad569cef6fe3f178 100644 --- a/fourier_transform.c +++ b/fourier_transform.c @@ -135,17 +135,15 @@ void write_fftw_data(){ #ifdef USE_FFTW #ifdef WRITE_DATA // Write results let's skip this part for the moment - #ifdef USE_MPI + MPI_Win writewin; MPI_Win_create(gridss, size_of_grid*sizeof(double), sizeof(double), MPI_INFO_NULL, MPI_COMM_WORLD, &writewin); MPI_Win_fence(0,writewin); - #endif if (rank == 0) { printf("WRITING FFT TRANSFORMED DATA\n"); - file.pFilereal = fopen (out.fftfile2,"wb"); - file.pFileimg = fopen (out.fftfile3,"wb"); - #ifdef USE_MPI + file.pFilereal = fopen (out.fftfile_writedata1,"wb"); + file.pFileimg = fopen (out.fftfile_writedata2,"wb"); for (int isector=0; isector