ssantisi
/
simulacion-permeabilidad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rm files

Browse Source
milestone_5_without_improvements
Oli 3 years ago
parent 6ac4de81a9
commit 562b948508
9 changed files with 3 additions and 267 deletions
Show Stats Download Patch File Download Diff File

15
fftma_module/gen/include/geostat.h
Unescape Escape View File

@ -38,7 +38,7 @@
/* gammln, gammp, gasdev, gaussian, gcf, */ /* gammln, gammp, gasdev, gaussian, gcf, */
/* gen_cov_matrix, Ginv, gradual, cgrid, */ /* gen_cov_matrix, Ginv, gradual, cgrid, */
/* gser, invtrun1, krig_stat, length, */ /* gser, invtrun1, krig_stat, length, */
/* LtimeZ, mat_vec, maxfactor, metrop, norm */ /* LtimeZ, maxfactor, metrop, norm */
/* normal, nugget, power, ran2, scal_vect, */ /* normal, nugget, power, ran2, scal_vect, */
/* solve3, sort, spherical, stable, statlog2nor */ /* solve3, sort, spherical, stable, statlog2nor */
/* test_fract, trun1, trungasdev,vec_vec, */ /* test_fract, trun1, trungasdev,vec_vec, */
@ -563,19 +563,6 @@ int length(int N, int i, double *scf, double *ap, double D, int Nvari);
/* The solution vector is returned in b */ /* The solution vector is returned in b */
void LtimeZ(double *L, float *Z, float *b, int n); void LtimeZ(double *L, float *Z, float *b, int n);
/*calculates C.x/
/* C : symmetric positive-definite matrix recorded */
/* (per raws) as a vector with only components */
/* Cij so that j <= i, i = [0...n-1] */
/* x : vector, xi avec i = [0...n-1] */
/* b : vector, bi avec i = [0...n-1] */
/* n : dimension of matrix Cij */
/* */
/* The result vector is returned in b */
void mat_vec(double *C, double *x, double *b, int n);
/*determines the greatest prime factor of an integer*/ /*determines the greatest prime factor of an integer*/
int maxfactor(int n); int maxfactor(int n);

9
fftma_module/gen/include/toolsFFTPSIM.h
Unescape Escape View File

@ -10,21 +10,14 @@
/* List of functions: */ /* List of functions: */
/* ------------------ */ /* ------------------ */
/* FFTPSim, FFTPressure, build_pressure, build_velocity, clean_real2 */ /* FFTPSim, FFTPressure, clean_real2 */
/*Functions */ /*Functions */
/*----------*/ /*----------*/
void FFTPSim(struct vario_mod variogram,struct statistic_mod stat,struct grid_mod grid,int n[3],struct realization_mod *realin,struct pressure_mod gradient,struct realization_mod *realout,struct realization_mod *realout2,struct realization_mod *realout3,struct realization_mod *realout4,struct realization_mod *realout5); void FFTPSim(struct vario_mod variogram,struct statistic_mod stat,struct grid_mod grid,int n[3],struct realization_mod *realin,struct pressure_mod gradient,struct realization_mod *realout,struct realization_mod *realout2,struct realization_mod *realout3,struct realization_mod *realout4,struct realization_mod *realout5);
void build_pressure(int n[3],struct grid_mod grid,struct pressure_mod gradient,double *realization,double *ireal,double *pressure,double *ipressure);
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);
void normAxes(double *vec, double *normed); void normAxes(double *vec, double *normed);
void waveVectorCompute1D(int n,double *vec); void waveVectorCompute1D(int n,double *vec);
void mat_vec(double *C, double *x, double *b, int n);
#endif // define _TOOLSFFTPSIM_H #endif // define _TOOLSFFTPSIM_H

68
fftma_module/gen/lib_src/build_pressure.c
Unescape Escape View File

@ -1,68 +0,0 @@
#include <stdio.h>
#include <stddef.h>
#include <string.h>
#include <stdarg.h>
#include <stdlib.h>
#include <math.h>
#include "geostat.h"
#include "pressure.h"
/* Build_pressure */
/* build pressure in spectral domain */
void build_pressure(int n[3],struct grid_mod grid,struct pressure_mod gradient,double *realization,double *ireal,double *pressure,double *ipressure)
{
int i,j,k,maille1;
double ki,kj,kk;
double coeff,temp,temp2;
printf("build pdsdsressure pdslis\n");
/* pressure calculation in the spectral domain*/
for ( k = 1; k <= n[2]; k++) {
for (j = 1; j <= n[1]; j++) {
for (i = 1; i <= n[0]; i++) {
maille1 = i+(j-1+(k-1)*n[1])*n[0];
if (n[0]==1)
{
ki=0.;
}
else
{
ki =(double)(i-1)/(double)(grid.NX*grid.DX);
}
if (n[1]==1)
{
kj=0.;
}
else
{
kj =(double)j/(double)(grid.NY*grid.DY);
}
if (n[2]==1)
{
kk=0.;
}
else
{
kk =(double)k/(double)(grid.NZ*grid.DZ);
}
coeff = (gradient.x*ki+gradient.y*kj+gradient.z*kk)/(ki*ki+kj*kj+kk*kk);
temp = realization[maille1];
temp2= ireal[maille1];
if (maille1==1)
{
pressure[maille1] =0.;
ipressure[maille1]=0.;
}
else
{
pressure[maille1] =-1./(2*3.14)*coeff*temp2;
ipressure[maille1]= 1./(2*3.14)*coeff*temp;
}
}
}
}
return;
}

119
fftma_module/gen/lib_src/build_velocity.c
Unescape Escape View File

@ -1,119 +0,0 @@
#include <stdio.h>
#include <stddef.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include "geostat.h"
#include "pressure.h"
/* Build_velocity */
/* Build velocity in spectral domain */
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)
{
int i,j,k,maille1;
int x,y,z;
double ki,kj,kk;
double coeff,temp,temp2;
double grad;
printf("build velocity\n");
/* x-direction velocity calculation in the spectral domain*/
switch(direction)
{
case 1:
grad = gradient.x;
x=1;
y=0;
z=0;
break;
case 2:
grad = gradient.y;
x=0;
y=1;
z=0;
break;
case 3:
grad = gradient.z;
x=0;
y=0;
z=1;
break;
default :
printf("build_velocity.c: wrong velocity direction!!! direction: %d\n",direction);
break;
}
for ( k = 1; k <= n[2]; k++) {
for (j = 1; j <= n[1]; j++) {
for (i = 1; i <= n[0]; i++) {
maille1 = i+(j-1+(k-1)*n[1])*n[0];
/* if (i<n[0]/2) { */
/* ki =(double)i/(double)(grid.NX*grid.DX); */
/* } else { */
/* ki =-(double)(n[0]-i+1)/(double)(grid.NX*grid.DX); */
/* } */
/* if (j<n[1]/2) { */
/* kj =(double)j/(double)(grid.NY*grid.DY); */
/* } else { */
/* kj =-(double)(n[1]-j+1)/(double)(grid.NY*grid.DY); */
/* } */
/* if (k<n[2]/2) { */
/* kk =(double)k/(double)(grid.NZ*grid.DZ); */
/* } else { */
/* kk =-(double)(n[2]-k+1)/(double)(grid.NZ*grid.DZ); */
/* } */
if (n[0]==1)
{
ki=0;
}
else if (i<n[0]/2)
{
ki =(double)i/(double)(grid.NX*grid.DX);
}
else
{
ki =-(double)(n[0]-i+1)/(double)(grid.NX*grid.DX);
}
if (n[1]==1)
{
kj=0;
}
else if (j<n[1]/2)
{
kj =(double)j/(double)(grid.NY*grid.DY);
}
else
{
kj =-(double)(n[1]-j+1)/(double)(grid.NY*grid.DY);
}
if (n[2]==1)
{
kk=0;
}
else if (k<n[2]/2)
{
kk =(double)k/(double)(grid.NZ*grid.DZ);
}
else
{
kk =-(double)(n[2]-k+1)/(double)(grid.NZ*grid.DZ);
}
coeff = (gradient.x*ki+gradient.y*kj+gradient.z*kk)/(ki*ki+kj*kj+kk*kk);
temp = realization[maille1];
temp2= ireal[maille1];
xvelocity[maille1] = stat.mean[0]*(grad-(ki*x+kj*y+kk*z)*coeff)*temp;
ixvelocity[maille1]= stat.mean[0]*(grad-(ki*x+kj*y+kk*z)*coeff)*temp2;
}
}
}
return;
}

1
fftma_module/gen/lib_src/cardsin.c
Unescape Escape View File

@ -5,7 +5,6 @@
/*cardsin covariance function*/ /*cardsin covariance function*/
double cardsin(double h) double cardsin(double h)
{ {
printf("cardsin\n");
float delta = 20.371; float delta = 20.371;
double z; double z;

13
fftma_module/gen/lib_src/geostat.h
Unescape Escape View File

@ -562,19 +562,6 @@ int length(int N, int i, double *scf, double *ap, double D, int Nvari);
/* The solution vector is returned in b */ /* The solution vector is returned in b */
void LtimeZ(double *L, float *Z, float *b, int n); void LtimeZ(double *L, float *Z, float *b, int n);
/*calculates C.x/
/* C : symmetric positive-definite matrix recorded */
/* (per raws) as a vector with only components */
/* Cij so that j <= i, i = [0...n-1] */
/* x : vector, xi avec i = [0...n-1] */
/* b : vector, bi avec i = [0...n-1] */
/* n : dimension of matrix Cij */
/* */
/* The result vector is returned in b */
void mat_vec(double *C, double *x, double *b, int n);
/*determines the greatest prime factor of an integer*/ /*determines the greatest prime factor of an integer*/
int maxfactor(int n); int maxfactor(int n);

33
fftma_module/gen/lib_src/mat_vec.c
Unescape Escape View File

@ -1,33 +0,0 @@
/*calculates C.x/
/* C : symetric positive-definite matrix recorded */
/* (per raws) as a vector with only components */
/* Cij so that j <= i, i = [0...n-1]*/
/* x : vector, xi avec i = [0...n-1]*/
/* b : vector, bi avec i = [0...n-1]*/
/* n : dimension of matrix Cij*/
/* */
/* The solution vector is returned in b*/
void mat_vec(double *C, double *x, double *b, int n)
{
int i,k,l;
double temp;
for (i = 0; i < n; i++) {
temp = 0.;
for (k = 0; k < n; k++) {
if ( k <= i ) {
l = k+i*(i+1)/2;
} else {
l = i+k*(k+1)/2;
}
temp += C[l]*x[k];
}
b[i] = temp;
}
return;
}

9
fftma_module/gen/lib_src/toolsFFTPSIM.h
Unescape Escape View File

@ -10,21 +10,14 @@
/* List of functions: */ /* List of functions: */
/* ------------------ */ /* ------------------ */
/* FFTPSim, FFTPressure, build_pressure, build_velocity, clean_real2 */ /* FFTPSim, FFTPressure, clean_real2 */
/*Functions */ /*Functions */
/*----------*/ /*----------*/
void FFTPSim(struct vario_mod variogram,struct statistic_mod stat,struct grid_mod grid,int n[3],struct realization_mod *realin,struct pressure_mod gradient,struct realization_mod *realout,struct realization_mod *realout2,struct realization_mod *realout3,struct realization_mod *realout4,struct realization_mod *realout5); void FFTPSim(struct vario_mod variogram,struct statistic_mod stat,struct grid_mod grid,int n[3],struct realization_mod *realin,struct pressure_mod gradient,struct realization_mod *realout,struct realization_mod *realout2,struct realization_mod *realout3,struct realization_mod *realout4,struct realization_mod *realout5);
void build_pressure(int n[3],struct grid_mod grid,struct pressure_mod gradient,double *realization,double *ireal,double *pressure,double *ipressure);
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);
void normAxes(double *vec, double *normed); void normAxes(double *vec, double *normed);
void waveVectorCompute1D(int n,double *vec); void waveVectorCompute1D(int n,double *vec);
void mat_vec(double *C, double *x, double *b, int n);
#endif // define _TOOLSFFTPSIM_H #endif // define _TOOLSFFTPSIM_H

3
fftma_module/gen/setup.py
Unescape Escape View File

@ -39,9 +39,6 @@ module_FFTMA = Extension(
"./lib_src/prebuild_gwn.c", "./lib_src/prebuild_gwn.c",
"./lib_src/build_real.c", "./lib_src/build_real.c",
"./lib_src/clean_real.c", "./lib_src/clean_real.c",
"./lib_src/build_pressure.c",
"./lib_src/build_velocity.c",
"./lib_src/mat_vec.c",
"./lib_src/testmemory.c", "./lib_src/testmemory.c",
"./lib_src/genlib.c", "./lib_src/genlib.c",
], ],

Write Preview
Loading…
Cancel
Save