changed prefix of variable names in cpp runtime

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11186 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 23, 2012 · bdb511f · bdb511f
1 parent 920b75c
commit bdb511f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/Compiler/susan_codegen/SimCode/CodegenCpp.tpl b/Compiler/susan_codegen/SimCode/CodegenCpp.tpl
@@ -2762,7 +2762,7 @@ template cref(ComponentRef cr)
   match cr
   case CREF_IDENT(ident = "time") then "time"
   case WILD(__) then ''
-  else "$"+crefToCStr(cr)
+  else "_"+crefToCStr(cr)
 end cref;
 
 template cref2(ComponentRef cr)
@@ -2772,15 +2772,15 @@ template cref2(ComponentRef cr)
   case CREF_IDENT(ident = "xloc") then '<%crefStr(cr)%>'
   case CREF_IDENT(ident = "time") then "time"
   case WILD(__) then ''
-  else "$"+crefToCStr(cr)
+  else "_"+crefToCStr(cr)
 end cref2;
 
 template crefToCStr(ComponentRef cr)
  "Helper function to cref."
 ::=
   match cr
   case CREF_IDENT(__) then '<%ident%><%subscriptsToCStr(subscriptLst)%>'
-  case CREF_QUAL(__) then '<%ident%><%subscriptsToCStr(subscriptLst)%>$P<%crefToCStr(componentRef)%>'
+  case CREF_QUAL(__) then '<%ident%><%subscriptsToCStr(subscriptLst)%>_P_<%crefToCStr(componentRef)%>'
   case WILD(__) then ''
   else "CREF_NOT_IDENT_OR_QUAL"
 end crefToCStr;
@@ -2806,14 +2806,14 @@ template arraycref(ComponentRef cr)
   case CREF_IDENT(ident = "xloc") then crefStr(cr)
   case CREF_IDENT(ident = "time") then "time"
   case WILD(__) then ''
-  else "$"+crefToCStr1(cr)
+  else "_"+crefToCStr1(cr)
 end arraycref;
 
 template crefToCStr1(ComponentRef cr)
 ::=
   match cr
   case CREF_IDENT(__) then '<%ident%>'
-  case CREF_QUAL(__) then 			  '<%ident%><%subscriptsToCStr(subscriptLst)%>$P<%crefToCStr1(componentRef)%>'
+  case CREF_QUAL(__) then 			  '<%ident%><%subscriptsToCStr(subscriptLst)%>_P_<%crefToCStr1(componentRef)%>'
   case WILD(__) then ''
   else "CREF_NOT_IDENT_OR_QUAL"
 end crefToCStr1;
@@ -3376,14 +3376,14 @@ template dimension(Dimension d)
 end dimension;
 
 template arrayCrefCStr(ComponentRef cr)
-::= '$<%arrayCrefCStr2(cr)%>'
+::= '_<%arrayCrefCStr2(cr)%>'
 end arrayCrefCStr;
 
 template arrayCrefCStr2(ComponentRef cr)
 ::=
   match cr
   case CREF_IDENT(__) then '<%unquoteIdentifier(ident)%>'
-  case CREF_QUAL(__) then '<%unquoteIdentifier(ident)%>$P<%arrayCrefCStr2(componentRef)%>'
+  case CREF_QUAL(__) then '<%unquoteIdentifier(ident)%>_P_<%arrayCrefCStr2(componentRef)%>'
   else "CREF_NOT_IDENT_OR_QUAL"
 end arrayCrefCStr2;
 
@@ -6184,9 +6184,9 @@ IHistory* <%lastIdentOfPath(modelInfo.name)%>::getHistory()
 
 label_list_type <%lastIdentOfPath(modelInfo.name)%>::getLabels()
 {
-   label_list_type $labels = tuple_list_of 
-   <%(labels |> label hasindex index0 => '(&$<%label%>_1,<%index0%>,&$<%label%>_2)') ;separator=" "%>;
-   return $labels;
+   label_list_type labels = tuple_list_of 
+   <%(labels |> label hasindex index0 => '(&<%label%>_1,<%index0%>,&<%label%>_2)') ;separator=" "%>;
+   return labels;
 }
 
 void <%lastIdentOfPath(modelInfo.name)%>::setVariables(const ublas::vector<double>& variables,const ublas::vector<double>& variables2)

diff --git a/SimulationRuntime/cpp/Source/System/Modelica/ModelicaSystem.cpp b/SimulationRuntime/cpp/Source/System/Modelica/ModelicaSystem.cpp
@@ -75,7 +75,14 @@ int Modelica::getDimVars(const INDEX index) const
 {
 	return(SystemDefaultImplementation::getDimVars(index));
 }
-
+  void Modelica::giveConditions(bool* c)
+   {
+     memcpy(c,_conditions0,_dimZeroFunc*sizeof(bool));
+   }
+  void Modelica::setConditions(bool* c)
+   {
+     memcpy(_conditions0,c,_dimZeroFunc*sizeof(bool));
+   }
 // Provide number (dimension) of right hand sides (equations and/or residuals) according to the index
 int Modelica::getDimRHS(const INDEX index ) const
 {

diff --git a/SimulationRuntime/cpp/Source/System/Modelica/ModelicaSystem.h b/SimulationRuntime/cpp/Source/System/Modelica/ModelicaSystem.h
@@ -84,7 +84,8 @@ class Modelica: public IDAESystem ,public IContinous ,public IEvent ,public ISys
 
 	// Provides current values of root/zero functions 
 	 virtual void giveZeroFunc(double* f,const double& eps);
-
+	virtual void giveConditions(bool* c);
+    virtual void setConditions(bool* c);
 	//Called to handle all  events occured at same time  
 	 virtual void handleSystemEvents(const bool* events,update_events_type update_event);