rm files

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                  */

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                    */

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.;

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;

fftma_module/gen/lib_src/kgeneration.c

@@ -1,79 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#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<N;i++)
-	    {
-	      (*Z).vector[i]=(*gwnoise).vector[i];
-	    }
-	  break;
-	}
-
-      /*FFTMA*/
-      FFTMA2(variogram,grid,n,Z,Y);
-
-/*       file1="prout"; */
-/*       writefile(file1,Y); */
-
-      /*add the statistics*/
-      //if (stat.mean[0] != 0 || stat.variance[0]!= 1)
-	//addstat2(Y,stat,Y1,Y);
-
-/*       file2="prout2"; */
-/*       writefile(file2,Y); */
-
-      /* make a log normal realization */
-      if (stat.type==1 || stat.type==2){
-	typelog=stat.type+2;
-	nor2log(Y1,typelog,Y1);
-	nor2log(Y,typelog,Y);
-      }
-
-     /*save the realization*/
-/*       writefile(filename[0],Y1); */
- 
-      /*save the permeability realization*/
-      writefile_bin(filename[1],Y);
-      readfile_bin(filename[1],Y);
-
-
-      return;
-   }

fftma_module/gen/lib_src/kgeneration2.c

@@ -1,76 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#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<N;i++)
-	    {
-	      (*Z).vector[i]=(*gwnoise).vector[i];
-	    }
-	  break;
-	}
-
-      /*FFTMA*/
-      FFTMA2(variogram,grid,n,Z,Y);
-
-      /*add the statistics*/
-      //if (stat.mean[0] != 0 || stat.variance[0]!= 1)
-	//addstat2(Y,stat,Y1,Y);
-
-      /* make a log normal realization */
-      if (stat.type==1 || stat.type==2){
-
-	typelog=stat.type+2;
-	/* nor2log(Y1,typelog,Y1); */
-	nor2log(Y,typelog,Y);
-      }
-
-      switch (*format_file)
-	{
-	case 0:
-	  writefile(filename[1],Y);
-	  break;
-	case 1:
-	  writefile_bin(filename[1],Y);
-	  break;
-	}
-
-      return;
-   }

fftma_module/gen/lib_src/pgeneration.c

@@ -18,7 +18,7 @@ void  pgeneration(int n[3],struct grid_mod grid,struct statistic_mod stat,struct
      /*save the delta-pressure realization*/
      writefile(filename[2],P);
      
-     total_pressure(grid,pression,P);
+     //total_pressure(grid,pression,P);
 
      total_velocity(grid,stat.mean[0],1,pression,VX);
      total_velocity(grid,stat.mean[0],2,pression,VY);

fftma_module/gen/lib_src/pgeneration2.c

@@ -27,7 +27,7 @@ void  pgeneration2(int n[3],struct grid_mod grid,struct statistic_mod stat,struc
 	 break;
        }
      
-     total_pressure(grid,pression,P);
+     //total_pressure(grid,pression,P);
      total_velocity(grid,stat.mean[0],1,pression,VX);
      total_velocity(grid,stat.mean[0],2,pression,VY);
      total_velocity(grid,stat.mean[0],3,pression,VZ);

fftma_module/gen/lib_src/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                  */

fftma_module/gen/lib_src/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 */
 /*----------*/
@@ -27,14 +27,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                    */

fftma_module/gen/lib_src/total_pressure.c

@@ -1,35 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#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;
-}

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",