-added string Vars to simVars for VxWorks

OpenModelica · Sep 16, 2015 · 827c7a9 · 827c7a9
1 parent 3812922
commit 827c7a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/SystemVxWorksFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/SystemVxWorksFactory.h
@@ -45,9 +45,9 @@ struct SystemVxWorksFactory : public ObjectFactory<CreationPolicy>
         return system;
     }
 
-    boost::shared_ptr<ISimVars> createSimVars(size_t dim_real,size_t dim_int,size_t dim_bool,size_t dim_pre_vars,size_t dim_z,size_t z_i)
+    boost::shared_ptr<ISimVars> createSimVars(size_t dim_real,size_t dim_int,size_t dim_bool,size_t dim_string,size_t dim_pre_vars,size_t dim_z,size_t z_i)
     {
-      boost::shared_ptr<ISimVars> simVars = ObjectFactory<CreationPolicy>::_factory->LoadSimVars(dim_real,dim_int,dim_bool,dim_pre_vars,dim_z,z_i);
+      boost::shared_ptr<ISimVars> simVars = ObjectFactory<CreationPolicy>::_factory->LoadSimVars(dim_real,dim_int,dim_bool,dim_string,dim_pre_vars,dim_z,z_i);
         return simVars;
     }
 

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/VxWorksFactory/VxWorksFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/VxWorksFactory/VxWorksFactory.h
@@ -22,7 +22,8 @@ class VxWorksFactory
     boost::shared_ptr<ISolver> LoadSolver(IMixedSystem* system, string solver_name, boost::shared_ptr<ISolverSettings> solver_settings);
     boost::shared_ptr<IMixedSystem> LoadSystem(IGlobalSettings*, boost::shared_ptr<IAlgLoopSolverFactory>, boost::shared_ptr<ISimData> simData, boost::shared_ptr<ISimVars> sim_vars);
     boost::shared_ptr<ISimData> LoadSimData();
-    boost::shared_ptr<ISimVars> LoadSimVars(size_t dim_real,size_t dim_int,size_t dim_bool,size_t dim_pre_vars,size_t dim_z,size_t z_i);
+    boost::shared_ptr<ISimVars> LoadSimVars(size_t dim_real,size_t dim_int,size_t dim_bool, size_t dim_string, size_t dim_pre_vars,size_t dim_z,size_t z_i);
+
 
     boost::shared_ptr<ISolverSettings> LoadSolverSettings(string solver_name, boost::shared_ptr<IGlobalSettings>);
     boost::shared_ptr<IAlgLoopSolver> LoadAlgLoopSolver(IAlgLoop* algLoop, string solver_name, boost::shared_ptr<INonLinSolverSettings> solver_settings);
@@ -32,4 +33,4 @@ class VxWorksFactory
     string _library_path;
     string _modelicasystem_path;
 };
-/** @} */ // end of simcorefactoryVxworks
+/** @} */ // end of simcorefactoryVxworks
diff --git a/SimulationRuntime/cpp/SimCoreFactory/VxWorksFactory/VxWorksFactory.cpp b/SimulationRuntime/cpp/SimCoreFactory/VxWorksFactory/VxWorksFactory.cpp
@@ -12,7 +12,7 @@ extern "C" ISimController* createSimController(PATH library_path, PATH modelicas
 extern "C" ISettingsFactory* createSettingsFactory(PATH library_path,PATH modelicasystem_path);
 extern "C" IAlgLoopSolverFactory* createAlgLoopSolverFactory(IGlobalSettings* globalSettings,PATH library_path,PATH modelicasystem_path);
 extern "C" ISimData* createSimData();
-extern "C" ISimVars* createSimVars(size_t dim_real,size_t dim_int,size_t dim_bool,size_t dim_string,size_t dim_pre_vars,size_t dim_z,size_t z_i);
+extern "C" ISimVars* createSimVars(size_t dim_real,size_t dim_int,size_t dim_bool, size_t dim_string,size_t dim_pre_vars,size_t dim_z,size_t z_i);
 extern "C" ISolver* createRTEuler(IMixedSystem* system, ISolverSettings* settings);
 extern "C" ISolver* createRTRK(IMixedSystem* system, ISolverSettings* settings);
 extern "C" ISolverSettings* createRTEulerSettings(IGlobalSettings* globalSettings);
@@ -136,9 +136,9 @@ boost::shared_ptr<INonLinSolverSettings> VxWorksFactory::LoadAlgLoopSolverSettin
   }
     return boost::shared_ptr<INonLinSolverSettings>(solver_settings);
 }
-boost::shared_ptr<ISimVars> VxWorksFactory::LoadSimVars(size_t dim_real,size_t dim_int,size_t dim_bool,size_t dim_pre_vars,size_t dim_z,size_t z_i)
+boost::shared_ptr<ISimVars> VxWorksFactory::LoadSimVars(size_t dim_real,size_t dim_int,size_t dim_bool, size_t dim_string, size_t dim_pre_vars,size_t dim_z,size_t z_i)
 {
-    ISimVars* simVars = createSimVars(dim_real,dim_int,dim_bool,dim_pre_vars,dim_z,z_i);
+    ISimVars* simVars = createSimVars(dim_real,dim_int,dim_bool, dim_string, dim_pre_vars,dim_z,z_i);
     return boost::shared_ptr<ISimVars>(simVars);
 }
 /** @} */ // end of simcorefactoryVxworks