From fce34e05fcd93d364e281d1d0a0be8730ceae0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= <stefantroeger@gmx.net>
Date: Wed, 25 Dec 2013 17:15:54 +0100
Subject: [PATCH] avoid rescales when scale value is in allowed range

---
 src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp b/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp
index 5d6e63f6c..6d1fea10f 100644
--- a/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp
+++ b/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp
@@ -107,7 +107,11 @@ SystemSolver<Sys>::Rescaler::Rescaler(boost::shared_ptr<Cluster> c, Mes& m) : cl
 
 template<typename Sys>
 void SystemSolver<Sys>::Rescaler::operator()() {
-    mes.Scaling = scaleClusters(calculateScale());
+    const Scalar sc = calculateScale();
+
+    if(sc<MINFAKTOR || sc>MAXFAKTOR)
+        mes.Scaling = scaleClusters(sc);
+
     rescales++;
 };
 
@@ -428,9 +432,6 @@ void SystemSolver<Sys>::solveCluster(boost::shared_ptr<Cluster> cluster, Sys& sy
 
                 Rescaler re(cluster, mes);
                 re();
-		re();
-		re();
-		re();
                 sys.kernel().solve(mes, re);
 #ifdef USE_LOGGING
                 BOOST_LOG(log)<< "Numbers of rescale: "<<re.rescales;