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

Forget distance for JFM

Browse Source
This commit is contained in:
James E McClure 2015-11-14 12:02:41 -05:00
parent 4c0d22170d
commit b4991caece
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/TwoPhase.cpp
View File

@ -180,7 +180,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
double factor,temp,value; double factor,temp,value;
factor=0.5/Beta; factor=0.5/Beta;
// 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(i,j,k); value = ColorData(i,j,k);
@ -210,11 +210,11 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
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) += 2.5; 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 j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){ for (int i=0; i<Nx; i++){
@ -222,7 +222,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
} }
} }
} }
*/ //
// 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];
} }

4
tests/lbpm_color_simulator.cpp
View File

@ -910,13 +910,13 @@ int main(int argc, char **argv)
*/ */
/* Averages->WriteSurfaces(0); /* Averages->WriteSurfaces(0);
*/
sprintf(LocalRankFilename,"%s%s","Phase.",LocalRankString); sprintf(LocalRankFilename,"%s%s","Phase.",LocalRankString);
FILE *PHASE; FILE *PHASE;
PHASE = fopen(LocalRankFilename,"wb"); PHASE = fopen(LocalRankFilename,"wb");
fwrite(Averages->SDn.get(),8,N,PHASE); fwrite(Averages->SDn.get(),8,N,PHASE);
fclose(PHASE); fclose(PHASE);
/**/ */
/* sprintf(LocalRankFilename,"%s%s","Pressure.",LocalRankString); /* sprintf(LocalRankFilename,"%s%s","Pressure.",LocalRankString);
FILE *PRESS; FILE *PRESS;

1
tests/lbpm_color_simulator.h
View File

@ -164,7 +164,6 @@ private:
fillHalo<double>& fillData; fillHalo<double>& fillData;
}; };
// Helper class to run the analysis from within a thread // Helper class to run the analysis from within a thread
// Note: Averages will be modified after the constructor is called // Note: Averages will be modified after the constructor is called
class AnalysisWorkItem: public ThreadPool::WorkItem class AnalysisWorkItem: public ThreadPool::WorkItem