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

added voxel length to domain

Browse Source
This commit is contained in:
James E McClure 2019-04-19 10:48:18 -04:00
parent 919020ae3c
commit 10f3865fb1
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/Domain.cpp
View File

@ -28,7 +28,7 @@ static inline void fgetl( char * str, int num, FILE * stream )
Domain::Domain( int nx, int ny, int nz, int rnk, int npx, int npy, int npz,
double lx, double ly, double lz, int BC):
Nx(0), Ny(0), Nz(0),
Lx(0), Ly(0), Lz(0), Volume(0), BoundaryCondition(0),
Lx(0), Ly(0), Lz(0), Volume(0), BoundaryCondition(0), voxel_length(1),
Comm(MPI_COMM_WORLD),
inlet_layers_x(0), inlet_layers_y(0), inlet_layers_z(0),
sendCount_x(0), sendCount_y(0), sendCount_z(0), sendCount_X(0), sendCount_Y(0), sendCount_Z(0),
@ -118,8 +118,10 @@ void Domain::initialize( std::shared_ptr<Database> db )
d_db = db;
auto nproc = d_db->getVector<int>("nproc");
auto n = d_db->getVector<int>("n");
auto L = d_db->getVector<double>("L");
//nspheres = d_db->getScalar<int>("nspheres");
if (d_db->keyExists( "voxel_length" )){
auto voxel_length = d_db->getScalar<double>("voxel_length");
}
if (d_db->keyExists( "InletLayers" )){
auto InletCount = d_db->getVector<int>( "InletLayers" );
@ -135,14 +137,13 @@ void Domain::initialize( std::shared_ptr<Database> db )
}
ASSERT( n.size() == 3u );
ASSERT( L.size() == 3u );
ASSERT( nproc.size() == 3u );
int nx = n[0];
int ny = n[1];
int nz = n[2];
Lx = L[0];
Ly = L[1];
Lz = L[2];
Lx = nx*nproc[0]*voxel_length;
Ly = ny*nproc[1]*voxel_length;
Lz = nz*nproc[2]*voxel_length;
Nx = nx+2;
Ny = ny+2;
Nz = nz+2;

2
common/Domain.h
View File

@ -107,7 +107,7 @@ private:
public: // Public variables (need to create accessors instead)
double Lx,Ly,Lz,Volume;
double Lx,Ly,Lz,Volume,voxel_length;
int Nx,Ny,Nz,N;
int inlet_layers_x, inlet_layers_y, inlet_layers_z;
int outlet_layers_x, outlet_layers_y, outlet_layers_z;