Relax error checking when checking partial model

- Skip checking when-requirements when checking a partial model.
- Don't fail when checking partial models with out of bounds subscripts.

Author: perost

OMCompiler/Compiler/NFFrontEnd/NFInst.mo

@@ -254,7 +254,7 @@ algorithm
     execStat("replaceArrayConstructors");
   end if;
 
-  VerifyModel.verify(flatModel);
+  VerifyModel.verify(flatModel, InstNode.isPartial(inst_cls));
 
   (flatModel, functions) := InstUtil.expandSlicedCrefs(flatModel, functions);
 

OMCompiler/Compiler/NFFrontEnd/NFVerifyModel.mo

@@ -58,61 +58,68 @@ protected
 public
   function verify
     input FlatModel flatModel;
+    input Boolean isPartial;
   algorithm
     for var in flatModel.variables loop
-      verifyVariable(var);
+      verifyVariable(var, isPartial);
     end for;
 
     for eq in flatModel.equations loop
-      verifyEquation(eq);
+      verifyEquation(eq, isPartial);
     end for;
 
     for ieq in flatModel.initialEquations loop
-      verifyEquation(ieq);
+      verifyEquation(ieq, isPartial);
     end for;
 
     for alg in flatModel.algorithms loop
-      verifyAlgorithm(alg);
+      verifyAlgorithm(alg, isPartial);
     end for;
 
     for ialg in flatModel.initialAlgorithms loop
-      verifyAlgorithm(ialg);
+      verifyAlgorithm(ialg, isPartial);
     end for;
 
     // check for discrete real variables not assigned in when equations (#5836)
-    checkDiscreteReal(flatModel);
+    if not isPartial then
+      checkDiscreteReal(flatModel);
+    end if;
 
     execStat(getInstanceName());
   end verify;
 
 protected
   function verifyVariable
     input Variable var;
+    input Boolean isPartial;
   algorithm
-    verifyBinding(var.binding);
+    verifyBinding(var.binding, isPartial);
 
     for attr in var.typeAttributes loop
-      verifyBinding(Util.tuple22(attr));
+      verifyBinding(Util.tuple22(attr), isPartial);
     end for;
 
     for v in var.children loop
-      verifyVariable(v);
+      verifyVariable(v, isPartial);
     end for;
   end verifyVariable;
 
   function verifyBinding
     input Binding binding;
+    input Boolean isPartial;
   algorithm
     if Binding.isBound(binding) then
-      checkSubscriptBounds(Binding.getTypedExp(binding), Binding.getInfo(binding));
+      checkSubscriptBounds(Binding.getTypedExp(binding), isPartial, Binding.getInfo(binding));
     end if;
   end verifyBinding;
 
   function verifyEquation
     input Equation eq;
+    input Boolean isPartial;
   algorithm
     () := match eq
       case Equation.WHEN()
+        guard not isPartial
         algorithm
           verifyWhenEquation(eq.branches, eq.source);
         then
@@ -121,7 +128,7 @@ protected
       else ();
     end match;
 
-    Equation.applyExpShallow(eq, function checkSubscriptBounds(info = Equation.info(eq)));
+    Equation.applyExpShallow(eq, function checkSubscriptBounds(isPartial = isPartial, info = Equation.info(eq)));
   end verifyEquation;
 
   function verifyWhenEquation
@@ -251,31 +258,35 @@ protected
 
   function verifyAlgorithm
     input Algorithm alg;
+    input Boolean isPartial;
   algorithm
-    Algorithm.apply(alg, verifyStatement);
+    Algorithm.apply(alg, function verifyStatement(isPartial = isPartial));
   end verifyAlgorithm;
 
   function verifyStatement
     input Statement stmt;
+    input Boolean isPartial;
   algorithm
-    Statement.applyExp(stmt, function checkSubscriptBounds(info = Statement.info(stmt)));
+    Statement.applyExp(stmt, function checkSubscriptBounds(isPartial = isPartial, info = Statement.info(stmt)));
   end verifyStatement;
 
   function checkSubscriptBounds
     input Expression exp;
+    input Boolean isPartial;
     input SourceInfo info;
   algorithm
-    Expression.apply(exp, function checkSubscriptBounds_traverser(info = info));
+    Expression.apply(exp, function checkSubscriptBounds_traverser(isPartial = isPartial, info = info));
   end checkSubscriptBounds;
 
   function checkSubscriptBounds_traverser
     input Expression exp;
+    input Boolean isPartial;
     input SourceInfo info;
   algorithm
     () := match exp
       case Expression.CREF()
         algorithm
-          checkSubscriptBoundsCref(exp.cref, info);
+          checkSubscriptBoundsCref(exp.cref, isPartial, info);
         then
           ();
 
@@ -285,6 +296,7 @@ protected
 
   function checkSubscriptBoundsCref
     input ComponentRef cref;
+    input Boolean isPartial;
     input SourceInfo info;
   algorithm
     () := match cref
@@ -308,14 +320,17 @@ protected
                 Error.addSourceMessage(Error.ARRAY_INDEX_OUT_OF_BOUNDS,
                   {Subscript.toString(s), String(index),
                    Dimension.toString(d), ComponentRef.firstName(cref)}, info);
-                fail();
+
+                if not isPartial then
+                  fail();
+                end if;
               end if;
             end if;
 
             index := index + 1;
           end for;
 
-          checkSubscriptBoundsCref(cref.restCref, info);
+          checkSubscriptBoundsCref(cref.restCref, isPartial, info);
         then
           ();
 

OMCompiler/Compiler/Script/NFApi.mo

@@ -637,7 +637,7 @@ algorithm
     flat_model.variables := List.filterOnFalse(flat_model.variables, Variable.isEmptyArray);
   end if;
 
-  VerifyModel.verify(flat_model);
+  VerifyModel.verify(flat_model, InstNode.isPartial(inst_cls));
 
   // Convert the flat model to a DAE.
   (dae, daeFuncs) := ConvertDAE.convert(flat_model, funcs);

testsuite/flattening/modelica/arrays/Makefile

@@ -133,6 +133,7 @@ MatrixRowIndexing.mo \
 MatrixSubtraction.mo \
 modelica_1_1_Array9.mo \
 NestedSubscriptFor.mo \
+OutOfBoundsPartial1.mos \
 PolynomialEvaluator1.mo \
 PolynomialEvaluator2.mo \
 PolynomialEvaluator3.mo \

testsuite/flattening/modelica/arrays/OutOfBoundsPartial1.mos

@@ -0,0 +1,26 @@
+// name:     OutOfBoundsCheck1
+// keywords: array subscript
+// status:   correct
+//
+// A partial model with out of bounds subscripts should not make checkModel fail.
+//
+
+loadString("
+  partial model M
+    Real x[1];
+  equation
+    x[2] = 1;
+  end M;
+");
+
+checkModel(M);
+getErrorString();
+
+// Result:
+// true
+// "Check of M completed successfully.
+// Class M has 1 equation(s) and 1 variable(s).
+// 1 of these are trivial equation(s)."
+// "[<interactive>:5:5-5:13:writable] Error: Subscript '2' for dimension 1 (size = 1) of x is out of bounds.
+// "
+// endResult

testsuite/flattening/modelica/equations/Makefile

@@ -54,6 +54,7 @@ WhenEquation.mo \
 WhenNestedEquation.mo \
 WhenNotInitial.mo \
 WhenNotValid.mo \
+WhenPartial1.mos \
 WhenValidResult.mo \
 WhenSemantics1.mo \
 WhenVectorPredicateEquation.mo \

testsuite/flattening/modelica/equations/WhenPartial1.mos

@@ -0,0 +1,26 @@
+// name:     WhenPartial1
+// keywords: when
+// status:   correct
+//
+// Discrete variables in a partial model does not need to be assigned in a when-equation.
+//
+
+loadString("
+  partial model M
+    Real x;
+    discrete Real xd;
+  equation
+    x = xd;
+  end M;
+");
+
+checkModel(M);
+getErrorString();
+
+// Result:
+// true
+// "Check of M completed successfully.
+// Class M has 1 equation(s) and 2 variable(s).
+// 1 of these are trivial equation(s)."
+// ""
+// endResult