Fixes issues with some of the test cases

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20197 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 17, 2014 · 7b72abd · 7b72abd
1 parent 7077847
commit 7b72abd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/SimulationRuntime/cpp/Solver/Newton/Newton.cpp b/SimulationRuntime/cpp/Solver/Newton/Newton.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "Newton.h"
 
@@ -102,7 +101,6 @@ void Newton::solve()
     while(_iterationStatus == CONTINUE)
     {
         _iterationStatus = DONE;
-        calcFunction(_y,_f);
         // Check stopping criterion
         calcFunction(_y,_f);
         if(totStps)
@@ -120,7 +118,7 @@ void Newton::solve()
             _iterationStatus = CONTINUE;
 
         // New right hand side
-
+	//calcFunction(_y,_f);
 
         if(_iterationStatus == CONTINUE)
         {
@@ -192,7 +190,7 @@ void Newton::calcJacobian()
     {
         // Reset variables for every column
         memcpy(_yHelp,_y,_dimSys*sizeof(double));
-        double stepsize=1.e-6+(1.e-6*_yHelp[j]);
+        double stepsize=1.e-6;//+(1.e-6*_yHelp[j]);
 
 
         // Finitializee difference

diff --git a/SimulationRuntime/cpp/Solver/Newton/NewtonSettings.cpp b/SimulationRuntime/cpp/Solver/Newton/NewtonSettings.cpp
@@ -5,9 +5,9 @@
 
 NewtonSettings::NewtonSettings()
 : iNewt_max                    (50)
-, dRtol                        (1e-9)
-, dAtol                        (1e-9)
-, dDelta                        (1.)
+, dRtol                        (1e-6)
+, dAtol                        (1e-6)
+, dDelta                    (1)
 {
 };