From 365978223cb153571dd6e784dacab9b4e264d2b4 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 30 Mar 2009 11:38:14 +0000
Subject: [PATCH] better error message
---
Mesh/DivideAndConquer.cpp | 7 ++++---
Mesh/DivideAndConquer.h | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp
index 95c47d1930..a7f527ea7a 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 52d5aee7bb..7fdd85ac5c 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;
--
GitLab