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

Refactoring -- compiles

Browse Source
This commit is contained in:
James E McClure 2015-06-16 21:50:29 -04:00
parent 5dfe4f8044
commit 724f87b630
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/TwoPhase.h
View File

@ -289,7 +289,7 @@ public:
void UpdateMeshValues();
void UpdateSolid();
void ComputeDelPhi();
void ColorToSignedDistance(double Beta, double *ColorData, double *DistData);
void ColorToSignedDistance(double Beta, DoubleArray &ColorData, DoubleArray &DistData);
void ComputeLocal();
void ComputeLocalBlob();
void Reduce();
@ -327,7 +327,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
}
}
SSO(DistData,id,Dm,10);
SSO(DistData,Dm.id,Dm,10);
// for (int n=0; n<Nx*Ny*Nz; n++) DistData[n] = ColorData[n];
}

6
tests/lb2_Color_wia_mpi.cpp
View File

@ -1661,7 +1661,7 @@ int main(int argc, char **argv)
// Copy the phase indicator field for the earlier timestep
DeviceBarrier();
CopyToHost(Averages.Phase.get(),Phi,N*sizeof(double));
Averages.ColorToSignedDistance(beta,Averages.Phase.get(),Averages.Phase_tplus.get());
// Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.Phase_tplus.get());
//...........................................................................
}
if (timestep%1000 == 0){
@ -1684,11 +1684,11 @@ int main(int argc, char **argv)
// Copy the phase indicator field for the later timestep
DeviceBarrier();
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.get(),Averages.Phase_tminus.get());
//....................................................................
Averages.Initialize();
Averages.ComputeDelPhi();
Averages.ColorToSignedDistance(beta,Averages.Phase.get(),Averages.SDn.get());
Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn);
Averages.UpdateMeshValues();
Averages.ComputeLocal();
Averages.Reduce();

2
tests/lbpm_BlobAnalysis.cpp
View File

@ -209,7 +209,7 @@ int main(int argc, char **argv)
Averages.UpdateSolid();
Averages.Initialize();
Averages.ComputeDelPhi();
Averages.ColorToSignedDistance(beta,Averages.Phase.get(),Averages.SDn.get());
Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn);
Averages.UpdateMeshValues();
Averages.ComputeLocalBlob();
Averages.Reduce();