OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Continuing to refactor Euler characteristic

Browse Source
This commit is contained in:
James E McClure 2015-08-30 14:22:21 -04:00
parent cc857e285a
commit 4a8399e835
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/TwoPhase.cpp
View File

@ -781,12 +781,12 @@ void TwoPhase::ComponentAverages()
* Euler Number = vertices - edges + faces * Euler Number = vertices - edges + faces
* double geomavg_EulerCharacteristic(PointList, PointCount, TriList, TriCount); * double geomavg_EulerCharacteristic(PointList, PointCount, TriList, TriCount);
*/ */
n_nw_pts=n_nw_tris=0; if (n_nw_pts + n_ns_pts > 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",n_nw_pts);
if (n_nw_pts > 0 ){ 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); double euler = geomavg_EulerCharacteristic(nw_pts,nw_tris,n_nw_pts,n_nw_tris,i,j,k);
ComponentAverages_NWP(EULER,LabelNWP) += euler; ComponentAverages_NWP(EULER,LabelNWP) += euler;
} }
} }

2
common/pmmc.h
View File

@ -10,7 +10,6 @@
#include "Array.h" #include "Array.h"
#include "PointList.h" #include "PointList.h"
#include "Utilities.h" #include "Utilities.h"
//#include "vecLib/clapack.h"
using namespace std; using namespace std;
@ -4359,6 +4358,7 @@ inline double geomavg_EulerCharacteristic(DTMutableList<Point> &Points, IntArray
int nvert=npts; int nvert=npts;
int nside=2*nvert-3; int nside=2*nvert-3;
int nface=nvert-2; int nface=nvert-2;
//if (ntris != nface){ //if (ntris != nface){
// nface = ntris; // nface = ntris;
// nside = // nside =