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

Reverting to compute Euler characteristic in TwoPhase.h

Browse Source
This commit is contained in:
James E McClure 2015-08-30 12:46:42 -04:00
parent 7703b4bdcf
commit 21d6840223
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/TwoPhase.cpp
View File

@ -592,15 +592,16 @@ void TwoPhase::ComponentAverages()
*/ */
if (n_nw_pts+n_ns_pts > 0){ if (n_nw_pts+n_ns_pts > 0){
double euler; /* double euler;
euler = geomavg_EulerCharacteristic(nw_pts,nw_tris,n_nw_pts,n_nw_tris,i,j,k); euler = geomavg_EulerCharacteristic(nw_pts,nw_tris,n_nw_pts,n_nw_tris,i,j,k);
euler += geomavg_EulerCharacteristic(ns_pts,ns_tris,n_ns_pts,n_ns_tris,i,j,k); euler += geomavg_EulerCharacteristic(ns_pts,ns_tris,n_ns_pts,n_ns_tris,i,j,k);
// adjust for double-counted vertices and edges from the common curve // adjust for double-counted vertices and edges from the common curve
if (n_nws_pts > 0) euler += 1.0*n_nws_pts; if (n_nws_pts > 0) euler += 1.0*n_nws_pts;
ComponentAverages_NWP(EULER,LabelNWP) += euler; */
} int nvert = n_nw_pts+n_ns_pts-n_nws_pts;
int nside = 2*nvert-3;
/* //........................................................... int nface = nvert-2;
//...........................................................
// Check that this point is not on a previously computed face // Check that this point is not on a previously computed face
// Note direction that the marching cubes algorithm marches // Note direction that the marching cubes algorithm marches
// In parallel, other sub-domains fill in the lower boundary // In parallel, other sub-domains fill in the lower boundary
@ -648,7 +649,6 @@ void TwoPhase::ComponentAverages()
Point A = ns_pts(ns_tris(0,p)); Point A = ns_pts(ns_tris(0,p));
Point B = ns_pts(ns_tris(1,p)); Point B = ns_pts(ns_tris(1,p));
Point C = ns_pts(ns_tris(2,p)); Point C = ns_pts(ns_tris(2,p));
printf("A.x=%f, B.x=%f \n",A.x,B.x);
// Check side A-B // Check side A-B
bool newside = true; bool newside = true;
@ -672,7 +672,8 @@ void TwoPhase::ComponentAverages()
if (!newside) nside-=1; if (!newside) nside-=1;
} }
int euler=nvert-nside+nface; // euler characteristic for the cube int euler=nvert-nside+nface; // euler characteristic for the cube
*/ ComponentAverages_NWP(EULER,LabelNWP) += 1.0*euler;
// Counts for the vertices, sides and faces from the local cube // Counts for the vertices, sides and faces from the local cube
//ComponentAverages_NWP(NVERT,LabelNWP) += nvert; //ComponentAverages_NWP(NVERT,LabelNWP) += nvert;
//ComponentAverages_NWP(NSIDE,LabelNWP) += nside; //ComponentAverages_NWP(NSIDE,LabelNWP) += nside;