diff --git a/Geo/Curvature.cpp b/Geo/Curvature.cpp index 9605fda053817dd3c0101051e23a58d154cdafa5..6bfbd321b69189614b455189f7df8ccd7ce993ae 100644 --- a/Geo/Curvature.cpp +++ b/Geo/Curvature.cpp @@ -688,24 +688,23 @@ void Curvature::computePointareas(){ const int V0 = _VertexToInt[A->getNum()]; const int V1 = _VertexToInt[B->getNum()]; const int V2 = _VertexToInt[C->getNum()]; - - if (_isOnBoundary[V0]) - { - factor[0] = 1.0; - } - else {factor[0] = 1.0;} - - if (_isOnBoundary[V1]) - { - factor[1] = 1.0; - } - else {factor[1] = 1.0;} - - if (_isOnBoundary[V2]) - { - factor[2] = 1.0; - } - else {factor[2] = 1.0;} + + // if (_isOnBoundary[V0]) + // { + // factor[0] = 1.0; + // } + // else { factor[0] = 1.0;} + // if (_isOnBoundary[V1]) + // { + // factor[1] = 1.0; + // } + // else {factor[1] = 1.0;} + + // if (_isOnBoundary[V2]) + // { + // factor[2] = 1.0; + // } + // else {factor[2] = 1.0;} //Edges e[0] = SVector3(C->x() - B->x(), C->y() - B->y(), C->z() - B->z()); //vector side of a triangular element @@ -1085,7 +1084,6 @@ void Curvature::computeCurvature_Rusinkiewicz(int isMax) const int V2 = _VertexToInt[C->getNum()]; ///Set up an initial coordinate system per vertex: - _pdir1[V0] = SVector3(B->x() - A->x(), B->y() - A->y(), B->z() - A->z()); _pdir1[V1] = SVector3(C->x() - B->x(), C->y() - B->y(), C->z() - B->z()); _pdir1[V2] = SVector3(A->x() - C->x(), A->y() - C->y(), A->z() - C->z()); @@ -1120,8 +1118,6 @@ void Curvature::computeCurvature_Rusinkiewicz(int isMax) e[1] = SVector3(A->x() - C->x(), A->y() - C->y(), A->z() - C->z()); e[2] = SVector3(B->x() - A->x(), B->y() - A->y(), B->z() - A->z()); - //SVector3 e[3] = {SVector3(C->x() - B->x(), C->y() - B->y(), C->z() - B->z()), SVector3(A->x() - C->x(), A->y() - C->y(), A->z() - C->z()), SVector3(B->x() - A->x(), B->y() - A->y(), B->z() - A->z()) }; - //N-T-B coordinate system per face t = e[0]; t.normalize(); @@ -1132,15 +1128,6 @@ void Curvature::computeCurvature_Rusinkiewicz(int isMax) //Estimate curvature based on variations of normals along edges: //intialization: m = SVector3(0.0, 0.0, 0.0); - //maybe double m[3] = { 0.0, 0.0, 0.0 }; - // w *= 0.0; //Reset w to zero - for (int i = 0; i< 3; ++i) - { - for (int j = 0; j<3; ++j) - { - w(i,j) = 0.0; - } - } //filling: for (int j = 0; j< 3; ++j) diff --git a/benchmarks/curvature/Torus/TorusRemesh.geo b/benchmarks/curvature/Torus/TorusRemesh.geo index 6494f85744f67032ca3f20e10155585c70d44c98..f900f94e5e35b4299c297a6568186556c19cc02d 100644 --- a/benchmarks/curvature/Torus/TorusRemesh.geo +++ b/benchmarks/curvature/Torus/TorusRemesh.geo @@ -2,7 +2,7 @@ // The following settings were copied from benchmarks/step/linkrods.geo // ====================================================================== -Mesh.Algorithm=6; //1=MeshAdapt, 5=Delaunay, 6=Frontal, 7=bamg +Mesh.Algorithm=7; //1=MeshAdapt, 5=Delaunay, 6=Frontal, 7=bamg Mesh.RemeshParametrization= 1; //(0) harmonic (1) conformal Mesh.RemeshAlgorithm = 1; //(0) nosplit (1) automatic (2) split only with metis ///Default: 1