Changeset 885ed59 in OpenModelica

Timestamp:

2021-05-18T09:24:31+02:00 (3 years ago)

Author:

Adrian Pop <adrian.pop@…>

Parents:

fd93c3ac

git-author:

Adrian Pop <adrian.pop@…> (05/17/21 21:38:10)

git-committer:

Adrian Pop <adrian.pop@…> (05/18/21 09:24:31)

Message:

scalarize only parameters arrays with size(array) > 1

• further changes to support TransiEnt library
• needed as the backend handles parameter arrays of one badly
• added test: ParametricInitialArrayEquationBug.mo(s) The problematic equations come from: final parameter SI.SpecificEnergy NCV_H2[:]=TransiEnt.Basics.Functions.GasProperties.getRealGasNCVVector(medium, medium.nc) "Net calorific value of hydrogen at 25 C and 1 bar"; final parameter SI.SpecificEnergy GCV_H2[:]=TransiEnt.Basics.Functions.GasProperties.getRealGasGCVVector(medium, medium.nc) "Gross calorific value of hydrogen at 25 C and 1 bar";

Files:

• OMCompiler/Compiler/NFFrontEnd/NFScalarize.mo (modified) (1 diff)
• testsuite/simulation/modelica/arrays/Makefile (modified) (1 diff)
• testsuite/simulation/modelica/arrays/ParametricInitialArrayEquationBug.mo (added)
• testsuite/simulation/modelica/arrays/ParametricInitialArrayEquationBug.mos (added)

OMCompiler/Compiler/NFFrontEnd/NFScalarize.mo

@@ -116 +116 @@
         // if the scalarized binding would result in an indexed call e.g. f()[1] then don't do it!
         // fixes ticket #6267
-        if ExpressionIterator.isSubscriptedArrayCall(binding_iter) then
+        // adrpo: do not do this for arrays less than 2: see #7450
+        //        TODO! FIXME! get rid of this absurdity when the backend
+        //        can handle arrays of one = function call
+        if listLength(crefs) > 1 and
+           ExpressionIterator.isSubscriptedArrayCall(binding_iter)
+        then
           var.binding := Binding.mapExp(var.binding, expandComplexCref_traverser);
           vars := var :: vars;

testsuite/simulation/modelica/arrays/Makefile

@@ -57 +57 @@
 bug_2300.mos \
 Ticket7455.mos \
+ParametricInitialArrayEquationBug.mos \
+
 
 # Dependency files that are not .mo .mos or Makefile