- fix initialization of mixed system by defining additional macros for continuous-time variables 'xyz':

  - #define _$P$PRE$P'xyz'(i) $P$PRE$P'xyz'
  - #define $P$ATTRIBUTE$P$PRE$P'xyz' $P$ATTRIBUTE$P'xyz'

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

Author: lochel

Compiler/Template/CodegenC.tpl

@@ -515,6 +515,7 @@ template globalDataParDefine(SimVar simVar, String arrayName)
     <<
     #define <%cref(c)%> data->simulationInfo.<%arrayName%>[<%index%>]
     #define $P$ATTRIBUTE<%cref(name)%> data->modelData.<%arrayName%>Data[<%index%>].attribute
+    #define $P$ATTRIBUTE$P$PRE<%cref(name)%> $P$ATTRIBUTE<%cref(name)%>
     #define <%cref(name)%> data->simulationInfo.<%arrayName%>[<%index%>]
     #define _<%cref(name)%>(i) <%cref(name)%>
     #define <%cref(name)%>__varInfo data->modelData.<%arrayName%>Data[<%index%>].info
@@ -524,6 +525,7 @@ template globalDataParDefine(SimVar simVar, String arrayName)
     #define <%cref(name)%> data->simulationInfo.<%arrayName%>[<%index%>]
     #define _<%cref(name)%>(i) <%cref(name)%>
     #define $P$ATTRIBUTE<%cref(name)%> data->modelData.<%arrayName%>Data[<%index%>].attribute
+    #define $P$ATTRIBUTE$P$PRE<%cref(name)%> $P$ATTRIBUTE<%cref(name)%>
     #define <%cref(name)%>__varInfo data->modelData.<%arrayName%>Data[<%index%>].info
     >>
   end match
@@ -543,16 +545,19 @@ template globalDataVarDefine(SimVar simVar, String arrayName, Integer offset) "t
     #define $P$PRE<%cref(c)%> data->simulationInfo.<%arrayName%>Pre[<%intAdd(offset,index)%>]
     #define $P$PRE<%cref(name)%> data->simulationInfo.<%arrayName%>Pre[<%intAdd(offset,index)%>]
     #define $P$ATTRIBUTE<%cref(name)%> data->modelData.<%arrayName%>Data[<%intAdd(offset,index)%>].attribute
+    #define $P$ATTRIBUTE$P$PRE<%cref(name)%> $P$ATTRIBUTE<%cref(name)%>
     #define <%cref(name)%>__varInfo data->modelData.<%arrayName%>Data[<%intAdd(offset,index)%>].info
     #define $P$PRE<%cref(name)%>__varInfo data->modelData.<%arrayName%>Data[<%intAdd(offset,index)%>].info
     >>
   case SIMVAR(aliasvar=NOALIAS()) then
   let tmp = System.tmpTick()
     <<
     #define _<%cref(name)%>(i) data->localData[i]-><%arrayName%>[<%intAdd(offset,index)%>]
+    #define _$P$PRE<%cref(name)%>(i) $P$PRE<%cref(name)%>
     #define <%cref(name)%> _<%cref(name)%>(0)
     #define $P$PRE<%cref(name)%> data->simulationInfo.<%arrayName%>Pre[<%intAdd(offset,index)%>]
     #define $P$ATTRIBUTE<%cref(name)%> data->modelData.<%arrayName%>Data[<%intAdd(offset,index)%>].attribute
+    #define $P$ATTRIBUTE$P$PRE<%cref(name)%> $P$ATTRIBUTE<%cref(name)%>
     #define <%cref(name)%>__varInfo data->modelData.<%arrayName%>Data[<%intAdd(offset,index)%>].info
     #define $P$PRE<%cref(name)%>__varInfo data->modelData.<%arrayName%>Data[<%intAdd(offset,index)%>].info
     >>