fix for save pre varibales in cpp runtime

fix for typo extended save operation for extra save value Belonging to [master]: - OpenModelica/OMCompiler#2112
OpenModelica · Jan 17, 2018 · b1a437a · b1a437a
1 parent 96f7d96
commit b1a437a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -6472,7 +6472,7 @@ case SES_NONLINEAR(nlSystem = nls as NONLINEARSYSTEM(__)) then
       let varname = '_system-><%cref(componentRef, useFlatArrayNotation)%>'
       <<
       <%varname%> = vars[<%i0%>];
-      _discrete_events->save(<%varname%>);
+      _discrete_events->save(<%varname%>,<%varname%>);
       >>
     else
       <<
@@ -11275,10 +11275,10 @@ case SES_SIMPLE_ASSIGN(__) then
 
   match cref
   case CREF_QUAL(ident = "$PRE")  then
+    let sysderef = match context case ALGLOOP_CONTEXT(__) then '_system->'
     <<
-    //<%cref(componentRef, useFlatArrayNotation)%> = <%expPart%>;
-    //_discrete_events->save( <%cref(componentRef, useFlatArrayNotation)%>);
-    _discrete_events->pre(<%cref(componentRef, useFlatArrayNotation)%>)=<%expPart%>;
+     _discrete_events->save(<%sysderef%><%cref(componentRef, useFlatArrayNotation)%>,<%expPart%>);
+    //_discrete_events->pre(<%cref(componentRef, useFlatArrayNotation)%>)=<%expPart%>;
     >>
   else
   match exp
@@ -12343,7 +12343,7 @@ template saveconditionvar1(Integer index1, Exp relation,SimCode simCode ,Text& e
   match relation
   case RELATION(index=zerocrossingIndex) then
     <<
-    _discrete_events->save(_condition<%zerocrossingIndex%>);
+    _discrete_events->save(_condition<%zerocrossingIndex%>,_condition<%zerocrossingIndex%>);
     >>
 end saveconditionvar1;
 
@@ -13390,7 +13390,7 @@ template algStmtReinit(DAE.Statement stmt, Context context, Text &varDecls /*BUF
     >>
     */
     <<
-    _discrete_events->save(<%expPart1%>);
+    _discrete_events->save(<%expPart1%>,<%expPart1%>);
      <%preExp%>
     <%expPart1%> = <%expPart2%>;
     >>

diff --git a/SimulationRuntime/cpp/.vs/ProjectSettings.json b/SimulationRuntime/cpp/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}
diff --git a/SimulationRuntime/cpp/.vs/VSWorkspaceState.json b/SimulationRuntime/cpp/.vs/VSWorkspaceState.json
@@ -0,0 +1,9 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\Core",
+    "\\Core\\SimController"
+  ],
+  "SelectedNode": "\\Core\\SimController\\Configuration.cpp",
+  "PreviewInSolutionExplorer": false
+}
diff --git a/SimulationRuntime/cpp/.vs/cpp/v15/.suo b/SimulationRuntime/cpp/.vs/cpp/v15/.suo
diff --git a/SimulationRuntime/cpp/.vs/slnx.sqlite b/SimulationRuntime/cpp/.vs/slnx.sqlite
diff --git a/SimulationRuntime/cpp/Core/System/DiscreteEvents.cpp b/SimulationRuntime/cpp/Core/System/DiscreteEvents.cpp
@@ -40,25 +40,25 @@ void DiscreteEvents::savePreVars(double vars[], unsigned int n)
 /**
 Saves a variable in _sim_vars->_pre_real_vars vector
 */
-void DiscreteEvents::save(double& var)
+void DiscreteEvents::save(double& var,double value)
 {
-  _sim_vars->getPreVar(var) = var;
+  _sim_vars->getPreVar(var) = value;
 }
 
 /**
 Saves a variable in _sim_vars->_pre_int_vars vector
 */
-void DiscreteEvents::save(int& var)
+void DiscreteEvents::save(int& var,double value)
 {
-  _sim_vars->getPreVar(var) = var;
+  _sim_vars->getPreVar(var) = value;
 }
 
 /**
 Saves a variable in _sim_vars->_pre_bool_vars vector
 */
-void DiscreteEvents::save(bool& var)
+void DiscreteEvents::save(bool& var,double value)
 {
-  _sim_vars->getPreVar(var) = var;
+  _sim_vars->getPreVar(var) = value;
 }
 
 /**

diff --git a/SimulationRuntime/cpp/Include/Core/System/DiscreteEvents.h b/SimulationRuntime/cpp/Include/Core/System/DiscreteEvents.h
@@ -18,9 +18,9 @@ class BOOST_EXTENSION_EVENTHANDLING_DECL DiscreteEvents
 
 
   //saves a variable in _pre_vars vector
-  void save(double& var);
-  void save(int& var);
-  void save(bool& var);
+  void save(double& var,double value);
+  void save(int& var,double value);
+  void save(bool& var,double value);
   //void savePreVars(double vars [], unsigned int n);