Changeset 9fdfa27 in OpenModelica

Timestamp:

2015-04-10T17:45:03+02:00 (9 years ago)

Author:

Ruediger Franke <ruediger.franke@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

305ab23b

Parents:

d9e3df5

Message:

adapt FMI2 to new SimVars

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@25500 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Files:

• Compiler/Template/CodegenFMUCpp.tpl (modified) (3 diffs)
• SimulationRuntime/cpp/Core/System/CMakeLists.txt (modified) (1 diff)
• SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp (modified) (1 diff)

Compiler/Template/CodegenFMUCpp.tpl

@@ -87 +87 @@
   class <%lastIdentOfPath(modelInfo.name)%>WriteOutput {
    public:
-    <%lastIdentOfPath(modelInfo.name)%>WriteOutput(IGlobalSettings* globalSettings, boost::shared_ptr<IAlgLoopSolverFactory> nonLinSolverFactory, boost::shared_ptr<ISimData> simData) {}
+    <%lastIdentOfPath(modelInfo.name)%>WriteOutput(IGlobalSettings* globalSettings, boost::shared_ptr<IAlgLoopSolverFactory> nonLinSolverFactory, boost::shared_ptr<ISimData> simData, boost::shared_ptr<ISimVars> simVars) {}
     virtual ~<%lastIdentOfPath(modelInfo.name)%>WriteOutput() {}
 
@@ -175 +175 @@
   class <%modelIdentifier%>FMU: public <%modelIdentifier%>Extension {
    public:
+    // create simulation variables
+    static ISimVars *createSimVars();
+
     // constructor
     <%modelIdentifier%>FMU(IGlobalSettings* globalSettings,
         boost::shared_ptr<IAlgLoopSolverFactory> nonLinSolverFactory,
-        boost::shared_ptr<ISimData> simData);
+        boost::shared_ptr<ISimData> simData,
+        boost::shared_ptr<ISimVars> simVars);
 
     // initialization
@@ -236 +240 @@
     '#include "FMU/FMULibInterface.cpp"'%>
 
+  // create simulation variables
+  #include <System/FactoryExport.h>
+  #include <System/SimVars.h>
+
+  ISimVars *<%modelIdentifier%>FMU::createSimVars() {
+    return new SimVars(<%numRealvars(modelInfo)%>, <%numIntvars(modelInfo)%>, <%numBoolvars(modelInfo)%>, <%getPreVarsCount(simCode)%>, <%numStatevars(modelInfo)%>, <%numStateVarIndex(modelInfo)%>);
+  }
+
   // constructor
   <%modelIdentifier%>FMU::<%modelIdentifier%>FMU(IGlobalSettings* globalSettings,
       boost::shared_ptr<IAlgLoopSolverFactory> nonLinSolverFactory,
-      boost::shared_ptr<ISimData> simData):
-    PreVariables(<%getPreVarsCount(simCode)%>),
-    <%modelIdentifier%>(globalSettings, nonLinSolverFactory, simData),
-    <%modelIdentifier%>Extension(globalSettings, nonLinSolverFactory, simData) {
+      boost::shared_ptr<ISimData> simData,
+      boost::shared_ptr<ISimVars> simVars):
+    <%modelIdentifier%>(globalSettings, nonLinSolverFactory, simData, simVars),
+    <%modelIdentifier%>Extension(globalSettings, nonLinSolverFactory, simData, simVars) {
   }
 

SimulationRuntime/cpp/Core/System/CMakeLists.txt

@@ -46 +46 @@
         ${CMAKE_SOURCE_DIR}/Include/Core/System/DiscreteEvents.h
         ${CMAKE_SOURCE_DIR}/Include/Core/System/ContinuousEvents.h
+        ${CMAKE_SOURCE_DIR}/Include/Core/System/SimVars.h
+        ${CMAKE_SOURCE_DIR}/Core/System/FactoryExport.h
   DESTINATION include/omc/cpp/Core/System)
 install (FILES

SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp

@@ -76 +76 @@
   _model = boost::shared_ptr<MODEL_CLASS>
     (new MODEL_CLASS(&_global_settings, solver_factory,
-                     boost::shared_ptr<ISimData>(new SimData())));
+                     boost::shared_ptr<ISimData>(new SimData()),
+                     boost::shared_ptr<ISimVars>(MODEL_CLASS::createSimVars())));
   _model->initialize();
   _string_buffer.resize(_model->getDimString());