From 4517e69e4581f8aff006127b3346c5ab7288b7eb Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 16 Jul 2013 16:11:02 +0000
Subject: [PATCH] better error checking
---
Geo/GEdgeCompound.cpp | 10 +++-------
benchmarks/3d/Falcon/falcon.script | 2 --
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Geo/GEdgeCompound.cpp b/Geo/GEdgeCompound.cpp
index cb4682e799..c0ea4f4574 100644
--- a/Geo/GEdgeCompound.cpp
+++ b/Geo/GEdgeCompound.cpp
@@ -26,8 +26,8 @@ static bool looksOk(int tag, std::vector<GEdge*> &compound)
return false;
}
if(compound.size() > 1 && compound[i]->getBeginVertex() == compound[i]->getEndVertex()){
- Msg::Error("Edge compound %d with subloop", tag);
- return false;
+ Msg::Warning("Edge compound %d with subloop", tag);
+ return true;
}
}
return true;
@@ -105,10 +105,6 @@ void GEdgeCompound::orderEdges()
Msg::Error("Compounds don't support curves without two bounding vertices");
return;
}
- if(v1 == v2){
- Msg::Error("Compounds do not support periodic curves");
- return;
- }
std::map<GVertex*, GEdge*>::iterator it1 = tempv.find(v1);
if (it1 == tempv.end()) {
tempv.insert(std::make_pair(v1, *it));
@@ -182,7 +178,7 @@ void GEdgeCompound::orderEdges()
_orientation[0] = 0;
}
else {
- Msg::Error("Compound Edge %d is wrong",tag());
+ Msg::Error("Compound Edge %d is wrong", tag());
return;
}
}
diff --git a/benchmarks/3d/Falcon/falcon.script b/benchmarks/3d/Falcon/falcon.script
index 061a741cfa..af884b7113 100644
--- a/benchmarks/3d/Falcon/falcon.script
+++ b/benchmarks/3d/Falcon/falcon.script
@@ -10,8 +10,6 @@ Mesh.CharacteristicLengthMax = lc;
Mesh.LcIntegrationPrecision = 1.e-5;
Mesh.MinimumCirclePoints = 50;
Mesh.CharacteristicLengthExtendFromBoundary = 0;
-Mesh.CharacteristicLengthFromCurvature = 0;
-Mesh.CharacteristicLengthFromPoints = 0;
Merge "InitialMeshFalcon.msh";
--
GitLab