Changeset 0757b9d in OpenModelica

Timestamp:

2012-11-16T13:38:49+01:00 (11 years ago)

Author:

Jim Nutaro <nutaro@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

945b9890

Parents:

f15694a2

Message:

Corrections to adevs backend. Still does not support MIXED equations

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

File:

• Compiler/Template/CodegenAdevs.tpl (modified) (5 diffs)

Compiler/Template/CodegenAdevs.tpl

@@ -97 +97 @@
          ~<%lastIdentOfPath(modelInfo.name)%>();
          /// Index of the first extra state event
-         int numStateEvents() const { return <%vi.numZeroCrossings%>; }
+         int numStateEvents() const { return <%vi.numRelations%>; }
          /**
           * These methods are generated by the OpenModelica compiler.
@@ -145 +145 @@
          // Zero crossing variables
          int *zc;
-         int numZeroCrossings() const { return <%vi.numZeroCrossings%>; }
+         int numZeroCrossings() const { return <%vi.numRelations%>; }
 
          // Initial unknowns via solution to least squares
@@ -264 +264 @@
       ode_system<OMC_ADEVS_IO_TYPE>(
           <%vi.numStateVars%>+1, // Number of state variables plus one for the clock
-          <%vi.numZeroCrossings%>+extra_state_events // Number of state event functions
+          <%vi.numRelations%>+extra_state_events // Number of state event functions
       ),
       epsilon(eventHys),
@@ -418 +418 @@
   {
       calc_vars(q);
-      <%zeroCrossingEqns(zeroCrossings)%>
+      <%zeroCrossingEqns(relations)%>
       extra_state_event_funcs(&(z[numStateEvents()]));
       restore_vars();
@@ -1029 +1029 @@
      let &preExp = buffer "" /*BUFD*/
      let expPart = daeExp(eq.exp, context, &preExp /*BUFC*/,  &varDecls /*BUFD*/)
-     '<%preExp%><%aname%>[<%row%>][<%col%>] = <%expPart%>;'
+     '<%preExp%><%aname%>[<%col%>][<%row%>] = <%expPart%>;'
   ;separator="\n"%>
   <%beqs |> exp hasindex i0 =>