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

Converting distance functions

Browse Source
This commit is contained in:
James E McClure 2015-11-12 17:25:11 -05:00
parent cc30219d57
commit fefe7f2b9a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/TwoPhase.cpp
View File

@ -191,9 +191,9 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
else TempID[n] = 0; else TempID[n] = 0;
temp = factor*log((1.0+value)/(1.0-value)); temp = factor*log((1.0+value)/(1.0-value));
if (value > 0.8) DistData(i,j,k) = 2.94*factor; if (value > 0.8) DistData(i,j,k) = 2.94*factor;
else 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; else DistData(i,j,k) = temp;
// Basic threshold // Basic threshold
//if (value > 0) DistData(i,j,k) = 1.0; //if (value > 0) DistData(i,j,k) = 1.0;
@ -205,7 +205,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
SSO(DistData,TempID,Dm,40); SSO(DistData,TempID,Dm,40);
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++){
DistData(i,j,k) += 1.0; DistData(i,j,k) += 1.0;

8
tests/lbpm_color_simulator.h
View File

@ -186,8 +186,6 @@ public:
} }
if ( (type&CalcDist) != 0 ) { if ( (type&CalcDist) != 0 ) {
PROFILE_START("Compute dist",1); PROFILE_START("Compute dist",1);
Averages.ColorToSignedDistance(beta,Averages.Phase_tplus,Averages.Phase_tplus);
Averages.ColorToSignedDistance(beta,Averages.Phase_tminus,Averages.Phase_tminus);
Averages.Initialize(); Averages.Initialize();
Averages.ComputeDelPhi(); Averages.ComputeDelPhi();
Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn); Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn);
@ -283,10 +281,12 @@ void run_analysis( int timestep, int restart_interval,
CopyToHost(phase->get(),Phi,N*sizeof(double)); CopyToHost(phase->get(),Phi,N*sizeof(double));
} }
if ( (type&CopyPhaseIndicator)!=0 ) { if ( (type&CopyPhaseIndicator)!=0 ) {
memcpy(Averages.Phase_tplus.get(),phase->get(),N*sizeof(double)); //memcpy(Averages.Phase_tplus.get(),phase->get(),N*sizeof(double));
Averages.ColorToSignedDistance(beta,phase,Averages.Phase_tplus);
} }
if ( (type&CalcDist)!=0 ) { if ( (type&CalcDist)!=0 ) {
memcpy(Averages.Phase_tminus.get(),phase->get(),N*sizeof(double)); //memcpy(Averages.Phase_tminus.get(),phase->get(),N*sizeof(double));
Averages.ColorToSignedDistance(beta,phase,Averages.Phase_tminus);
} }
if ( (type&CopyAverages) != 0 ) { if ( (type&CopyAverages) != 0 ) {
// Copy the members of Averages to the cpu (phase was copied above) // Copy the members of Averages to the cpu (phase was copied above)