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

Updates trying to figure out what broke the interface speed

Browse Source
This commit is contained in:
James E McClure
2015-11-14 10:44:02 -05:00
parent 1884f5652d
commit 5c998333ff
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/TwoPhase.cpp
View File

@@ -179,7 +179,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
{
double factor,temp,value;
factor=0.5/Beta;
// Initialize to -1,1 (segmentation)
/* // Initialize to -1,1 (segmentation)
for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){
@@ -190,15 +190,17 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
if (value > 0) TempID[n] = 1;
else TempID[n] = 0;
temp = factor*log((1.0+value)/(1.0-value));
if (value > 0.8) DistData(i,j,k) = 2.94*factor;
else if (value < -0.8) DistData(i,j,k) = -2.94*factor;
else DistData(i,j,k) = temp;
//temp = factor*log((1.0+value)/(1.0-value));
//if (value > 0.8) DistData(i,j,k) = 2.94*factor;
//else if (value < -0.8) DistData(i,j,k) = -2.94*factor;
//else DistData(i,j,k) = temp;
// Basic threshold
if (value > 0) DistData(i,j,k) = 1.0;
else DistData(i,j,k) = -1.0;
//if (value > 0) DistData(i,j,k) = 1.0;
//else DistData(i,j,k) = -1.0;
// Initialize directly
DistData(i,j,k) = value;
}
}
}
@@ -208,19 +210,19 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){
DistData(i,j,k) -= 1.0;
DistData(i,j,k) += 1.5;
}
}
}
/*
for (int k=0; k<Nz; k++){
*/
for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){
DistData(i,j,k) = ColorData(i,j,k);
}
}
}
*/
// for (int n=0; n<Nx*Ny*Nz; n++) DistData[n] = ColorData[n];
}

6
tests/lbpm_color_simulator.cpp
View File

@@ -578,7 +578,7 @@ int main(int argc, char **argv)
MPI_Barrier(comm);
//.......................................................................
// Once phase has been initialized, map solid to account for 'smeared' interface
// for (i=0; i<N; i++) Averages->SDs(i) -= (1.0); //
for (i=0; i<N; i++) Averages->SDs(i) -= (1.0); //
//.......................................................................
// Finalize setup for averaging domain
//Averages->SetupCubes(Dm);
@@ -910,13 +910,13 @@ int main(int argc, char **argv)
*/
/* Averages->WriteSurfaces(0);
*/
sprintf(LocalRankFilename,"%s%s","Phase.",LocalRankString);
FILE *PHASE;
PHASE = fopen(LocalRankFilename,"wb");
fwrite(Averages->SDn.get(),8,N,PHASE);
fclose(PHASE);
*/
/**/
/* sprintf(LocalRankFilename,"%s%s","Pressure.",LocalRankString);
FILE *PRESS;