Cosmetic changes and ready for marchenko paper R1

marchenko/readTinvData.c

@@ -19,7 +19,7 @@ typedef struct { /* complex number */
 
 void findShotInMute(float *xrcvMute, float xrcvShot, int nxs, int *imute);
 
-int readTinvData(char *filename, float *xrcv, float *xsrc, float *zsrc, int *xnx, int Nsyn, int nx, int ntfft, int mode, int *maxval, float *tinv, int hw, int verbose)
+int readTinvData(char *filename, float *xrcv, float *xsrc, float *zsrc, int *xnx, int Nfoc, int nx, int ntfft, int mode, int *maxval, float *tinv, int hw, int verbose)
 {
 	FILE *fp;
 	segy hdr;

marchenko/writeDataIter.c

@@ -17,7 +17,7 @@
 void name_ext(char *filename, char *extension);
 int writeData(FILE *fp, float *data, segy *hdrs, int n1, int n2);
 
-int writeDataIter(char *file_iter, float *data, segy *hdrs, int n1, int n2, float d2, float f2, int n2out, int Nsyn, float *xsyn, float *zsyn, int iter)
+int writeDataIter(char *file_iter, float *data, segy *hdrs, int n1, int n2, float d2, float f2, int n2out, int Nfoc, float *xsyn, float *zsyn, int iter)
 {
 	FILE *fp_iter;
 	size_t nwrite;
@@ -33,7 +33,7 @@ int writeDataIter(char *file_iter, float *data, segy *hdrs, int n1, int n2, floa
 	if (fp_iter==NULL) verr("error on creating output file %s", filename);
 	tracf=1;
 	size=n1*n2;
-	for (l = 0; l < Nsyn; l++) {
+	for (l = 0; l < Nfoc; l++) {
 		for (i = 0; i < n2out; i++) {
 			hdrs[i].fldr   = l+1; 
 			hdrs[i].sx = NINT(xsyn[l]*1000);

utils/syn2d.c

@@ -620,7 +620,7 @@ void synthesis(float *shotdata, float *syndata, int nx, int nt, int nxs, int nts
 	cdata     = (complex *)malloc(nfreq*sizeof(complex));
 #pragma omp for
 	for(i = 0; i < nx; i++) {
-#pragma omp critical 
+//#pragma omp critical 
 {
 		rc1fft(&shotdata[i*optn], cdata, optn, -1);
 }
@@ -711,7 +711,7 @@ void synthesis(float *shotdata, float *syndata, int nx, int nt, int nxs, int nts
 					sum[j].i = tmp.i*ts.r - tmp.r*ts.i;
 				}
 			}
-#pragma omp critical
+//#pragma omp critical
 {
 			cr1fft(sum, rdata, optn, 1);
 }
@@ -734,7 +734,7 @@ void synthesis(float *shotdata, float *syndata, int nx, int nt, int nxs, int nts
 					sum[j].i = shotcdata[j*nx+i].i*tmp.r -
 							   shotcdata[j*nx+i].r*tmp.i;
 				}
-#pragma omp critical
+//#pragma omp critical
 {
 				cr1fft(sum, rdata, optn, 1);
 }