diff --git a/fftma_module/gen/lib_src/Py_kgeneration.c b/fftma_module/gen/lib_src/Py_kgeneration.c index c79ad46..c633ce9 100644 --- a/fftma_module/gen/lib_src/Py_kgeneration.c +++ b/fftma_module/gen/lib_src/Py_kgeneration.c @@ -30,9 +30,7 @@ void Py_kgeneration(long seed, struct grid_mod grid, struct statistic_mod stat, generate(&seed, N, Z, cores); /*FFTMA*/ - printf("pre fftma2\n"); FFTMA2(variogram, grid, n, Z, Y, cores, &seed); - printf("post fftma2\n"); /* make a log normal realization */ if (stat.type == 1 || stat.type == 2) { diff --git a/fftma_module/gen/lib_src/chunk_array.c b/fftma_module/gen/lib_src/chunk_array.c index 81932a0..58d0c74 100644 --- a/fftma_module/gen/lib_src/chunk_array.c +++ b/fftma_module/gen/lib_src/chunk_array.c @@ -51,18 +51,14 @@ chunk_array_t* chunk_array_create(char* filename, size_t total_size, size_t chun } void chunk_array_read(chunk_array_t* chunk_array) { - printf("chunk_array 54\n"); rewind(chunk_array->fp); chunk_array->init_pos = 0; - printf("chunk_array 57\n"); size_t newLen = fread(chunk_array->data, sizeof(double), chunk_array->chunk_size, chunk_array->fp); - printf("chunk_array 59\n"); } void chunk_array_write(chunk_array_t* chunk_array, char* filename) { chunk_array->fp = fopen(filename, "w"); if (chunk_array->fp == NULL) { - printf("ke"); fclose(chunk_array->fp); chunk_array->fp = fopen(filename, "w"); } diff --git a/fftma_module/gen/lib_src/fftma2.c b/fftma_module/gen/lib_src/fftma2.c index 7204d50..dcca2ff 100644 --- a/fftma_module/gen/lib_src/fftma2.c +++ b/fftma_module/gen/lib_src/fftma2.c @@ -51,8 +51,6 @@ void FFTMA2(struct vario_mod variogram, struct grid_mod grid, int n[3], struct r NXYZ = grid.NX * grid.NY * grid.NZ; nxyz = NXYZ + 1; - printf("ntot es %d\n", ntot); - /*array initialization*/ covar = chunk_array_create("covar.txt", ntot, 1500); ireal = chunk_array_create("ireal.txt", ntot, 1500); @@ -64,39 +62,27 @@ void FFTMA2(struct vario_mod variogram, struct grid_mod grid, int n[3], struct r worki = (double*)malloc(nmax * sizeof(double)); testmemory(worki); - printf("pre covariance\n"); /*covariance function creation*/ covariance(covar, variogram, grid, n, cores); - printf("post covariance\n"); /*power spectrum*/ - printf("pre fourt1\n"); fourt(covar, ireal, n, NDIM, 1, 0, workr, worki, cores); - printf("post fourt1\n"); /*organization of the input Gaussian white noise*/ - printf("pre prebuild_gwn\n"); solver = 0; prebuild_gwn(grid, n, realin, realization, solver, cores, seed); - printf("post prebuild_gwn\n"); - printf("pre fourt2\n"); /*forward fourier transform of the GWN*/ fourt(realization, ireal, n, NDIM, 1, 0, workr, worki, cores); - printf("post fourt2\n"); - printf("pre build_real\n"); /* build realization in spectral domain */ build_real(n, NTOT, covar, realization, ireal, cores); - printf("post build_real\n"); chunk_array_free(covar); remove("covar.txt"); - printf("pre fourt3\n"); /*backward fourier transform*/ fourt(realization, ireal, n, NDIM, 0, 1, workr, worki, cores); - printf("post fourt3\n"); chunk_array_free(ireal); remove("ireal.txt"); @@ -104,8 +90,6 @@ void FFTMA2(struct vario_mod variogram, struct grid_mod grid, int n[3], struct r free(workr); free(worki); - printf("pre clean_real\n"); /*output realization*/ clean_real(realin, n, grid, realization, realout, cores); - printf("post clean_real\n"); } diff --git a/fftma_module/gen/lib_src/fourt.c b/fftma_module/gen/lib_src/fourt.c index 2d9af7e..c340173 100644 --- a/fftma_module/gen/lib_src/fourt.c +++ b/fftma_module/gen/lib_src/fourt.c @@ -190,9 +190,9 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int i = 1; for (j = 1; j <= ntot; j++) { chunk_array_get(datar, i, &valueri); - printf("datar[i] = %f\n", valueri); + printf("[1] datar[i] = %f\n", valueri); chunk_array_get(datar, i+1, &valueri1); - printf("datar[i1] = %f\n", valueri1); + printf("[2] datar[i1] = %f\n", valueri1); chunk_array_save(datar, j, valueri); chunk_array_save(datai, j, valueri1); i += 2; @@ -217,10 +217,10 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j3, &valuerj3); chunk_array_get(datai, j3, &valueij3); - printf("datar[i3] = %f\n", valueri3); - printf("datai[i3] = %f\n", valueii3); - printf("datar[j3] = %f\n", valuerj3); - printf("datai[j3] = %f\n", valueij3); + printf("[3] datar[i3] = %f\n", valueri3); + printf("[4] datai[i3] = %f\n", valueii3); + printf("[5] datar[j3] = %f\n", valuerj3); + printf("[6] datai[j3] = %f\n", valueij3); tempr = valueri3; tempi = valueii3; @@ -256,8 +256,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[7] datar[j] = %f\n", valuerj); + printf("[8] datai[j] = %f\n", valueij); if (icase != 3) { workr[i] = valuerj; @@ -309,10 +309,10 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[i] = %f\n", tempr); - printf("datai[i] = %f\n", tempi); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[9] datar[i] = %f\n", tempr); + printf("[10] datai[i] = %f\n", tempi); + printf("[11] datar[j] = %f\n", valuerj); + printf("[12] datai[j] = %f\n", valueij); chunk_array_save(datar, i, valuerj - tempr); chunk_array_save(datai, i, valueij - tempi); @@ -339,22 +339,22 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datai, i, &tempr); chunk_array_get(datar, i, &tempi); - printf("datai[i] = %f\n", tempr); - printf("datar[i] = %f\n", tempi); + printf("[13] datai[i] = %f\n", tempr); + printf("[14] datar[i] = %f\n", tempi); tempi = -tempi; } else { chunk_array_get(datai, i, &tempr); - printf("datai[i] = %f\n", tempr); + printf("[15] datai[i] = %f\n", tempr); tempr = -tempr; chunk_array_get(datar, i, &tempi); - printf("datar[i] = %f\n", tempi); + printf("[16] datar[i] = %f\n", tempi); } chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[17] datar[j] = %f\n", valuerj); + printf("[18] datai[j] = %f\n", valueij); chunk_array_save(datar, i, valuerj - tempr); chunk_array_save(datai, i, valueij - tempi); @@ -362,8 +362,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[19] datar[j] = %f\n", valuerj); + printf("[20] datai[j] = %f\n", valueij); chunk_array_save(datar, j, valuerj + tempr); chunk_array_save(datai, j, valueij + tempi); @@ -408,10 +408,10 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datai, i, &valueii); chunk_array_get(datai, j, &valueij); - printf("datar[i] = %f\n", valueri); - printf("datar[j] = %f\n", valuerj); - printf("datai[i] = %f\n", valueii); - printf("datai[j] = %f\n", valueij); + printf("[21] datar[i] = %f\n", valueri); + printf("[22] datar[j] = %f\n", valuerj); + printf("[23] datai[i] = %f\n", valueii); + printf("[24] datai[j] = %f\n", valueij); tempr = valueri * wr - valueii * wi; tempi = valueri * wi + valueii * wr; @@ -474,8 +474,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &sr); chunk_array_get(datai, j, &si); - printf("datar[j] = %f\n", sr); - printf("datai[j] = %f\n", si); + printf("[25] datar[j] = %f\n", sr); + printf("[26] datai[j] = %f\n", si); oldsr = 0.; oldsi = 0.; @@ -487,8 +487,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[27] datar[j] = %f\n", valuerj); + printf("[28] datai[j] = %f\n", valueij); sr = twowr * sr - oldsr + valuerj; si = twowr * si - oldsi + valueij; @@ -560,10 +560,10 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[i] = %f\n", valueri); - printf("datai[i] = %f\n", valueii); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[29] datar[i] = %f\n", valueri); + printf("[30] datai[i] = %f\n", valueii); + printf("[31] datar[j] = %f\n", valuerj); + printf("[32] datai[j] = %f\n", valueij); sumr = (valueri + valuerj) / 2.; sumi = (valueii + valueij) / 2.; @@ -575,7 +575,6 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_save(datai, i, difi + tempi); chunk_array_save(datar, j, sumr - tempr); chunk_array_save(datai, j, tempi - difi); - //printf("563\n"); j += np2; } imin++; @@ -593,7 +592,7 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int goto L740; for (i = imin; i <= ntot; i += np2) { chunk_array_get(datai, i, &valueii); - printf("datai[i] = %f\n", valueii); + printf("[33] datai[i] = %f\n", valueii); chunk_array_save(datai, i, -valueii); } L740: @@ -609,8 +608,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, i, &valueri); chunk_array_get(datai, i, &valueii); - printf("datar[i] = %f\n", valueri); - printf("datai[i] = %f\n", valueii); + printf("[34] datar[i] = %f\n", valueri); + printf("[35] datai[i] = %f\n", valueii); chunk_array_save(datar, j, valueri); chunk_array_save(datai, j, -valueii); @@ -622,8 +621,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, imin, &valuerimin); chunk_array_get(datai, imin, &valueiimin); - printf("datar[imin] = %f\n", valuerimin); - printf("datai[imin] = %f\n", valueiimin); + printf("[36] datar[imin] = %f\n", valuerimin); + printf("[37] datai[imin] = %f\n", valueiimin); chunk_array_save(datar, j, valuerimin - valueiimin); chunk_array_save(datai, j, 0.); @@ -636,8 +635,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, i, &valueri); chunk_array_get(datai, i, &valueii); - printf("datar[i] = %f\n", valueri); - printf("datai[i] = %f\n", valueii); + printf("[38] datar[i] = %f\n", valueri); + printf("[39] datai[i] = %f\n", valueii); chunk_array_save(datar, j, valueri); chunk_array_save(datai, j, valueii); @@ -650,8 +649,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, imin, &valuerimin); chunk_array_get(datai, imin, &valueiimin); - printf("datar[imin] = %f\n", valuerimin); - printf("datai[imin] = %f\n", valueiimin); + printf("[40] datar[imin] = %f\n", valuerimin); + printf("[41] datai[imin] = %f\n", valueiimin); chunk_array_save(datar, j, valuerimin + valueiimin); chunk_array_save(datai, j, 0.); @@ -662,8 +661,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datai, 1, &valuei1); chunk_array_get(datar, 1, &valuer1); - printf("datai[1] = %f\n", valuei1); - printf("datar[1] = %f\n", valuer1); + printf("[42] datai[1] = %f\n", valuei1); + printf("[43] datar[1] = %f\n", valuer1); chunk_array_save(datar, 1, valuei1 + valuer1); chunk_array_save(datai, 1, 0.); @@ -687,8 +686,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[44] datar[j] = %f\n", valuerj); + printf("[45] datai[j] = %f\n", valueij); chunk_array_save(datar, i, valuerj); chunk_array_save(datai, i, -valueij); @@ -700,8 +699,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_get(datar, j, &valuerj); chunk_array_get(datai, j, &valueij); - printf("datar[j] = %f\n", valuerj); - printf("datai[j] = %f\n", valueij); + printf("[46] datar[j] = %f\n", valuerj); + printf("[47] datai[j] = %f\n", valueij); chunk_array_save(datar, i, valuerj); chunk_array_save(datai, i, -valueij);