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

resolve conflict between voxel length / domain length

Browse Source
This commit is contained in:
James McClure
2019-10-10 09:30:33 -04:00
parent 1fb3d59e71
commit d8f2344739
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/Domain.cpp
View File

@@ -173,6 +173,12 @@ 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");
ASSERT( n.size() == 3u );
ASSERT( nproc.size() == 3u );
int nx = n[0];
int ny = n[1];
int nz = n[2];
if (d_db->keyExists( "InletLayers" )){
auto InletCount = d_db->getVector<int>( "InletLayers" );
@@ -196,12 +202,13 @@ void Domain::initialize( std::shared_ptr<Database> db )
if (d_db->keyExists( "voxel_length" )){
voxel_length = d_db->getScalar<double>("voxel_length");
}
ASSERT( n.size() == 3u );
ASSERT( nproc.size() == 3u );
int nx = n[0];
int ny = n[1];
int nz = n[2];
else if (d_db->keyExists( "L" )){
auto Length = d_db->getVector<double>("L");
Lx = Length[0];
Ly = Length[1];
Lz = Length[2];
voxel_length = Lx/(nx*nproc[0]);
}
Lx = nx*nproc[0]*voxel_length;
Ly = ny*nproc[1]*voxel_length;
Lz = nz*nproc[2]*voxel_length;