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

Refactoring

Browse Source
This commit is contained in:
James E McClure 2015-06-16 21:39:26 -04:00
parent 2a6f84ad95
commit 5dfe4f8044
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/TwoPhase.h
View File

@ -300,7 +300,7 @@ public:
}; };
void TwoPhase::ColorToSignedDistance(double Beta, double *ColorData, double *DistData){ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, DoubleArray &DistData){
double factor,temp,value; double factor,temp,value;
factor=0.5/Beta; factor=0.5/Beta;
@ -311,13 +311,14 @@ void TwoPhase::ColorToSignedDistance(double Beta, double *ColorData, double *Dis
else DistData[n] = factor*log((1.0+value)/(1.0-value)); else DistData[n] = factor*log((1.0+value)/(1.0-value));
if (DistData[n] > 1.0) DistData[n] = 1.0; if (DistData[n] > 1.0) DistData[n] = 1.0;
if (DistData[n] < -1.0) DistData[n] = -1.0; if (DistData[n] < -1.0) DistData[n] = -1.0;
}*/ }
*/
// Initialize to -1,1 (segmentation) // Initialize to -1,1 (segmentation)
for (int k=0; k<Nz; k++){ for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){ for (int j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){ for (int i=0; i<Nx; i++){
value = ColorData[n];
value = ColorData(i,j,k);
temp = factor*log((1.0+value)/(1.0-value)); temp = factor*log((1.0+value)/(1.0-value));
if (temp > 1.0) DistData(i,j,k) = 1.0; if (temp > 1.0) DistData(i,j,k) = 1.0;
else if (temp < -1.0) DistData(i,j,k) = -1.0; else if (temp < -1.0) DistData(i,j,k) = -1.0;

8
tests/lbpm_color_simulator.cpp
View File

@ -1551,8 +1551,8 @@ int main(int argc, char **argv)
//........................................................................... //...........................................................................
// Copy the phase indicator field for the earlier timestep // Copy the phase indicator field for the earlier timestep
DeviceBarrier(); DeviceBarrier();
CopyToHost(Averages.Phase.get(),Phi,N*sizeof(double)); CopyToHost(Averages.Phase_tplus.get(),Phi,N*sizeof(double));
Averages.ColorToSignedDistance(beta,Averages.Phase.get(),Averages.Phase_tplus.get()); // Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.Phase_tplus);
//........................................................................... //...........................................................................
} }
if (timestep%5000 == 0){ if (timestep%5000 == 0){
@ -1575,11 +1575,11 @@ int main(int argc, char **argv)
// Copy the phase indicator field for the later timestep // Copy the phase indicator field for the later timestep
DeviceBarrier(); DeviceBarrier();
CopyToHost(Averages.Phase_tminus.get(),Phi,N*sizeof(double)); CopyToHost(Averages.Phase_tminus.get(),Phi,N*sizeof(double));
Averages.ColorToSignedDistance(beta,Averages.Phase_tminus.get(),Averages.Phase_tminus.get()); // Averages.ColorToSignedDistance(beta,Averages.Phase_tminus,Averages.Phase_tminus);
//.................................................................... //....................................................................
Averages.Initialize(); Averages.Initialize();
Averages.ComputeDelPhi(); Averages.ComputeDelPhi();
Averages.ColorToSignedDistance(beta,Averages.Phase.get(),Averages.SDn.get()); Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn);
Averages.UpdateMeshValues(); Averages.UpdateMeshValues();
Averages.ComputeLocal(); Averages.ComputeLocal();
Averages.Reduce(); Averages.Reduce();