Changeset 996337bf in OpenModelica

Timestamp:

2024-04-30T14:24:33+02:00 (3 weeks ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

337cd072, aa44a2d, b54ace2b

Parents:

6c4e231

git-author:

Per Östlund <per.ostlund@…> (04/30/24 14:24:33)

git-committer:

GitHub <noreply@…> (04/30/24 14:24:33)

Message:

Fix creation of binding equations from start values (#12354)

• Unpropagate the binding when copying it from the start attribute to the component.

Files:

• OMCompiler/Compiler/NFFrontEnd/NFBinding.mo (modified) (1 diff)
• OMCompiler/Compiler/NFFrontEnd/NFInst.mo (modified) (1 diff)
• OMCompiler/Compiler/NFFrontEnd/NFSubscript.mo (modified) (1 diff)
• testsuite/flattening/modelica/scodeinst/Makefile (modified) (1 diff)
• testsuite/flattening/modelica/scodeinst/UnboundParameter4.mo (added)

OMCompiler/Compiler/NFFrontEnd/NFBinding.mo

@@ -789 +789 @@
   end propagate;
 
+  function unpropagate
+    input output Binding binding;
+    input InstNode node;
+  algorithm
+    () := match binding
+      case RAW_BINDING()
+        algorithm
+          binding.subs := list(s for s guard not Subscript.isSplitFromOrigin(s, node) in binding.subs);
+        then
+          ();
+
+      else ();
+    end match;
+  end unpropagate;
+
   function source
     input Binding binding;

OMCompiler/Compiler/NFFrontEnd/NFInst.mo

@@ -2275 +2275 @@
     end if;
 
+    binding := Binding.unpropagate(binding, node);
     comp := Component.setBinding(binding, comp);
     InstNode.updateComponent(comp, node);

OMCompiler/Compiler/NFFrontEnd/NFSubscript.mo

@@ -1275 +1275 @@
   end isSplitClassProxy;
 
+  function isSplitFromOrigin
+    input Subscript sub;
+    input InstNode origin;
+    output Boolean res;
+  algorithm
+    res := match sub
+      case SPLIT_PROXY() then InstNode.refEqual(origin, sub.origin);
+      else false;
+    end match;
+  end isSplitFromOrigin;
+
   function expandSplitIndices
     input list<Subscript> subs;

testsuite/flattening/modelica/scodeinst/Makefile

@@ -1155 +1155 @@
 UnboundParameter2.mo \
 UnboundParameter3.mo \
+UnboundParameter4.mo \
 usertype1.mo \
 usertype2.mo \