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

lbpm_serial decomp refactor

Browse Source
This commit is contained in:
James E McClure
2018-05-26 07:30:10 -04:00
parent 084a54642f
commit f5f3c79edc
1 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/lbpm_serial_decomp.cpp
View File

@@ -18,7 +18,7 @@ int main(int argc, char **argv)
int rank=0; int rank=0;
bool MULTINPUT=false; /* bool MULTINPUT=false;
int NWP,SOLID,rank_offset; int NWP,SOLID,rank_offset;
SOLID=atoi(argv[1]); SOLID=atoi(argv[1]);
@@ -35,6 +35,12 @@ int main(int argc, char **argv)
MULTINPUT=true; MULTINPUT=true;
rank_offset=0; rank_offset=0;
} }
*/
if (argc > 1)
filename=argv[1];
else{
ERROR("lbpm_serial_decomp: no in put database provided \n");
}
//....................................................................... //.......................................................................
// Reading the domain information file // Reading the domain information file
@@ -48,11 +54,36 @@ int main(int argc, char **argv)
int64_t xStart,yStart,zStart; int64_t xStart,yStart,zStart;
// char fluidValue,solidValue; // char fluidValue,solidValue;
std::vector<char> solidValues; // read the input database
std::vector<char> nwpValues; db = std::make_shared<Database>( filename );
std::string line; domain_db = db->getDatabase( "Domain" );
if (rank==0){ // Read domain parameters
auto L = domain_db->getVector<double>( "L" );
auto size = domain_db->getVector<int>( "n" );
auto nproc = domain_db->getVector<int>( "nproc" );
auto ReadValues = domain_db->getVector<char>( "ReadValues" );
auto WriteValues = domain_db->getVector<char>( "WriteValues" );
BoundaryCondition = domain_db->getScalar<int>( "BC" );
nx = size[0];
ny = size[1];
nz = size[2];
nx = L[0];
ny = L[1];
nz = L[2];
nprocx = nproc[0];
nprocy = nproc[1];
nprocz = nproc[2];
printf("Relabeling %i values\n",ReadValues.size());
for (int idx=0; idx<ReadValues.size(); idx++){
char oldvalue=ReadValues[idx];
char newvalue=WriteValues[idx];
printf("oldvalue=%i, newvalue =%i \n",atoi(oldvalue),atoi(newvalue));
}
/* if (rank==0){
ifstream domain("Domain.in"); ifstream domain("Domain.in");
domain >> nprocx; domain >> nprocx;
domain >> nprocy; domain >> nprocy;
@@ -75,6 +106,7 @@ int main(int argc, char **argv)
image >> zStart; image >> zStart;
} }
*/
nprocs=nprocx*nprocy*nprocz; nprocs=nprocx*nprocy*nprocz;
char *SegData = NULL; char *SegData = NULL;
@@ -136,6 +168,15 @@ int main(int argc, char **argv)
for (j=0;j<ny+2;j++){ for (j=0;j<ny+2;j++){
for (i=0;i<nx+2;i++){ for (i=0;i<nx+2;i++){
n = k*(nx+2)*(ny+2) + j*(nx+2) + i;; n = k*(nx+2)*(ny+2) + j*(nx+2) + i;;
char locval = loc_id[n];
for (int idx=0; idx<ReadValues.size(); idx++){
char oldvalue=ReadValues[idx];
char newvalue=WriteValues[idx];
if (locval == oldvalue){
loc_id[n] = newvalue;
idx = ReadValues.size();
}
}
if (loc_id[n]==char(SOLID)) loc_id[n] = 0; if (loc_id[n]==char(SOLID)) loc_id[n] = 0;
else if (loc_id[n]==char(NWP)) loc_id[n] = 1; else if (loc_id[n]==char(NWP)) loc_id[n] = 1;
else loc_id[n] = 2; else loc_id[n] = 2;