From c7d7dd62390970b0199da72260e15427443e7a24 Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Mon, 18 Jul 2011 07:22:28 +0000
Subject: [PATCH]

---
 Geo/Curvature.h                      | 3 +--
 Geo/GEdge.cpp                        | 1 +
 Geo/GFace.cpp                        | 1 +
 Geo/GFaceCompound.cpp                | 4 ++--
 benchmarks/boolean/wikipedia.py      | 8 ++++----
 benchmarks/curvature/Torus.geo       | 3 ++-
 benchmarks/curvature/TorusRemesh.geo | 6 +++---
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Geo/Curvature.h b/Geo/Curvature.h
index 59876b6b70..898de2be1c 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 a495a70277..15560e3997 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 2baf220afa..acfa8e3db3 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -687,6 +687,7 @@ double GFace::curvatureMax(const SPoint2 &param) const
 double GFace::curvatures(const SPoint2 &param, 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 0e34284b40..03c554194c 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 &param,
 {
 
   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 e39a9ef6e7..260ef1cae9 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 b38ec2eabb..a74fb2c889 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 82272f3322..7c2d3a9e68 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;
 
-- 
GitLab