diff --git a/Geo/Curvature.h b/Geo/Curvature.h index 59876b6b70d21f993bd76ad2c10cfb20c1f836e1..898de2be1cb071ce5fe2280c56e584eac873f6f4 100644 --- a/Geo/Curvature.h +++ b/Geo/Curvature.h @@ -12,8 +12,7 @@ #include<map> #include<vector> -class Curvature -{ +class Curvature { private: //----------------------------------------- diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp index a495a7027741e7c98e6533b750857c0cbe09f81d..15560e39979da97cb846065c661895158091c34b 100644 --- a/Geo/GEdge.cpp +++ b/Geo/GEdge.cpp @@ -245,6 +245,7 @@ SPoint2 GEdge::reparamOnFace(const GFace *face, double epar,int dir) const double GEdge::curvature(double par) const { + printf("in curv edge \n"); SVector3 d1 = firstDer(par); SVector3 d2 = secondDer(par); diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp index 2baf220afa782e402fc89794ce5acf059eb384fb..acfa8e3db37ed678c0be0f255d2229d973f161c2 100644 --- a/Geo/GFace.cpp +++ b/Geo/GFace.cpp @@ -687,6 +687,7 @@ double GFace::curvatureMax(const SPoint2 ¶m) const double GFace::curvatures(const SPoint2 ¶m, SVector3 *dirMax, SVector3 *dirMin, double *curvMax, double *curvMin) const { + printf("in curv face \n"); Pair<SVector3, SVector3> D1 = firstDer(param); if(geomType() == Plane){ diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp index 0e34284b40d664b15ea03199154372aaacbd2511..03c554194c2c4085a47c51094ef6dc3c4a5d9713 100644 --- a/Geo/GFaceCompound.cpp +++ b/Geo/GFaceCompound.cpp @@ -681,9 +681,9 @@ bool GFaceCompound::parametrize() const _rbf->solveHarmonicMap(Oper, _ordered, _coords, coordinates); //_rbf->computeCurvature(coordinates); + //printStuff(); //exit(1); - //printStuff(); } buildOct(); @@ -1585,7 +1585,7 @@ void GFaceCompound::secondDer(const SPoint2 ¶m, { if(!oct) parametrize(); - Msg::Debug("Computation of the second derivatives is not implemented for compound faces"); + Msg::Fatal("Computation of the second derivatives is not implemented for compound faces"); } diff --git a/benchmarks/boolean/wikipedia.py b/benchmarks/boolean/wikipedia.py index e39a9ef6e7c167646821bacdaafd21e143748669..260ef1cae9965b04e70b286963a6c70bc69444e6 100644 --- a/benchmarks/boolean/wikipedia.py +++ b/benchmarks/boolean/wikipedia.py @@ -30,9 +30,9 @@ myModel.computeBooleanDifference(myModel2); myModel.setAsCurrent(); -myModel.mesh(3); -myModel.save("wikipedia.msh"); +#myModel.mesh(3); +#myModel.save("wikipedia.msh"); myModel.save("wikipedia.brep"); -#FlGui.instance(); -#FlGui.run(); +FlGui.instance(); +FlGui.run(); diff --git a/benchmarks/curvature/Torus.geo b/benchmarks/curvature/Torus.geo index b38ec2eabbad45af4997015439b4e3a6d54d8af6..a74fb2c8894636fd4ae29f3ec9f66b4d537fc6cc 100644 --- a/benchmarks/curvature/Torus.geo +++ b/benchmarks/curvature/Torus.geo @@ -1,11 +1,12 @@ Mesh.CharacteristicLengthFactor = 0.6; Mesh.CharacteristicLengthFromCurvature = 1; //-clcurv -Mesh.CharacteristicLengthMin = 0.1; //-clmin +Mesh.CharacteristicLengthMin = 0.01; //-clmin Mesh.CharacteristicLengthMax = 2.5; //-clmax Mesh.LcIntegrationPrecision=1.e-5; //-epslc1d Mesh.MinimumCirclePoints=15; //default=7 Mesh.CharacteristicLengthExtendFromBoundary = 0; +Mesh.CharacteristicLengthFromPoints = 0; lc = 0.1; Point(1) = {2.0,0.0,0.0,lc}; diff --git a/benchmarks/curvature/TorusRemesh.geo b/benchmarks/curvature/TorusRemesh.geo index 82272f3322c2198ab079bb333fe64863c0499b84..7c2d3a9e6829f234ccfbe3523c0bd7bd7df4d20f 100644 --- a/benchmarks/curvature/TorusRemesh.geo +++ b/benchmarks/curvature/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; @@ -17,8 +17,8 @@ Mesh.CharacteristicLengthExtendFromBoundary=0; //Merge "TorusRemeshedBAMG.stl"; //Merge "SimpleTorus.msh"; -Merge "TorusInput.stl"; -//Merge "occtorus.stl"; +//Merge "TorusInput.stl"; +Merge "occtorus.stl"; CreateTopology;