DivideAndConquer now throws an exception, so that we don't crash if it fails

Geo/SOrientedBoundingBox.cpp

@@ -319,8 +319,8 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
                                     Axis1, Axis2, Axis3));
   }
 
-
-  // We take the smallest component, then project the data on the plane defined by the other twos
+  // We take the smallest component, then project the data on the plane defined
+  // by the other twos
 
   int smallest_comp = 0;
   if (sizes[0] <= sizes[1] && sizes[0] <= sizes[2])
@@ -334,9 +334,11 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
   // We just ignore the coordinate corresponding to smallest_comp.
   std::vector<SPoint2*> points;
   for (int i = 0; i < num_vertices; i++) {
-    SPoint2* p = new SPoint2(projected(smallest_comp==0?1:0,i), projected(smallest_comp==2?1:2,i));
+    SPoint2* p = new SPoint2(projected(smallest_comp==0?1:0,i),
+                             projected(smallest_comp==2?1:2,i));
     bool keep = true;
-    for (std::vector<SPoint2*>::iterator point = points.begin();point != points.end();point++) {
+    for (std::vector<SPoint2*>::iterator point = points.begin();
+         point != points.end();point++) {
       if ( fabs((*p)[0] -(**point)[0]) < 10e-10 && fabs((*p)[1] -(**point)[1]) < 10e-10 ) {
         keep = false;
         break;
@@ -354,12 +356,19 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
   record.numPoints = points.size();
   srand((unsigned)time(0));
   for (unsigned int i = 0; i < points.size(); i++) {
-    record.points[i].where.h = points[i]->x()+(10e-6)*sizes[smallest_comp==0?1:0]*(-0.5+((double)rand())/RAND_MAX);
-    record.points[i].where.v = points[i]->y()+(10e-6)*sizes[smallest_comp==2?1:0]*(-0.5+((double)rand())/RAND_MAX);
+    record.points[i].where.h = points[i]->x()+
+      (10e-6)*sizes[smallest_comp==0?1:0]*(-0.5+((double)rand())/RAND_MAX);
+    record.points[i].where.v = points[i]->y()+
+      (10e-6)*sizes[smallest_comp==2?1:0]*(-0.5+((double)rand())/RAND_MAX);
     record.points[i].adjacent = NULL;
   }
 
+  try{
     record.MakeMeshWithPoints();
+  }
+  catch(const char *err){
+    Msg::Error("%s", err);
+  }
 
   std::vector<Segment> convex_hull;
   for (int i = 0; i < record.numTriangles; i++) {
@@ -373,8 +382,10 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
 
     for (int j = 0; j < 3; j++) {
       bool okay = true;
-      for (std::vector<Segment>::iterator seg = convex_hull.begin(); seg != convex_hull.end(); seg++) {
-        if ( ((*seg).from == segs[j].from && (*seg).from == segs[j].to) ||  ((*seg).from == segs[j].to && (*seg).from == segs[j].from)) {
+      for (std::vector<Segment>::iterator seg = convex_hull.begin();
+           seg != convex_hull.end(); seg++) {
+        if ( ((*seg).from == segs[j].from && (*seg).from == segs[j].to) ||
+             ((*seg).from == segs[j].to && (*seg).from == segs[j].from)) {
           convex_hull.erase(seg);
           okay = false;
           break;
@@ -401,7 +412,8 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
   least_rectangle.size->at(0) = -1;
   least_rectangle.size->at(1) = 1;
 
-  for (std::vector<Segment>::iterator seg = convex_hull.begin(); seg != convex_hull.end(); seg++) {
+  for (std::vector<Segment>::iterator seg = convex_hull.begin();
+       seg != convex_hull.end(); seg++) {
 
     fullVector<double> segment(2);
     //segment(0) = record.points[(*seg).from].where.h - record.points[(*seg).to].where.h;
@@ -457,7 +469,8 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
     rotation_inv.mult(axis2,axis_rot2);
 //*/
 
-    if ((least_rectangle.area() == -1) || (max_x-min_x)*(max_y-min_y) < least_rectangle.area()) {
+    if ((least_rectangle.area() == -1) ||
+        (max_x-min_x)*(max_y-min_y) < least_rectangle.area()) {
 
       least_rectangle.size->at(0) = max_x-min_x;
       least_rectangle.size->at(1) = max_y-min_y;
@@ -558,7 +571,8 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
     aux2(i) = left_eigv(i,smallest_comp==0?1:0);
     aux3(i) = left_eigv(i,smallest_comp==2?1:2);
   }
-  center = aux1*center_pca + aux2*least_rectangle.center->at(0) + aux3*least_rectangle.center->at(1);
+  center = aux1*center_pca + aux2*least_rectangle.center->at(0) +
+    aux3*least_rectangle.center->at(1);
   //center[1] = -center[1];
 
   /*
@@ -578,7 +592,8 @@ SOrientedBoundingBox* SOrientedBoundingBox::buildOBB(std::vector<SPoint3> vertic
 #endif
 }
 
-double SOrientedBoundingBox::compare(SOrientedBoundingBox& obb1, SOrientedBoundingBox& obb2)
+double SOrientedBoundingBox::compare(SOrientedBoundingBox& obb1,
+                                     SOrientedBoundingBox& obb2)
 {
   // "center term"
   double center_term = norm(obb1.getCenter() - obb2.getCenter());
@@ -587,7 +602,8 @@ double SOrientedBoundingBox::compare(SOrientedBoundingBox& obb1, SOrientedBoundi
   double size_term = 0.0;
   for (int i = 0; i < 3; i++) {
     if ((obb1.getSize())(i) + (obb2.getSize())(i) != 0) {
-      size_term += fabs((obb1.getSize())(i) - (obb2.getSize())(i)) / ((obb1.getSize())(i) + (obb2.getSize())(i));
+      size_term += fabs((obb1.getSize())(i) - (obb2.getSize())(i)) /
+        ((obb1.getSize())(i) + (obb2.getSize())(i));
     }
   }
 
@@ -598,5 +614,4 @@ double SOrientedBoundingBox::compare(SOrientedBoundingBox& obb1, SOrientedBoundi
   }
 
   return (center_term + size_term + orientation_term);
-
 }

Mesh/DivideAndConquer.cpp

@@ -162,8 +162,8 @@ Segment DocRecord::UpperCommonTangent(DT vl, DT vr)
 int DocRecord::Qtest(PointNumero h, PointNumero i, PointNumero j, PointNumero k)
 {
   if((h == i) && (h == j) && (h == k)) {
-    Msg::Error("Identical points in triangulation: increase element size "
-               "or Mesh.RandomFactor");
+    throw "Identical points in triangulation: increase element size "
+      "or Mesh.RandomFactor";
     return 0;
   }
 
@@ -959,7 +959,13 @@ void DocRecord::concave(double x,double y,GFace* gf)
     points[i].vicinity.clear();
   }
 
+  try{
     MakeMeshWithPoints();
+  }
+  catch(const char *err){
+    Msg::Error("%s", err);
+  }
+
   set = tagInterior(x,y);
   for(it2 = set.begin(); it2 != set.end(); it2++){
     index1 = triangles[*it2].a;

Mesh/meshGFace.cpp

@@ -1090,7 +1090,12 @@ bool meshGenerator(GFace *gf, int RECUR_ITER,
     //   -) It contains triangles outside the domain (the first edge
     //      loop is the outer one)
     Msg::Debug("Meshing of the convex hull (%d points)", points.size());
+    try{
       doc.MakeMeshWithPoints();
+    }
+    catch(const char *err){
+      Msg::Error("%s", err);
+    }
     Msg::Debug("Meshing of the convex hull (%d points) done", points.size());
 
     for(int i = 0; i < doc.numTriangles; i++) {
@@ -1900,7 +1905,13 @@ static bool meshGeneratorPeriodic(GFace *gf, bool debug = true)
     //   -) It contains triangles outside the domain (the first edge
     //      loop is the outer one)
     Msg::Debug("Meshing of the convex hull (%d points)", nbPointsTotal);
+
+    try{
       doc.MakeMeshWithPoints();
+    }
+    catch(const char *err){
+      Msg::Error("%s", err);
+    }
 
     for(int i = 0; i < doc.numTriangles; i++){
       int a = doc.triangles[i].a;

Plugin/Triangulate.cpp

@@ -138,7 +138,12 @@ PView *GMSH_TriangulatePlugin::execute(PView *v)
   }
 
   // triangulate
+  try{
     doc.MakeMeshWithPoints();
+  }
+  catch(const char *err){
+    Msg::Error("%s", err);
+  }
 
   // create output (using unperturbed data)
   PView *v2 = new PView();

benchmarks/extrude/aorta_extrude.geo

 Merge "aorta2.stl";
 CreateTopology;
 
-//Merge "aortaRADIUS2.bgm";
+Merge "aortaRADIUS2.bgm";
 
 // create a boundary layer, whose tickness is given in View[0]
 out1[] = Extrude{Surface{-1}; Layers{4, 0.5}; Using Index[0]; Using View[0]; };