change solver lower limit and simmanger end time tolerance of cpp run…

…time git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21450 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jul 9, 2014 · 3a6590e · 3a6590e
1 parent 2f85364
commit 3a6590e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SimulationRuntime/cpp/Core/SimController/SimManager.cpp b/SimulationRuntime/cpp/Core/SimController/SimManager.cpp
@@ -305,7 +305,7 @@ void SimManager::computeEndTimes(std::vector<std::pair<double,int> > &tStopsSub)
                               counterTimes++;
                               _solverTask = ISolver::SOLVERCALL(_solverTask | ISolver::RECALL);
                         }
-                        while(iter->first + counterTimes * (iter->second) < (_tEnd +_config->getSimControllerSettings()->dTendTol))
+                        while(iter->first + counterTimes * (iter->second) < _tEnd )
                         {
                               tStopsSub.push_back(std::make_pair(iter->first + counterTimes * (iter->second),counterEvents));
                               counterTimes++;
@@ -348,7 +348,7 @@ void SimManager::computeEndTimes(std::vector<std::pair<double,int> > &tStopsSub)
                               counterTimes++;
                               _solverTask = ISolver::SOLVERCALL(_solverTask | ISolver::RECALL);
                         }
-                        while(_tStart + iter->first + counterTimes * (iter->second) < _tEnd +_config->getSimControllerSettings()->dTendTol)
+                        while(_tStart + iter->first + counterTimes * (iter->second) < _tEnd)
                         {
                               tStopsSub.push_back(std::make_pair(_tStart + iter->first + counterTimes * (iter->second),counterEvents));
                               counterTimes++;

diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/OMCFactory.cpp b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/OMCFactory.cpp
@@ -134,7 +134,7 @@ SimSettings OMCFactory::ReadSimulationParameter(int argc,  const char* argv[])
         modelica_path.make_preferred();
 
 
-     SimSettings settings = {solver,linSolver,nonLinSolver,starttime,stoptime,stepsize,1e-20,0.01,tollerance,resultsfilename,outputFomat};
+     SimSettings settings = {solver,linSolver,nonLinSolver,starttime,stoptime,stepsize,1e-24,0.01,tollerance,resultsfilename,outputFomat};
 
      _library_path = libraries_path;
     _modelicasystem_path = modelica_path;