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-07-15 09:22:22 -04:00
commit 2c1eddbaa0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/ComponentLabel.cpp
View File

@ -267,7 +267,7 @@ int main(int argc, char **argv)
//........................................................................ //........................................................................
Averages.dPdt(iglobal,jglobal,kglobal) = 0.0; Averages.dPdt(iglobal,jglobal,kglobal) = 0.0;
Averages.Phase_tplus(iglobal,jglobal,kglobal) = 0.0; Averages.Phase_tplus(iglobal,jglobal,kglobal) = 0.0;
Averages.Phase_minus(iglobal,jglobal,kglobal) = 0.0; Averages.Phase_tminus(iglobal,jglobal,kglobal) = 0.0;
//........................................................................ //........................................................................
} }
} }
@ -407,14 +407,14 @@ int main(int argc, char **argv)
//printf("Number of NWP components = %i \n",number_NWP_components); //printf("Number of NWP components = %i \n",number_NWP_components);
// Map the signed distance for the analysis // Map the signed distance for the analysis
for (i=0; i<Nx*Ny*Nz; i++) SignDist(i) -= (1.0);
// Compute the porosity // Compute the porosity
porosity=0.0; porosity=0.0;
for (k=0; k<Nz; k++){ for (k=0; k<Nz; k++){
for (j=0; j<Ny; j++){ for (j=0; j<Ny; j++){
for (i=0; i<Nx; i++){ for (i=0; i<Nx; i++){
if (SignDist(i,j,k) > 0.0){ Averages.SDs(i,j,k) -= (1.0);
if (Averages.SDs(i,j,k) > 0.0){
porosity += 1.0; porosity += 1.0;
} }
} }
@ -424,6 +424,7 @@ int main(int argc, char **argv)
printf("Media porosity is %f \n",porosity); printf("Media porosity is %f \n",porosity);
double beta=0.95; double beta=0.95;
int timestep=5;
Averages.Initialize(); Averages.Initialize();
Averages.ComputeDelPhi(); Averages.ComputeDelPhi();
Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn); Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn);