-some adaptions for vxworks

OpenModelica · Jul 1, 2015 · 876a710 · 876a710
1 parent b073360
commit 876a710
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -3312,7 +3312,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
   let constVariableInitialize = simulationInitFile(simCode, &extraFuncsDecl, stateDerVectorName, false)
     <<
     #if defined(__TRICORE__) || defined(__vxworks)
-      #include <DataExchange/SimDouble.h>
+      #include <Core/DataExchange/SimDouble.h>
     #endif
 
     /* Constructor */
@@ -10491,7 +10491,7 @@ template initAlgloopsolvers2(SimEqSystem eq, Context context, Text &varDecls, Si
       case SIMCODE(modelInfo = MODELINFO(__)) then
        <<
        if(_algLoopSolver<%num%>)
-           _algLoopSolver<%num%>->initialize();
+           _algLoopSolver<%num%>->initialize();<%\n%>
        >>
        end match
    case e as SES_NONLINEAR(nlSystem = nls as NONLINEARSYSTEM(__))
@@ -12799,6 +12799,7 @@ let modelname = identOfPath(modelInfo.name)
 '
 typedef struct <%modelname%>_struct
 {
+  void* __VFTABLEPOINTER;
   <%inputVars%>
   <%outputVars%>
   MLPI_IEC_REAL cycletime;

diff --git a/SimulationRuntime/cpp/Core/System/AlgLoopSolverFactory.cpp b/SimulationRuntime/cpp/Core/System/AlgLoopSolverFactory.cpp
@@ -25,6 +25,8 @@ boost::shared_ptr<IAlgLoopSolver> AlgLoopSolverFactory::createAlgLoopSolver(IAlg
 {
   if(algLoop->getDimReal() > 0)
   {
+
+	/*
     if(algLoop->isLinear())
     {
       try
@@ -42,7 +44,7 @@ boost::shared_ptr<IAlgLoopSolver> AlgLoopSolverFactory::createAlgLoopSolver(IAlg
       {
         //the linear solver was not found -> take the nonlinear solver
       }
-    }
+    }*/
 
     string nonlinsolver_name = _global_settings->getSelectedNonLinSolver();
     boost::shared_ptr<INonLinSolverSettings> algsolversetting= createNonLinSolverSettings(nonlinsolver_name);

diff --git a/SimulationRuntime/cpp/Include/Core/System/AlgLoopDefaultImplementation.h b/SimulationRuntime/cpp/Include/Core/System/AlgLoopDefaultImplementation.h
@@ -1,4 +1,5 @@
 #pragma once
+
 /** @addtogroup coreSystem
  *
  *  @{
@@ -97,4 +98,4 @@ class BOOST_EXTENSION_ALGLOOPDEFAULTIMPL_DECL AlgLoopDefaultImplementation
         _constraintType;                ///< Typ der Bindungsgleichungen (analog, digital, binär)
 
 };
-/** @} */ // end of coreSystem
+/** @} */ // end of coreSystem