From a65256b0db0779edf7ea99f69bb8c6bf31f19e6d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 4 Dec 2006 15:55:05 +0000
Subject: [PATCH] better conv warning
---
Geo/GFace.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index a6476f5467..a90f61889d 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -1,4 +1,4 @@
-// $Id: GFace.cpp,v 1.26 2006-12-03 01:09:34 geuzaine Exp $
+// $Id: GFace.cpp,v 1.27 2006-12-04 15:55:05 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -449,17 +449,16 @@ void GFace::XYZtoUV(const double X, const double Y, const double Z,
jac[2][1] * (Z - P.z()));
err = DSQR(Unew - U) + DSQR(Vnew - V);
- err2 = DSQR(X - P.x()) + DSQR(Y - P.y()) + DSQR(Z - P.z());
+ err2 = sqrt(DSQR(X - P.x()) + DSQR(Y - P.y()) + DSQR(Z - P.z()));
iter++;
U = Unew;
V = Vnew;
}
-
if(iter < MaxIter && err <= Precision &&
Unew <= umax && Vnew <= vmax &&
Unew >= umin && Vnew >= vmin){
- if (onSurface && err2 > Precision * CTX.lc)
+ if (onSurface && err2 > 1.e-4 * CTX.lc)
Msg(WARNING,"Converged for i=%d j=%d (err=%g iter=%d) BUT xyz error = %g",
i, j, err, iter, err2);
return;
--
GitLab