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

Commit

Permalink
Disable inlineArrayEqn in vectorized models
Browse files Browse the repository at this point in the history
  • Loading branch information
rfranke authored and OpenModelica-Hudson committed Oct 20, 2018
1 parent 58cae62 commit e57c4cc
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Compiler/BackEnd/BackendDAEUtil.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7810,9 +7810,9 @@ algorithm

if Flags.getConfigBool(Flags.DEFAULT_OPT_MODULES_ORDERING) then
// handle special flags, which enable modules

enabledModules := deprecatedDebugFlag(Flags.SORT_EQNS_AND_VARS, enabledModules, "sortEqnsVars", "preOptModules+");
enabledModules := deprecatedDebugFlag(Flags.ADD_DER_ALIASES, enabledModules, "introduceDerAlias", "preOptModules+");

if Config.acceptOptimicaGrammar() or Flags.getConfigBool(Flags.GENERATE_DYN_OPTIMIZATION_PROBLEM) then
enabledModules := "inputDerivativesForDynOpt"::enabledModules;
enabledModules := "createDynamicOptimization"::enabledModules;
Expand All @@ -7821,16 +7821,20 @@ algorithm
// handle special flags, which disable modules
disabledModules := deprecatedDebugFlag(Flags.NO_PARTITIONING, disabledModules, "clockPartitioning", "preOptModules-");
disabledModules := deprecatedDebugFlag(Flags.DISABLE_COMSUBEXP, disabledModules, "comSubExp", "preOptModules-");

if Flags.getConfigString(Flags.REMOVE_SIMPLE_EQUATIONS) == "causal" or
Flags.getConfigString(Flags.REMOVE_SIMPLE_EQUATIONS) == "none" then
disabledModules := "removeSimpleEquations"::disabledModules;
end if;


if not Flags.isSet(Flags.EVALUATE_CONST_FUNCTIONS) then
disabledModules := "evalFunc"::disabledModules;
Error.addCompilerWarning("Deprecated debug flag --d=evalConstFuncs=false detected. Use --preOptModules-=evalFunc instead.");
end if;

if not Flags.isSet(Flags.NF_SCALARIZE) then
disabledModules := "inlineArrayEqn"::disabledModules;
end if;
end if;

if not Flags.getConfigBool(Flags.DEFAULT_OPT_MODULES_ORDERING) and not listEmpty(enabledModules) then
Expand Down Expand Up @@ -7935,6 +7939,10 @@ algorithm
if Config.getTearingMethod() == "noTearing" then
disabledModules := "tearingSystem"::disabledModules;
end if;

if not Flags.isSet(Flags.NF_SCALARIZE) then
disabledModules := "inlineArrayEqn"::disabledModules;
end if;
end if;

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

0 comments on commit e57c4cc

Please sign in to comment.