Using the integral curvature to compute the Euler characteristic

This commit is contained in:
James E McClure 2015-09-02 16:57:19 -04:00
parent e64b17c71a
commit 3f25268e23

View File

@ -733,12 +733,11 @@ void TwoPhase::ComponentAverages()
double euler;
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);
euler = geomavg_EulerCharacteristic(nw_pts,nw_tris,n_nw_pts,n_nw_tris,i,j,k);
//if (LabelNWP < 0){
// printf("Error: rank=%i \n",Dm.rank);
// printf("mesh =%i,%i,%i \n",i+Dm.iproc*(Nx-2),j+Dm.jproc*(Ny-2),k+Dm.kproc*(Nz-2));
// printf("Label=%i \n",LabelNWP);
//}
// Compute Euler characteristic from integral of gaussian curvature
euler = pmmc_CubeSurfaceInterpValue(CubeValues,GaussCurvature,nw_pts,nw_tris,Values,
i,j,k,n_nw_pts,n_nw_tris);
//euler = geomavg_EulerCharacteristic(nw_pts,nw_tris,n_nw_pts,n_nw_tris,i,j,k);
ComponentAverages_NWP(EULER,LabelNWP) += euler;
}
}