Changeset b3fb8f57 in OpenModelica

Timestamp:

2012-11-19T17:06:05+01:00 (11 years ago)

Author:

Jens Frenkel <jens.frenkel@…>

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:

a998770c

Parents:

e0f41a7

Message:

• add in case of constant variables every time a parameter bound equation to the simulation code and in case of parameters only if it is not constant

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

File:

• Compiler/BackEnd/SimCodeUtil.mo (modified) (1 diff)

Compiler/BackEnd/SimCodeUtil.mo

@@ -6824 +6824 @@
       DAE.ElementSource source;
       list<Integer> v1,v2;
-      Integer pos,epos;
+      Integer pos;
       list<BackendDAE.Var> v,kn;
+      Boolean b1,b2;
       
     case ((var as BackendDAE.VAR(varName=cr, bindExp=SOME(e), source = source),(eqns,v,kn,v1,v2,pos)))
       equation
-        false = Expression.isConst(e);
+        b1 = BackendVariable.isParam(var);
+        b2 = Expression.isConstValue(e);
+        // if not parameter use it, else use it only if not constant
+        true = (not b1) or (b1 and not b2);
         cre = Expression.crefExp(cr);
         initialEquation = BackendDAE.EQUATION(cre, e, source);
-        epos = listLength(v1)+1;
         var1 = BackendVariable.setVarKind(var,BackendDAE.VARIABLE());
       then
-        ((var,(initialEquation :: eqns,var1::v,kn,epos::v1,pos::v2,pos+1)));
-        
+        ((var,(initialEquation :: eqns,var1::v,kn,pos::v1,pos::v2,pos+1)));        
     case ((var,(eqns,v,kn,v1,v2,pos)))
       equation