From cb979d6d30f624b67ae8d029c930a0b72cb53e00 Mon Sep 17 00:00:00 2001 From: Oli Date: Fri, 1 Apr 2022 15:59:35 -0300 Subject: [PATCH] trying to fix. --- config.ini | 18 +++++++++--------- fftma_module/gen/lib_src/covariance.c | 6 +++--- fftma_module/gen/lib_src/fourt.c | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config.ini b/config.ini index e83967b..5d4eecb 100644 --- a/config.ini +++ b/config.ini @@ -1,22 +1,22 @@ [General] -simDir=output +simDir=prueba5 startJob=0 [Iterables] -p=[10,39,1] +p=[10,39,10] seeds=[5462,1] -lc=[4] -connectivity=[1] +lc=[16] +connectivity=[1,2] variances=[1] [Generation] -Nx = 8 -Ny = 8 -Nz = 8 +Nx = 64 +Ny = 64 +Nz = 1 variogram_type=1 binary = yes kh = 100 kl = 0.01 -compute_lc = yes +compute_lc = no lcBin=yes genera=yes @@ -41,4 +41,4 @@ MinBlockSize =1 Max_sample_size = 4 kperm=no postprocess=no -SaveVfield=no +SaveVfield=yes diff --git a/fftma_module/gen/lib_src/covariance.c b/fftma_module/gen/lib_src/covariance.c index 597512d..e7319e8 100644 --- a/fftma_module/gen/lib_src/covariance.c +++ b/fftma_module/gen/lib_src/covariance.c @@ -11,9 +11,9 @@ void covariance(chunk_array_t* covar, struct vario_mod variogram, struct grid_mo for (i = 0; i < 3; i++) n2[i] = n[i] / 2; - for (j = 0; j <= n2[1]; j++) { - for (k = 0; k <= n2[2]; k++) { - for (i = 0; i <= n2[0]; i++) { + for (i=0; i<= n2[0]; i++) { + for (j=0; j<= n2[1]; j++) { + for (k=0; k<= n2[2]; k++) { /*area 1*/ maille = 1 + i + n[0] * (j + n[1] * k); diff --git a/fftma_module/gen/lib_src/fourt.c b/fftma_module/gen/lib_src/fourt.c index cab614b..59cde2a 100644 --- a/fftma_module/gen/lib_src/fourt.c +++ b/fftma_module/gen/lib_src/fourt.c @@ -3,7 +3,7 @@ #include #include "chunk_array.h" -/* fast fourier transform */ +/*fast fourier transform */ /* THE COOLEY-TUKEY FAST FOURIER TRANSFORM */ /* EVALUATES COMPLEX FOURIER SERIES FOR COMPLEX OR REAL FUNCTIONS. */ /* THAT IS, IT COMPUTES */ @@ -333,8 +333,8 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int chunk_array_save(datar, i, valuerj - tempr); chunk_array_save(datai, i, valueij - tempi); - //chunk_array_get(datar, j, &valuerj); - //chunk_array_get(datai, j, &valueij); + chunk_array_get(datar, j, &valuerj); + chunk_array_get(datai, j, &valueij); chunk_array_save(datar, j, valuerj + tempr); chunk_array_save(datai, j, valueij + tempi);