added terminate function to cpp tempalte

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22400 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 22, 2014 · 991c2be · 991c2be
1 parent 6795340
commit 991c2be
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 67 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
diff --git a/SimulationRuntime/cpp/Core/Modelica/ModelicaSystem.cpp b/SimulationRuntime/cpp/Core/Modelica/ModelicaSystem.cpp
@@ -188,8 +188,9 @@ bool Modelica::checkForDiscreteEvents()
 
   return restart;
 }
-void Modelica::stepCompleted(double time)
+bool Modelica::stepCompleted(double time)
 {
+throw std::runtime_error("stepCompleted is not yet implemented");
 }
  bool Modelica::checkConditions()
  {

diff --git a/SimulationRuntime/cpp/Core/System/SystemDefaultImplementation.cpp b/SimulationRuntime/cpp/Core/System/SystemDefaultImplementation.cpp
@@ -48,6 +48,7 @@ SystemDefaultImplementation::SystemDefaultImplementation(IGlobalSettings *global
 ,_delay_max(0.0)
 ,_start_time(0.0)
 ,_terminal(false)
+,_terminate(false)
 ,_global_settings(globalSettings)
 {
 }
@@ -153,6 +154,7 @@ void SystemDefaultImplementation::initialize()
   }
   _start_time =0.0;
   _terminal =false;
+  _terminate =false;
 };
 
 

diff --git a/SimulationRuntime/cpp/Include/Core/Modelica/ModelicaSystem.h b/SimulationRuntime/cpp/Include/Core/Modelica/ModelicaSystem.h
@@ -132,7 +132,7 @@ class Modelica: public IMixedSystem ,public IContinuous ,public IEvent ,public I
   // System is able to provide the Jacobian symbolically
    virtual bool provideSymbolicJacobian() ;
    virtual void saveDiscreteVars();
-   virtual void stepCompleted(double time);
+   virtual bool stepCompleted(double time);
 private:
 
   //Methods:

diff --git a/SimulationRuntime/cpp/Include/Core/System/IContinuous.h b/SimulationRuntime/cpp/Include/Core/System/IContinuous.h
@@ -106,7 +106,7 @@ class IContinuous
     virtual void evaluateZeroFuncs(const UPDATETYPE command = UNDEF_UPDATE)= 0;
     virtual bool evaluateConditions(const UPDATETYPE command = UNDEF_UPDATE)= 0;
 
-    virtual void stepCompleted(double time) = 0;
+    virtual bool stepCompleted(double time) = 0;
 
 };
 

diff --git a/SimulationRuntime/cpp/Include/Core/System/SystemDefaultImplementation.h b/SimulationRuntime/cpp/Include/Core/System/SystemDefaultImplementation.h
@@ -167,6 +167,8 @@ class BOOST_EXTENSION_SYSTEM_DECL SystemDefaultImplementation
 
     bool _initial;
     bool _terminal;
+    bool _terminate;
+
     //SValuesMap _start_values;
     InitVars<double> _real_start_values;
     InitVars<int> _int_start_values;

diff --git a/SimulationRuntime/cpp/Solver/CVode/CVode.cpp b/SimulationRuntime/cpp/Solver/CVode/CVode.cpp
@@ -351,8 +351,10 @@ void Cvode::CVodeCore()
     //  -> Write output if true
     if (writeOutput)
       writeCVodeOutput(_tCurrent, _h, _locStps);
-
-    _continuous_system->stepCompleted(_tCurrent);
+
+    //set completed step to system and check if terminate was called
+    if(_continuous_system->stepCompleted(_tCurrent))
+        _solverStatus = DONE;
 
     // Perform state selection
     bool state_selection = stateSelection();