Changeset 2027acf in OpenModelica

Timestamp:

2012-11-18T01:12:39+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:

d6f21deb

Parents:

fbc30a8d

Message:

Updated adevs backend

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

File:

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

Compiler/Template/CodegenAdevs.tpl

@@ -154 +154 @@
          void restore_vars();
          void clear_event_flags();
+     bool check_for_new_events();
          bool initial() const { return atInit; }
 
@@ -415 +416 @@
 case SIMCODE(modelInfo = MODELINFO(vars = vars as SIMVARS(__))) then
   <<
+
+  bool <%lastIdentOfPath(modelInfo.name)%>::check_for_new_events()
+  {
+    bool result = false;
+    double* z = new double[numZeroCrossings()];
+      <%zeroCrossingEqns(relations)%>
+    for (int i = 0; i < numZeroCrossings(); i++)
+    {
+      if (z[i] < -epsilon && zc[i] == 1)
+      {
+        result = true;
+        zc[i] = 0;
+      }
+      else if (z[i] > epsilon && zc[i] == 0)
+      {
+        result = true;
+        zc[i] = 1;
+      }
+    }
+    delete [] z;
+    return result;
+  }
+
   void <%lastIdentOfPath(modelInfo.name)%>::state_event_func(const double* q, double* z)
   {
@@ -604 +628 @@
   void <%lastIdentOfPath(modelInfo.name)%>::calc_vars(const double* q, bool doReinit)
   {
-      bool iterate = false;
+      bool reInit = false, newEvents = false;
       active_model = this;
       if (doReinit) clear_event_flags();
@@ -615 +639 @@
       // Calculate the odes
       <%allEqns(allEquations,whenClauses)%>
-      if (iterate) 
+      if (atEvent)
+      newEvents = check_for_new_events();
+      if (reInit || newEvents) 
       {
           save_vars();
-          calc_vars(NULL,true);
+          calc_vars(NULL,reInit);
       }
   }
@@ -821 +847 @@
                 double <%cref(stateVar)%>_tmp = <%cref(stateVar)%>;
                 <%cref(stateVar)%> = <%val%>;
-                iterate = iterate || (<%cref(stateVar)%>_tmp != <%cref(stateVar)%>);
+                reInit = reInit || (<%cref(stateVar)%>_tmp != <%cref(stateVar)%>);
                 >>
     case TERMINATE(__) then