Merge pull request #521 from hugtalbot/fix_nostep_cg

FIX no step if condition on denominator is met at first step
sofa-framework · Dec 5, 2017 · 086e03c · 086e03c
2 parents 44c4f5b + 0ae8f64
commit 086e03c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/SofaKernel/modules/SofaBaseLinearSolver/CGLinearSolver.inl b/SofaKernel/modules/SofaBaseLinearSolver/CGLinearSolver.inl
@@ -216,8 +216,8 @@ void CGLinearSolver<TMatrix,TVector>::solve(Matrix& M, Vector& x, Vector& b)
         graph_den.push_back(den);
 
 
-        /// Break condition = THRESHOLD criterion regarding the denominator is reached
-        if( fabs(den)<f_smallDenominatorThreshold.getValue() )
+        /// Break condition = THRESHOLD criterion regarding the denominator is reached (but do at least one iteration)
+        if( fabs(den)<f_smallDenominatorThreshold.getValue() && nb_iter>1)
         {
             endcond = "threshold";
             if( verbose )