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

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James McClure 2015-01-28 19:27:41 -05:00
commit 71c72616c3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/TwoPhase.h
View File

@ -306,12 +306,12 @@ public:
void TwoPhase::ColorToSignedDistance(double Beta, double *ColorData, double *DistData){ void TwoPhase::ColorToSignedDistance(double Beta, double *ColorData, double *DistData){
double temp=0.5/Beta; double temp=0.5/Beta;
/* for (int n=0; n<Nx*Ny*Nz; n++){ for (int n=0; n<Nx*Ny*Nz; n++){
double value = ColorData[n]; double value = ColorData[n];
DistData[n] = temp*log((1.0+value)/(1.0-value)); DistData[n] = temp*log((1.0+value)/(1.0-value));
} }
*/
for (int n=0; n<Nx*Ny*Nz; n++) DistData[n] = ColorData[n]; // for (int n=0; n<Nx*Ny*Nz; n++) DistData[n] = ColorData[n];
} }
void TwoPhase::ComputeDelPhi(){ void TwoPhase::ComputeDelPhi(){

1
tests/lb2_Color_wia_mpi.cpp
View File

@ -1684,6 +1684,7 @@ int main(int argc, char **argv)
//.................................................................... //....................................................................
// The following need to be called each time new averages are computed // The following need to be called each time new averages are computed
Averages.Initialize(); Averages.Initialize();
Averages.ComputeDelPhi();
Averages.ColorToSignedDistance(beta,Averages.Phase.data,Averages.SDn.data); Averages.ColorToSignedDistance(beta,Averages.Phase.data,Averages.SDn.data);
Averages.UpdateMeshValues(); Averages.UpdateMeshValues();
Averages.ComputeLocal(); Averages.ComputeLocal();

2
tests/lbpm_color_simulator.cpp
View File

@ -1574,8 +1574,8 @@ int main(int argc, char **argv)
CopyToHost(Averages.Phase_tminus.data,Phi,N*sizeof(double)); CopyToHost(Averages.Phase_tminus.data,Phi,N*sizeof(double));
Averages.ColorToSignedDistance(beta,Averages.Phase_tminus.data,Averages.Phase_tminus.data); Averages.ColorToSignedDistance(beta,Averages.Phase_tminus.data,Averages.Phase_tminus.data);
//.................................................................... //....................................................................
// The following need to be called each time new averages are computed
Averages.Initialize(); Averages.Initialize();
Averages.ComputeDelPhi();
Averages.ColorToSignedDistance(beta,Averages.Phase.data,Averages.SDn.data); Averages.ColorToSignedDistance(beta,Averages.Phase.data,Averages.SDn.data);
Averages.UpdateMeshValues(); Averages.UpdateMeshValues();
Averages.ComputeLocal(); Averages.ComputeLocal();