Write FFT-ed data cube

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];

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];

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];

data/paramfile.txt

 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

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<nsectors; isector++)
 	{
 	  MPI_Win_lock(MPI_LOCK_SHARED,isector,0,writewin);
@@ -184,7 +182,6 @@ void write_fftw_data(){
 	    }
 
 	}
-     #else
       /*
 	for (int iw=0; iw<param.num_w_planes; iw++)
 	for (int iv=0; iv<grid_size_y; iv++)
@@ -196,16 +193,13 @@ void write_fftw_data(){
 	fprintf (file.pFile, "%d %d %d %f %f %f\n", iu,iv,iw,gridtot[index],gridtot[index+1],v_norm);
 	}
       */
-     #endif
 
       fclose(file.pFilereal);
       fclose(file.pFileimg);
     }
- #ifdef USE_MPI
   MPI_Win_fence(0,writewin);
   MPI_Win_free(&writewin);
   MPI_Barrier(MPI_COMM_WORLD);
- #endif
  #endif //WRITE_DATA
 
 

gridding.c

@@ -208,6 +208,7 @@ void write_gridded_data()
 {
 
  #ifdef WRITE_DATA
+  /*
 #error "This routine has not yet been harmonized with new stuf !!"
   // Write gridded results
   
@@ -274,7 +275,7 @@ void write_gridded_data()
     }
   
   MPI_Win_fence(0,slabwin);
-  
+  */
  #endif //WRITE_DATA 
 
 }

init.c

@@ -84,6 +84,14 @@ void op_filename() {
    	strcat(buf, outparam.fftfile);
    	strcpy(out.fftfile, buf);
 	
+        strcpy(buf, num_buf);
+        strcat(buf, outparam.fftfile_writedata1);
+        strcpy(out.fftfile_writedata1, buf);
+
+        strcpy(buf, num_buf);
+        strcat(buf, outparam.fftfile_writedata2);
+        strcpy(out.fftfile_writedata2, buf);
+	
    	strcpy(buf, num_buf);
    	strcat(buf, outparam.fftfile2);
    	strcpy(out.fftfile2, buf);
@@ -204,6 +212,14 @@ void read_parameter_file(char *fname)
 		{
 		  strcpy(outparam.fftfile, buf2);
 		}
+	      if(strcmp(buf1, "fftfile_writedata1") == 0)
+                {
+                  strcpy(outparam.fftfile_writedata1, buf2);
+                }
+	      if(strcmp(buf1, "fftfile_writedata2") == 0)
+                {
+                  strcpy(outparam.fftfile_writedata2, buf2);
+                }
 	      if(strcmp(buf1, "fftfile2") == 0)
 		{
 		  strcpy(outparam.fftfile2, buf2);