Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit e57c4cc

Browse files
rfrankeOpenModelica-Hudson
authored andcommitted
Disable inlineArrayEqn in vectorized models
Belonging to [master]: - #2733 - OpenModelica/OpenModelica-testsuite#1056
1 parent 58cae62 commit e57c4cc

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Compiler/BackEnd/BackendDAEUtil.mo

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7810,9 +7810,9 @@ algorithm
78107810

78117811
if Flags.getConfigBool(Flags.DEFAULT_OPT_MODULES_ORDERING) then
78127812
// handle special flags, which enable modules
7813-
78147813
enabledModules := deprecatedDebugFlag(Flags.SORT_EQNS_AND_VARS, enabledModules, "sortEqnsVars", "preOptModules+");
78157814
enabledModules := deprecatedDebugFlag(Flags.ADD_DER_ALIASES, enabledModules, "introduceDerAlias", "preOptModules+");
7815+
78167816
if Config.acceptOptimicaGrammar() or Flags.getConfigBool(Flags.GENERATE_DYN_OPTIMIZATION_PROBLEM) then
78177817
enabledModules := "inputDerivativesForDynOpt"::enabledModules;
78187818
enabledModules := "createDynamicOptimization"::enabledModules;
@@ -7821,16 +7821,20 @@ algorithm
78217821
// handle special flags, which disable modules
78227822
disabledModules := deprecatedDebugFlag(Flags.NO_PARTITIONING, disabledModules, "clockPartitioning", "preOptModules-");
78237823
disabledModules := deprecatedDebugFlag(Flags.DISABLE_COMSUBEXP, disabledModules, "comSubExp", "preOptModules-");
7824+
78247825
if Flags.getConfigString(Flags.REMOVE_SIMPLE_EQUATIONS) == "causal" or
78257826
Flags.getConfigString(Flags.REMOVE_SIMPLE_EQUATIONS) == "none" then
78267827
disabledModules := "removeSimpleEquations"::disabledModules;
78277828
end if;
78287829

7829-
78307830
if not Flags.isSet(Flags.EVALUATE_CONST_FUNCTIONS) then
78317831
disabledModules := "evalFunc"::disabledModules;
78327832
Error.addCompilerWarning("Deprecated debug flag --d=evalConstFuncs=false detected. Use --preOptModules-=evalFunc instead.");
78337833
end if;
7834+
7835+
if not Flags.isSet(Flags.NF_SCALARIZE) then
7836+
disabledModules := "inlineArrayEqn"::disabledModules;
7837+
end if;
78347838
end if;
78357839

78367840
if not Flags.getConfigBool(Flags.DEFAULT_OPT_MODULES_ORDERING) and not listEmpty(enabledModules) then
@@ -7935,6 +7939,10 @@ algorithm
79357939
if Config.getTearingMethod() == "noTearing" then
79367940
disabledModules := "tearingSystem"::disabledModules;
79377941
end if;
7942+
7943+
if not Flags.isSet(Flags.NF_SCALARIZE) then
7944+
disabledModules := "inlineArrayEqn"::disabledModules;
7945+
end if;
79387946
end if;
79397947

79407948
if not Flags.getConfigBool(Flags.DEFAULT_OPT_MODULES_ORDERING) and not listEmpty(enabledModules) then

0 commit comments

Comments
 (0)