-added some functions required for vxworks

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23084 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 30, 2014 · 72429c5 · 72429c5
1 parent 19e6ea1
commit 72429c5
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 16 deletions.
diff --git a/SimulationRuntime/cpp/Core/SimController/SimController.cpp b/SimulationRuntime/cpp/Core/SimController/SimController.cpp
@@ -119,9 +119,9 @@ void SimController::StartVxWorks(boost::shared_ptr<IMixedSystem> mixedsystem, Si
 }
 
 // Added for real-time simulation using VxWorks and Bodas
-void SimController::calcOneStep()
+void SimController::calcOneStep(double cycletime)
 {
-  _simMgr->runSingleStep();
+  _simMgr->runSingleStep(cycletime);
 }
 
 

diff --git a/SimulationRuntime/cpp/Core/SimController/SimManager.cpp b/SimulationRuntime/cpp/Core/SimController/SimManager.cpp
@@ -110,8 +110,9 @@ void SimManager::initialize()
 #endif
 }
 
-void SimManager::runSingleStep()
+void SimManager::runSingleStep(double cycletime)
 {
+  _solver->setcycletime(cycletime);
   _solver->solve(_solverTask);
 }
 

diff --git a/SimulationRuntime/cpp/Include/Core/SimController/ISimController.h b/SimulationRuntime/cpp/Include/Core/SimController/ISimController.h
@@ -35,23 +35,28 @@ struct SimSettings
 /*SimController to start and stop the simulation*/
 class ISimController
 {
+
 public:
   /// Enumeration to control the time integration
   virtual ~ISimController() {};
 #if defined(__vxworks) || defined(__TRICORE__)
 #else
-  virtual std::pair<boost::shared_ptr<IMixedSystem>, boost::shared_ptr<ISimData> > LoadSystem(boost::shared_ptr<ISimData> (*createSimDataCallback)(), boost::shared_ptr<IMixedSystem> (*createSystemCallback)(IGlobalSettings*, boost::shared_ptr<IAlgLoopSolverFactory>, boost::shared_ptr<ISimData>), string modelKey) = 0;
+  virtual std::pair<boost::shared_ptr<IMixedSystem>,boost::shared_ptr<ISimData> > LoadSystem(boost::shared_ptr<ISimData> (*createSimDataCallback)(), boost::shared_ptr<IMixedSystem> (*createSystemCallback)(IGlobalSettings*, boost::shared_ptr<IAlgLoopSolverFactory>, boost::shared_ptr<ISimData>), string modelKey)=0;
 #endif
-  virtual std::pair<boost::shared_ptr<IMixedSystem>, boost::shared_ptr<ISimData> > LoadSystem(string modelLib, string modelKey) = 0;
-  virtual std::pair<boost::shared_ptr<IMixedSystem>, boost::shared_ptr<ISimData> > LoadModelicaSystem(PATH modelica_path,string modelKey) = 0;
+  virtual std::pair<boost::shared_ptr<IMixedSystem>,boost::shared_ptr<ISimData> > LoadSystem(string modelLib,string modelKey) = 0;
+  virtual std::pair<boost::shared_ptr<IMixedSystem>,boost::shared_ptr<ISimData> > LoadModelicaSystem(PATH modelica_path,string modelKey) = 0;
 
-  // Starts the simulation; modelKey: Modelica model name; modelica_path: path to Modelica system dll
+  /*
+  Starts the simulation
+  modelKey: Modelica model name
+  modelica_path: path to Modelica system dll
+  */
   virtual void Start(boost::shared_ptr<IMixedSystem> mixedsystem, SimSettings simsettings, string modelKey)=0;
-  // Stops the simulation
-  virtual void Stop() = 0;
 
-  // Functions for realtime-usage (VxWorks and BODAS)
   virtual void StartVxWorks(boost::shared_ptr<IMixedSystem> mixedsystem, SimSettings simsettings) = 0;
   virtual boost::shared_ptr<ISimData> getSimData(string modelname) = 0;
-  virtual void calcOneStep() = 0;
+  virtual void calcOneStep(double cycletime) = 0;
+
+  /// Stops the simulation
+  virtual void Stop() = 0;
 };
diff --git a/SimulationRuntime/cpp/Include/Core/SimController/SimController.h b/SimulationRuntime/cpp/Include/Core/SimController/SimController.h
@@ -20,7 +20,7 @@ class SimController : public ISimController,
     virtual std::pair<boost::shared_ptr<IMixedSystem>, boost::shared_ptr<ISimData> > LoadSystem(string modelLib, string modelKey);
 #if defined(__vxworks) || defined(__TRICORE__)
 #else
-    virtual std::pair<boost::shared_ptr<IMixedSystem>, boost::shared_ptr<ISimData> > LoadSystem(boost::shared_ptr<ISimData> (*createSimDataCallback)(), boost::shared_ptr<IMixedSystem> (*createSystemCallback)(IGlobalSettings*, boost::shared_ptr<IAlgLoopSolverFactory>, boost::shared_ptr<ISimData>), string modelKey);
+    virtual std::pair<boost::shared_ptr<IMixedSystem>,boost::shared_ptr<ISimData> > LoadSystem(boost::shared_ptr<ISimData> (*createSimDataCallback)(), boost::shared_ptr<IMixedSystem> (*createSystemCallback)(IGlobalSettings*, boost::shared_ptr<IAlgLoopSolverFactory>, boost::shared_ptr<ISimData>), string modelKey);
 #endif
     virtual std::pair<boost::shared_ptr<IMixedSystem>, boost::shared_ptr<ISimData> > LoadModelicaSystem(PATH modelica_path, string modelKey);
     /// Starts the simulation
@@ -31,7 +31,7 @@ class SimController : public ISimController,
     // for real-time usage (VxWorks and BODAS)
     virtual boost::shared_ptr<ISimData> getSimData(string modelname);
     virtual void StartVxWorks(boost::shared_ptr<IMixedSystem> mixedsystem, SimSettings simsettings);
-    virtual void calcOneStep();
+    virtual void calcOneStep(double cycletime);
 
 private:
     void initialize(PATH library_path, PATH modelicasystem_path);

diff --git a/SimulationRuntime/cpp/Include/Core/SimController/SimManager.h b/SimulationRuntime/cpp/Include/Core/SimController/SimManager.h
@@ -34,8 +34,8 @@ class SimManager
     void runSimulation();
     void initialize();
 
-    // for real-time usage (VxWorks and BODAS)
-    void runSingleStep();
+  // for real-time usage (VxWorks and BODAS)
+  void runSingleStep(double cycletime);
 
 private:
     void computeEndTimes(std::vector<std::pair<double,int> > &tStopsSub);

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/ISolver.h b/SimulationRuntime/cpp/Include/Core/Solver/ISolver.h
@@ -67,6 +67,8 @@ class ISolver
   /// Write out statistical information (statistical information of last simulation, e.g. time, number of steps, etc.)
   virtual void writeSimulationInfo() = 0;
 
+  virtual void setcycletime(double cycletime) = 0;
+
   /// Indicates whether a solver error occurred during integration, returns type of error and provides error message
   /*virtual const int reportErrorMessage(ostream& messageStream) = 0;*/
 };
diff --git a/SimulationRuntime/cpp/Include/Solver/CVode/CVode.h b/SimulationRuntime/cpp/Include/Solver/CVode/CVode.h
@@ -151,7 +151,9 @@ class Cvode
   int calcJacobian(double t, long int N, N_Vector fHelp, N_Vector errorWeight, N_Vector jthcol, double* y, N_Vector fy, DlsMat Jac);
   void initializeColoredJac();
 
-
+  void setcycletime(double cycletime);
+
+
   ISolverSettings
     *_cvodesettings;              ///< Input      - Solver settings
 

diff --git a/SimulationRuntime/cpp/Include/Solver/Euler/Euler.h b/SimulationRuntime/cpp/Include/Solver/Euler/Euler.h
@@ -54,6 +54,7 @@ class  Euler : public ISolver, public SolverDefaultImplementation
     /// Indicates whether a solver error occurred during integration, returns type of error and provides error message
     virtual const int reportErrorMessage(ostream& messageStream);
     virtual bool stateSelection();
+	virtual void setcycletime(double cycletime);
 private:
     /// (Explizites) Euler-Verfahren 1. Ordnung
     /*

diff --git a/SimulationRuntime/cpp/Solver/CVode/CVode.cpp b/SimulationRuntime/cpp/Solver/CVode/CVode.cpp
@@ -857,3 +857,6 @@ int Cvode::check_flag(void *flagvalue, const char *funcname, int opt)
 
   return (0);
 }
+
+void Cvode::setcycletime(double cycletime){}
+
diff --git a/SimulationRuntime/cpp/Solver/Euler/Euler.cpp b/SimulationRuntime/cpp/Solver/Euler/Euler.cpp
@@ -1311,3 +1311,5 @@ void Euler::calcJac(double* yHelp, double* _fHelp, const double* _f, double* jac
         }
     }
 }
+
+  void Euler::setcycletime(double cycletime){}