OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finished adding lbpm_random_pp and testing on Eos

Browse Source
This commit is contained in:
James E McClure 2015-06-19 22:47:48 -04:00
parent 8448bc9150
commit c456fc2d2e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/BasicSimulator.cpp
View File

@ -442,10 +442,10 @@ int main(int argc, char **argv)
MPI_Allreduce(&sum_local,&pore_vol,1,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
// Generate the residual NWP
/* // Generate the residual NWP
if (!pBC && rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
if (!pBC) GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
*/
#endif
//.........................................................
@ -477,6 +477,7 @@ int main(int argc, char **argv)
id[0] = id[Nx-1] = id[(Ny-1)*Nx] = id[(Ny-1)*Nx + Nx-1] = 0;
id[(Nz-1)*Nx*Ny] = id[(Nz-1)*Nx*Ny+Nx-1] = id[(Nz-1)*Nx*Ny+(Ny-1)*Nx] = id[(Nz-1)*Nx*Ny+(Ny-1)*Nx + Nx-1] = 0;
//.........................................................
/*
#ifdef USE_EXP_CONTACT_ANGLE
// If negative phi_s is chosen, flip the ID for the wetting and non-wetting phase
if (phi_s < 0.0 && !pBC){
@ -497,7 +498,7 @@ int main(int argc, char **argv)
}
#endif
*/
// Set up MPI communication structurese
if (rank==0) printf ("Setting up communication control structures \n");
//......................................................................................

5
tests/lbpm_random_pp.cpp
View File

@ -10,6 +10,7 @@
#include <fstream>
#include <sstream>
#include <Array.h>
#include <Domain.h>
inline void GenerateResidual(char *ID, int Nx, int Ny, int Nz, double Saturation)
{
@ -202,8 +203,8 @@ int main(int argc, char **argv)
}
// Generate the residual NWP
if (rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
if (rank==0) printf("Initializing with NWP saturation = %f \n",Saturation);
GenerateResidual(id,Nx,Ny,Nz,Saturation);
if (InitialWetting == 1) FlipID(id,Nx*Ny*Nz);