Changeset e4faaeb in OpenModelica

Timestamp:

2020-05-04T14:12:55+02:00 (4 years ago)

Author:

vwaurich <volker.waurich@…>

Children:

0e9f9fe9

Parents:

b201452

Message:

remove bindings of external objects if they are alias vars

File:

• OMCompiler/Compiler/BackEnd/BackendDAECreate.mo (modified) (2 diffs)

OMCompiler/Compiler/BackEnd/BackendDAECreate.mo

@@ -227 +227 @@
   //remove alias from extVarArray
   extVarsOut := BackendVariable.deleteVars(extAliasVars,extVars);
+  extVarsOut := removeExtAliasBinding(extVarsOut,repl);
 
   //replace in equations
@@ -237 +238 @@
   oRemEqs := listReverse(oRemEqs);
 end getExternalObjectAlias;
+
+
+protected function removeExtAliasBinding "Removes the binding of an external variable if the binding cref ist already detected as an alias variable.
+author: Waurich TUD 2020-05"
+  input BackendDAE.Variables extVarsIn;
+  input BackendVarTransform.VariableReplacements repl;
+  output BackendDAE.Variables extVarsOut;
+protected
+  list<BackendDAE.Var> varLst,extVarLst;
+  DAE.ComponentRef cref;
+algorithm
+  varLst := BackendVariable.varList(extVarsIn);
+  extVarLst := {};
+  for var in varLst loop
+    var := matchcontinue(var)
+      case (BackendDAE.VAR(bindExp = SOME(DAE.CREF(componentRef=cref))))
+        algorithm
+          if BackendVarTransform.hasReplacement(repl,cref) then
+            var.bindExp := NONE();
+          end if;
+      then var;
+      else var;
+    end matchcontinue;
+  extVarLst := var::extVarLst;
+  end for;
+  extVarsOut := BackendVariable.listVar(extVarLst);
+end removeExtAliasBinding;
 
 protected function getExternalObjectAlias3 "Gets the alias var and sim var for the given alias equation and adds a replacement rule