From d1499dae44bfd92dad26278d1839776b5850c82f Mon Sep 17 00:00:00 2001 From: James E McClure Date: Thu, 26 Apr 2018 11:03:22 -0400 Subject: [PATCH] fixed porenetwork bug --- tests/lbpm_porenetwork_pp.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lbpm_porenetwork_pp.cpp b/tests/lbpm_porenetwork_pp.cpp index c0f705fe..6e9de20f 100644 --- a/tests/lbpm_porenetwork_pp.cpp +++ b/tests/lbpm_porenetwork_pp.cpp @@ -208,12 +208,12 @@ int main(int argc, char **argv) double zk = double(k) - z; // value of s along center line {x=alpha*s, y = beta*s, z=gamma*s} that is closest to i,j,k double s = (alpha*xi + beta*yj + gamma*zk)/(alpha*alpha + beta*beta + gamma*gamma); - double distance=0.f; + double distance=Averages.SDs(i,j,k); if (s > length){ - distance = radius - sqrt((xi-X)*(xi-X) + (yj-Y)*(yj-Y) + (zk-Z)*(zk-Z)); + //distance = radius - sqrt((xi-X)*(xi-X) + (yj-Y)*(yj-Y) + (zk-Z)*(zk-Z)); } else if (s<0){ - distance = radius - sqrt((xi-x)*(xi-x) + (yj-y)*(yj-y) + (zk-z)*(zk-z)); + //distance = radius - sqrt((xi-x)*(xi-x) + (yj-y)*(yj-y) + (zk-z)*(zk-z)); } else{ double xs = alpha*s;