From f8424318113ecd55e4ea3515d72d661470f050e5 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Mon, 19 Mar 2018 14:05:14 -0400 Subject: [PATCH] Added pore network preprocessing tool --- 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 f9570fbf..174db8fe 100644 --- a/tests/lbpm_porenetwork_pp.cpp +++ b/tests/lbpm_porenetwork_pp.cpp @@ -191,16 +191,16 @@ int main(int argc, char **argv) double s = (alpha*xi + beta*yj + gamma*zk)/(alpha*alpha + beta*beta + gamma*gamma); double distance=0.f; 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)); } 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 = x + alpha*s; double ys = y + beta*s; double zs = z + gamma*s; - distance = radius - sqrt((xi-xs)*(xi-xs) + (yj-ys)*(yj-ys) + (zk-zs)*(zk-zs)) + distance = radius - sqrt((xi-xs)*(xi-xs) + (yj-ys)*(yj-ys) + (zk-zs)*(zk-zs)); } if (distance < Averages.SDs(i,j,k)) Averages.SDs(i,j,k) = distance; }