fix in cpp runtime for the initialization interation. Calling initial…

…izeEquations instead of evaluate git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18002 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 4, 2013 · e370734 · e370734
1 parent 93de7f7
commit e370734
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -2163,7 +2163,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
   bool getCondition(unsigned int index);
   private:
     //Methods:
-     void initEquations();
+    
   
     
      /*
@@ -2541,6 +2541,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
     virtual void setInitial(bool);
     /// (Re-) initialize the system of equations and bounded parameters
     virtual void initialize();
+    virtual  void initEquations();
  // Returns the history object to query simulation results
    virtual IHistory* getHistory();
    virtual void stepCompleted(double time);
@@ -6411,11 +6412,11 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
    void <%lastIdentOfPath(modelInfo.name)%>::setInitial(bool status)
     {
       _initial = status;
-    if(_initial)
+   if(_initial)
         _callType = IContinuous::DISCRETE;
       else
        _callType = IContinuous::CONTINUOUS;
-       
+   
   
     }
   >>

diff --git a/SimulationRuntime/cpp/Core/SimController/Initialization.cpp b/SimulationRuntime/cpp/Core/SimController/Initialization.cpp
@@ -29,14 +29,14 @@ void Initialization::initializeSystem()
    while((restart /*|| cond_restart*/) && !(iter++ > 15))
    {
     event_system->getConditions(conditions0);
-    continous_system->evaluate(IContinuous::ALL);    // vxworksupdate
+    _system->initEquations();    // vxworksupdate
     restart = event_system->checkForDiscreteEvents();
     event_system->getConditions(conditions1);
+    event_system->saveDiscreteVars();
     cond_restart = !std::equal (conditions1, conditions1+dim,conditions0);
    }
 
    mixed_system->saveAll();
-  continous_system->evaluate(IContinuous::ALL);    // vxworksupdate
-  _system->setInitial(false);
+   _system->setInitial(false);
 
 }
diff --git a/SimulationRuntime/cpp/Include/Core/System/ISystemInitialization.h b/SimulationRuntime/cpp/Include/Core/System/ISystemInitialization.h
@@ -23,6 +23,7 @@ class ISystemInitialization
 
   /// (Re-) initialize the system of equations and bounded parameters
   virtual void initialize() = 0;
+  virtual void initEquations() = 0;
   //sets the initial status
   virtual void setInitial(bool) = 0;
   //returns the intial status