Changeset 37b44b1e in OpenModelica

Timestamp:

2022-06-29T10:41:46+02:00 (22 months ago)

Author:

Per Östlund <perost86@…>

Parents:

2c25668

git-author:

Per Östlund <perost86@…> (06/29/22 10:39:38)

git-committer:

Per Östlund <perost86@…> (06/29/22 10:41:46)

Message:

Handle unevaluable dimensions in connector check

• Skip the connector balance check if a connector contains unevaluable dimensions (which can happen during e.g. checkModel).

Fixes #9160

Files:

• OMCompiler/Compiler/NFFrontEnd/NFComponent.mo (modified) (5 diffs)
• OMCompiler/Compiler/NFFrontEnd/NFTyping.mo (modified) (2 diffs)
• testsuite/flattening/modelica/connectors/ConnectorBalance8.mos (added)
• testsuite/flattening/modelica/connectors/Makefile (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFComponent.mo

@@ -989 +989 @@
     output Integer flows = 0;
     output Integer streams = 0;
+    output Boolean knownSize = true;
   protected
     Type ty;
@@ -997 +998 @@
     Integer comp_size = 0, p, f, s;
     Function fn;
+    Boolean known_size;
   algorithm
     cls := InstNode.getClass(classInstance(component));
@@ -1008 +1010 @@
       Function.instFunctionNode(eq_node, NFInstContext.NO_CONTEXT, info(component));
       fn := listHead(Function.typeNodeCache(eq_node));
-      comp_size := Type.sizeOf(Function.returnType(fn));
+      ty := Function.returnType(fn);
+
+      if Type.hasKnownSize(ty) then
+        comp_size := Type.sizeOf(ty);
+      else
+        comp_size := 0;
+        knownSize := false;
+      end if;
     else
       ty := getType(component);
@@ -1016 +1025 @@
       if isRoot then
         comp_size := 1;
+      elseif Type.hasKnownSize(ty) then
+        comp_size := Dimension.sizesProduct(Type.arrayDims(ty));
       else
-        comp_size := Dimension.sizesProduct(Type.arrayDims(ty));
+        comp_size := 0;
+        knownSize := false;
       end if;
 
@@ -1026 +1038 @@
         if Type.isRecord(ty) or isRoot then
           for c in ClassTree.getComponents(Class.classTree(cls)) loop
-            (p, f, s) := countConnectorVars(InstNode.component(c), false);
+            (p, f, s, known_size) := countConnectorVars(InstNode.component(c), false);
             potentials := potentials + p * comp_size;
             flows := flows + f * comp_size;
             streams := streams + s * comp_size;
+            knownSize := known_size and knownSize;
           end for;
         end if;

OMCompiler/Compiler/NFFrontEnd/NFTyping.mo

@@ -340 +340 @@
 protected
   Integer pots, flows, streams;
+  Boolean known_size;
   Component comp;
   InstNode parent;
@@ -354 +355 @@
   end if;
 
-  (pots, flows, streams) := Component.countConnectorVars(comp);
+  (pots, flows, streams, known_size) := Component.countConnectorVars(comp);
+
+  if not known_size then
+    return;
+  end if;
 
   // Modelica 3.2 section 9.3.1:

testsuite/flattening/modelica/connectors/Makefile

@@ -43 +43 @@
 ConnectorBalance6.mo \
 ConnectorBalance7.mo \
+ConnectorBalance8.mos \
 ConnectorComponents.mo \
 ConnectorCompOrder.mo \