- fix in SolverDefaultImplemention init

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12922 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 13, 2012 · c22336a · c22336a
1 parent 9c9fe31
commit c22336a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/SimulationRuntime/cpp/Source/Solver/CVode/Implementation/CVode.cpp b/SimulationRuntime/cpp/Source/Solver/CVode/Implementation/CVode.cpp
@@ -158,9 +158,6 @@ void Cvode::init()
     //
 
     // Set initial values for CVODE
-
-    // System und Events aktualisieren
-    continous_system->update(IContinous::CONTINOUS);
     // giveVars (Zustand holen)
     continous_system->giveVars(_zInit);
     memcpy(_z,_zInit,_dimSys*sizeof(double));
@@ -222,6 +219,8 @@ void Cvode::init()
     // CVODE is ready for integration
     //
    SolverDefaultImplementation::init();
+    // System und Events aktualisieren
+    continous_system->update(IContinous::CONTINOUS);
   }
 }
 

diff --git a/SimulationRuntime/cpp/Source/Solver/Implementation/SolverDefaultImplementation.cpp b/SimulationRuntime/cpp/Source/Solver/Implementation/SolverDefaultImplementation.cpp
@@ -105,7 +105,7 @@ void SolverDefaultImplementation::init()
     _system->writeOutput(IDAESystem::HEAD_LINE);
 
     // Allocate array with values of zero functions
-    if (_dimZeroFunc != event_system->getDimZeroFunc())
+    if (event_system->getDimZeroFunc() > 0)
     {
         // Number (dimension) of zero functions
         _dimZeroFunc = event_system->getDimZeroFunc();