diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp index 95c47d1930e7bc7ecc9f23e55813068383d2d81d..a7f527ea7aba92faf65d228f222553753e56b4d1 100644 --- a/Mesh/DivideAndConquer.cpp +++ b/Mesh/DivideAndConquer.cpp @@ -162,7 +162,8 @@ static Segment UpperCommonTangent(DT vl, DT vr) static int Qtest(PointNumero h, PointNumero i, PointNumero j, PointNumero k) { if((h == i) && (h == j) && (h == k)) { - Msg::Error("3 identical points in Qtest"); + Msg::Error("Identical points in triangulation: increase element size " + "or Mesh.RandomFactor"); return 0; } @@ -495,14 +496,14 @@ static int ConvertDListToTriangles(DocRecord *doc) { // on suppose que n >= 3. gPointArray est suppose OK. - Striangle *striangle; + STriangle *striangle; int n, i, j; int count = 0, count2 = 0; PointNumero aa, bb, cc; PointRecord *gPointArray = doc->points; n = doc->numPoints; - striangle = (Striangle *) Malloc(n * sizeof(Striangle)); + striangle = (STriangle *) Malloc(n * sizeof(STriangle)); count2 = CountPointsOnHull(n, doc->points); // nombre de triangles que l'on doit obtenir diff --git a/Mesh/DivideAndConquer.h b/Mesh/DivideAndConquer.h index 52d5aee7bbe181545bfb134f8b99ce9b9693a64d..7fdd85ac5cabfc8f5381bfc8c6453d2581392c9e 100644 --- a/Mesh/DivideAndConquer.h +++ b/Mesh/DivideAndConquer.h @@ -28,13 +28,13 @@ struct _CDLIST{ typedef struct{ PointNumero search; PointNumero already; -}demi_triangle; +}HalfTriangle; typedef struct{ - demi_triangle *info; + HalfTriangle *info; PointNumero *t; int t_length, info_length; -}Striangle; +}STriangle; typedef struct{ PointNumero begin;