From 5047db56415312820e4724b9131a7da016d1bada Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Wed, 28 Oct 2009 14:07:43 +0000
Subject: [PATCH]
---
Geo/GFaceCompound.cpp | 5 ++++-
Mesh/highOrderSmoother.cpp | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index 4e54e12c0b..9b1adc0ad5 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -270,7 +270,7 @@ bool GFaceCompound::checkOrientation(int iter) const
double p2[2] = {v3[0],v3[1]};
a_new = robustPredicates::orient2d(p0, p1, p2);
if(count == 0) a_old=a_new;
- if(a_new*a_old < 0. && fabs(a_new) > 1.e10){
+ if(a_new*a_old < 0.){// && fabs(a_new) > 1.e10){
oriented = false;
break;
}
@@ -1396,6 +1396,9 @@ bool GFaceCompound::checkTopology() const
bool GFaceCompound::checkAspectRatio() const
{
+ if ((*(_compound.begin()))->geomType() != GEntity::DiscreteSurface)
+ return true;
+
bool paramOK = true;
if(allNodes.empty()) buildAllNodes();
diff --git a/Mesh/highOrderSmoother.cpp b/Mesh/highOrderSmoother.cpp
index d72fd166b0..3490ac6247 100644
--- a/Mesh/highOrderSmoother.cpp
+++ b/Mesh/highOrderSmoother.cpp
@@ -431,7 +431,7 @@ void highOrderSmoother::computeMetricVector(GFace *gf,
void highOrderSmoother::smooth_metric(std::vector<MElement*> & all, GFace *gf)
{
-#ifdef HAVE_TAUCS__
+#ifdef HAVE_TAUCS
linearSystemCSRTaucs<double> *lsys = new linearSystemCSRTaucs<double>;
#else
linearSystemCSRGmm<double> *lsys = new linearSystemCSRGmm<double>;
--
GitLab