diff --git a/fftma_module/gen/build/lib.linux-x86_64-3.6/FFTMA.cpython-36m-x86_64-linux-gnu.so b/fftma_module/gen/build/lib.linux-x86_64-3.6/FFTMA.cpython-36m-x86_64-linux-gnu.so index 9bb6722..f704188 100755 Binary files a/fftma_module/gen/build/lib.linux-x86_64-3.6/FFTMA.cpython-36m-x86_64-linux-gnu.so and b/fftma_module/gen/build/lib.linux-x86_64-3.6/FFTMA.cpython-36m-x86_64-linux-gnu.so differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/Py_kgeneration.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/Py_kgeneration.o index 96021e0..dbbdb17 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/Py_kgeneration.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/Py_kgeneration.o differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/cov_value.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/cov_value.o index ab150db..b3eeae9 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/cov_value.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/cov_value.o differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/gasdev.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/gasdev.o index 26a35bb..d34e559 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/gasdev.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/gasdev.o differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration.o index 96b0585..a49f4ce 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration.o differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration2.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration2.o index 5b64903..3fe6e8a 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration2.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/kgeneration2.o differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration.o index 46e1925..ed962d5 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration.o differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration2.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration2.o index 07cac12..187c875 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration2.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/pgeneration2.o differ diff --git a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/total_pressure.o b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/total_pressure.o index ff1c368..2228f81 100644 Binary files a/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/total_pressure.o and b/fftma_module/gen/build/temp.linux-x86_64-3.6/lib_src/total_pressure.o differ diff --git a/fftma_module/gen/include/toolsFFTMA.h b/fftma_module/gen/include/toolsFFTMA.h index 2d3a313..58f5d8f 100755 --- a/fftma_module/gen/include/toolsFFTMA.h +++ b/fftma_module/gen/include/toolsFFTMA.h @@ -14,13 +14,6 @@ /* kgeneration, FFTMA2, prebuild_gwn, build_real, , clean_real */ -/*FUNCTIONS*/ -/*----------*/ - -void kgeneration(long seed,struct grid_mod grid,struct statistic_mod stat,struct vario_mod variogram,string filename[8],struct realization_mod *Z,struct realization_mod *Y,struct realization_mod *Y2, int n[3], int *genere, int *gwnwrite, struct realization_mod *gwnoise); - -void kgeneration2(long seed,struct grid_mod grid,struct statistic_mod stat,struct vario_mod variogram,string filename[7],struct realization_mod *Z,struct realization_mod *Y,struct realization_mod *Y1, int n[3], int *genere, int *gwnwrite, struct realization_mod *gwnoise,int *format_file) ; - /*FAST FOURIER TRANSFORM Pressure Simulation */ /*Turns a Gaussian white noise vector into a */ /*spatially correlated vector */ diff --git a/fftma_module/gen/include/toolsFFTPSIM.h b/fftma_module/gen/include/toolsFFTPSIM.h index 75f0a7e..12ef949 100755 --- a/fftma_module/gen/include/toolsFFTPSIM.h +++ b/fftma_module/gen/include/toolsFFTPSIM.h @@ -10,7 +10,7 @@ /* List of functions: */ /* ------------------ */ -/* pgeneration, FFTPSim, FFTPressure, build_pressure, build_velocity,total_pressure,total_velocity, clean_real2 */ +/* pgeneration, FFTPSim, FFTPressure, build_pressure, build_velocity,total_velocity, clean_real2 */ /*Functions */ /*----------*/ @@ -30,14 +30,6 @@ void build_pressure(int n[3],struct grid_mod grid,struct pressure_mod gradient,d void build_velocity(int n[3],struct grid_mod grid,struct statistic_mod stat,struct pressure_mod gradient,double *realization,double *ireal,double *xvelocity,double *ixvelocity,int direction); -/* total_pressure */ -/* Build total pressure */ -/* grid: structure defining the grid */ -/* pression:: structure defining the gradient pressure */ -/* realout: structure defining a realization */ - -void total_pressure(struct grid_mod grid,struct pressure_mod gradient,struct realization_mod *realout); - /* total_velocity */ /* Build total velocity in one direction */ /* grid: structure defining the grid */ diff --git a/fftma_module/gen/lib_src/cov_value.c b/fftma_module/gen/lib_src/cov_value.c index a97ea10..6b3ce1e 100755 --- a/fftma_module/gen/lib_src/cov_value.c +++ b/fftma_module/gen/lib_src/cov_value.c @@ -9,7 +9,7 @@ double cov_value(struct vario_mod variogram,double di,double dj,double dk) double cov; int k; - printf("cov_valueds\n"); + //printf("cov_valueds\n"); cov = 0.; diff --git a/fftma_module/gen/lib_src/gasdev.c b/fftma_module/gen/lib_src/gasdev.c index e1fefd7..7f4cd38 100755 --- a/fftma_module/gen/lib_src/gasdev.c +++ b/fftma_module/gen/lib_src/gasdev.c @@ -8,7 +8,7 @@ double gasdev(long *idum,long *idum2, long *iy, long iv[NTAB]) /*and unit variance, using ran2(idum) as the source */ /*of uniform deviates */ { - printf("gasdev\n"); + //printf("gasdev\n"); double ran2(long *idum,long *idum2, long *iy, long iv[NTAB]); static int iset = 0; static double gset; diff --git a/fftma_module/gen/lib_src/kgeneration.c b/fftma_module/gen/lib_src/kgeneration.c deleted file mode 100755 index 3c4095e..0000000 --- a/fftma_module/gen/lib_src/kgeneration.c +++ /dev/null @@ -1,79 +0,0 @@ -#include -#include -#include -#include -#include -#include "genlib.h" -#include "simpio.h" -#include "geostat.h" -#include "toolsIO.h" -#include "toolsFFTMA.h" - -/* kgeneration */ -/* Z is the GWN with 0-mean and 1-variance */ -/* Y1 is the realization with 0-mean and variance wanted */ -/* Y is the realization with mean and variance wanted */ - -void kgeneration(long seed,struct grid_mod grid,struct statistic_mod stat,struct vario_mod variogram,string filename[7],struct realization_mod *Z,struct realization_mod *Y,struct realization_mod *Y1, int n[3], int *genere, int *gwnwrite, struct realization_mod *gwnoise) - { - int i,N; - int typelog; - string file1,file2; - - /*generate Gaussian white noise*/ - N = grid.NX*grid.NY*grid.NZ; - n[0] = 0; - n[1] = 0; - n[2] = 0; - printf("\n\n\n"); - - switch (*genere) - { - case 0: - generate(&seed,N,Z); - /*save the Gaussian white noise file*/ - if (*gwnwrite == 0) - { - writefile(filename[0],Z); - } - break; - case 1: - (*Z).vector=(double *) malloc(N*sizeof(double)); - (*Z).n = N; - for (i=0;i -#include -#include -#include -#include -#include "genlib.h" -#include "simpio.h" -#include "geostat.h" -#include "toolsIO.h" -#include "toolsFFTMA.h" - -/* kgeneration */ -/* Z is the GWN with 0-mean and 1-variance */ -/* Y1 is the realization with 0-mean and variance wanted */ -/* Y is the realization with mean and variance wanted */ - -void kgeneration2(long seed,struct grid_mod grid,struct statistic_mod stat,struct vario_mod variogram,string filename[7],struct realization_mod *Z,struct realization_mod *Y,struct realization_mod *Y1, int n[3], int *genere, int *gwnwrite, struct realization_mod *gwnoise,int *format_file) - { - int i,N; - int typelog; - string file1,file2; - - /*generate Gaussian white noise*/ - N = grid.NX*grid.NY*grid.NZ; - n[0] = 0; - n[1] = 0; - n[2] = 0; - printf("\n\n\n"); - - switch (*genere) - { - case 0: - generate(&seed,N,Z); - /*save the Gaussian white noise file*/ - if (*gwnwrite == 0) - { - writefile(filename[0],Z); - } - break; - case 1: - (*Z).vector=(double *) malloc(N*sizeof(double)); - (*Z).n = N; - for (i=0;i -#include -#include -#include -#include "geostat.h" -#include "pressure.h" - - - -/* total_pressure */ -/* Build total pressure */ -/* grid: structure defining the grid */ -/* pression: structure defining the gradient pressure */ -/* realout: structure defining a realization */ - -void total_pressure(struct grid_mod grid,struct pressure_mod gradient,struct realization_mod *realout) -{ - int i,j,k,maille0,maille1; - double temp,reference; - - reference=abs(gradient.x)*grid.NX*grid.DX+abs(gradient.y)*grid.NY*grid.DY+abs(gradient.z)*grid.NZ*grid.DZ; - /* pressure reconstruction */ - for ( k = 0; k < grid.NZ; k++) { - for (j = 0; j < grid.NY; j++) { - for (i = 0; i < grid.NX; i++) { - maille1 = i+(j+k*grid.NY)*grid.NX; -/* temp=reference+gradient.x*i*grid.DX+gradient.y*j*grid.DY+gradient.z*k*grid.DZ+(*realout).vector[maille1]; */ - temp=-gradient.x*(i+1)/grid.NX-gradient.y*(j+1)/grid.NY-gradient.z*(k+1)/grid.NZ+(*realout).vector[maille1]; - (*realout).vector[maille1]=temp; - } - } - } - - return; -} diff --git a/fftma_module/gen/setup.py b/fftma_module/gen/setup.py index 79d06a7..1c5c6b9 100644 --- a/fftma_module/gen/setup.py +++ b/fftma_module/gen/setup.py @@ -35,8 +35,6 @@ module_FFTMA = Extension( "./lib_src/exponential.c", "./lib_src/cardsin.c", "./lib_src/nor2log.c", - "./lib_src/kgeneration.c", - "./lib_src/kgeneration2.c", "./lib_src/fftma2.c", "./lib_src/prebuild_gwn.c", "./lib_src/build_real.c", @@ -45,7 +43,6 @@ module_FFTMA = Extension( "./lib_src/pgeneration2.c", "./lib_src/build_pressure.c", "./lib_src/build_velocity.c", - "./lib_src/total_pressure.c", "./lib_src/total_velocity.c", "./lib_src/waveVectorCompute3D.c", "./lib_src/mat_vec.c",