From 4a8399e8359d86f3a355afd97543f0499843eff1 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Sun, 30 Aug 2015 14:22:21 -0400 Subject: [PATCH] Continuing to refactor Euler characteristic --- common/TwoPhase.cpp | 10 +++++----- common/pmmc.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/TwoPhase.cpp b/common/TwoPhase.cpp index 7b54a609..492e598c 100644 --- a/common/TwoPhase.cpp +++ b/common/TwoPhase.cpp @@ -781,12 +781,12 @@ void TwoPhase::ComponentAverages() * Euler Number = vertices - edges + faces * double geomavg_EulerCharacteristic(PointList, PointCount, TriList, TriCount); */ - n_nw_pts=n_nw_tris=0; - geomavg_MarchingCubes(SDn,fluid_isovalue,i,j,k,nw_pts,n_nw_pts,nw_tris,n_nw_tris); - if (n_nw_pts > 0 ){ - + if (n_nw_pts + n_ns_pts > 0 ){ + printf("n_nw_pts=%i \n",n_nw_pts); + n_nw_pts=n_nw_tris=0; + geomavg_MarchingCubes(SDn,fluid_isovalue,i,j,k,nw_pts,n_nw_pts,nw_tris,n_nw_tris); + printf("n_nw_pts=%i, n_nw_tris=%i \n",n_nw_pts,n_nw_tris); double euler = geomavg_EulerCharacteristic(nw_pts,nw_tris,n_nw_pts,n_nw_tris,i,j,k); - ComponentAverages_NWP(EULER,LabelNWP) += euler; } } diff --git a/common/pmmc.h b/common/pmmc.h index 76cf25cc..ff696d91 100644 --- a/common/pmmc.h +++ b/common/pmmc.h @@ -10,7 +10,6 @@ #include "Array.h" #include "PointList.h" #include "Utilities.h" -//#include "vecLib/clapack.h" using namespace std; @@ -4359,6 +4358,7 @@ inline double geomavg_EulerCharacteristic(DTMutableList &Points, IntArray int nvert=npts; int nside=2*nvert-3; int nface=nvert-2; + //if (ntris != nface){ // nface = ntris; // nside =