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 E McClure
2014-09-27 15:22:24 -04:00
parent 81a9cedcc2 a31715c752
commit 8ca62c52dc
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/Domain.h
View File

@@ -727,12 +727,12 @@ inline void SignedDistance(double *Distance, int nspheres, double *List_cx, doub
r = List_rad[p]; r = List_rad[p];
// Check if // Check if
// Range for this sphere in global indexing // Range for this sphere in global indexing
imin = int ((cx-r)/hx); imin = int ((cx-2*r)/hx);
imax = int ((cx+r)/hx)+2; imax = int ((cx+2*r)/hx)+2;
jmin = int ((cy-r)/hy); jmin = int ((cy-2*r)/hy);
jmax = int ((cy+r)/hy)+2; jmax = int ((cy+2*r)/hy)+2;
kmin = int ((cz-r)/hz); kmin = int ((cz-2*r)/hz);
kmax = int ((cz+r)/hz)+2; kmax = int ((cz+2*r)/hz)+2;
// Obviously we have to do something at the edges // Obviously we have to do something at the edges
if (imin<0) imin = 0; if (imin<0) imin = 0;
if (imin>Nx) imin = Nx; if (imin>Nx) imin = Nx;

2
tests/BlobAnalysis.cpp
View File

@@ -593,7 +593,7 @@ int main(int argc, char **argv)
DoubleArray BlobAverages(NUM_AVERAGES,nblobs); DoubleArray BlobAverages(NUM_AVERAGES,nblobs);
// Map the signed distance for the analysis // Map the signed distance for the analysis
for (i=0; i<Nx*Ny*Nz; i++) SignDist.data[i] -= (1.0); // for (i=0; i<Nx*Ny*Nz; i++) SignDist.data[i] -= (1.0);
// Compute the porosity // Compute the porosity
porosity=0.0; porosity=0.0;