Added config flag ...

for optimization modules used for initialization system
OpenModelica · Sep 11, 2015 · c14ac39 · c14ac39
1 parent 56d186b
commit c14ac39
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 15 deletions.
diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -7275,6 +7275,32 @@ algorithm
   postOptModules := listReverse(postOptModules);
 end getPostOptModules;
 
+public function getInitOptModules
+  input Option<list<String>> inInitOptModules;
+  output list<tuple<BackendDAEFunc.postOptimizationDAEModule, String, Boolean>> outInitOptModules;
+protected
+  list<tuple<BackendDAEFunc.postOptimizationDAEModule, String, Boolean/*stopOnFailure*/>> allInitOptModules;
+  list<String> initOptModules;
+algorithm
+  allInitOptModules := {(SymbolicJacobian.constantLinearSystem, "constantLinearSystem", false),
+                        (BackendDAEOptimize.simplifyComplexFunction, "simplifyComplexFunction", false),
+                        (SymbolicJacobian.inputDerivativesUsed, "inputDerivativesUsed", false),
+                        (ExpressionSolve.solveSimpleEquations, "solveSimpleEquations", false),
+                        (Tearing.tearingSystem, "tearingSystem", false),
+                        (Tearing.recursiveTearing, "recursiveTearing", false),
+                        (DynamicOptimization.removeLoops, "extendDynamicOptimization", false),
+                        (DynamicOptimization.reduceDynamicOptimization, "reduceDynamicOptimization", false),
+                        (DynamicOptimization.simplifyConstraints, "simplifyConstraints", false),
+                        (BackendDAEOptimize.simplifyLoops, "simplifyLoops", false),
+                        (SymbolicJacobian.calculateStrongComponentJacobians, "calculateStrongComponentJacobians", false)
+                        };
+
+  initOptModules := Config.getInitOptModules();
+  initOptModules := Util.getOptionOrDefault(inInitOptModules, initOptModules);
+  outInitOptModules := selectOptModules(initOptModules, allInitOptModules, {});
+  outInitOptModules := listReverse(outInitOptModules);
+end getInitOptModules;
+
 protected function selectOptModules
   input list<String> strOptModules;
   input list<tuple<Type_a,String,Boolean>> inOptModules;

diff --git a/Compiler/BackEnd/Initialization.mo b/Compiler/BackEnd/Initialization.mo
@@ -93,7 +93,7 @@ protected
   HashSet.HashSet hs "contains all pre variables";
   list<BackendDAE.Equation> removedEqns;
   list<BackendDAE.Var> dumpVars, dumpVars2;
-  list<tuple<BackendDAEFunc.postOptimizationDAEModule, String, Boolean>> pastOptModules;
+  list<tuple<BackendDAEFunc.postOptimizationDAEModule, String, Boolean>> initOptModules;
   tuple<BackendDAEFunc.StructurallySingularSystemHandlerFunc, String, BackendDAEFunc.stateDeselectionFunc, String> daeHandler;
   tuple<BackendDAEFunc.matchingAlgorithmFunc, String> matchingAlgorithm;
 algorithm
@@ -178,18 +178,7 @@ algorithm
     initdae := BackendDAEUtil.mapEqSystem(initdae, solveInitialSystemEqSystem);
 
     // transform and optimize DAE
-    pastOptModules := BackendDAEUtil.getPostOptModules(SOME({
-      "constantLinearSystem",
-      "simplifyComplexFunction",
-        //"reduceDynamicOptimization", // before tearing
-      "tearingSystem",
-        "simplifyLoops",
-        "recursiveTearing",
-      "calculateStrongComponentJacobians",
-      "solveSimpleEquations"
-        //"inputDerivativesUsed",
-        //"extendDynamicOptimization"
-      }));
+    initOptModules := BackendDAEUtil.getInitOptModules(NONE());
 
     matchingAlgorithm := BackendDAEUtil.getMatchingAlgorithm(NONE());
     daeHandler := BackendDAEUtil.getIndexReductionMethod(NONE());
@@ -198,7 +187,7 @@ algorithm
     initdae := BackendDAEUtil.transformBackendDAE(initdae, SOME((BackendDAE.NO_INDEX_REDUCTION(), BackendDAE.EXACT())), NONE(), NONE());
 
     // simplify system
-    initdae := BackendDAEUtil.postOptimizeDAE(initdae, pastOptModules, matchingAlgorithm, daeHandler);
+    initdae := BackendDAEUtil.postOptimizeDAE(initdae, initOptModules, matchingAlgorithm, daeHandler);
     if Flags.isSet(Flags.DUMP_INITIAL_SYSTEM) then
       BackendDump.dumpBackendDAE(initdae, "solved initial system");
       if Flags.isSet(Flags.ADDITIONAL_GRAPHVIZ_DUMP) then

diff --git a/Compiler/Util/Config.mo b/Compiler/Util/Config.mo
@@ -314,6 +314,12 @@ algorithm
   outStringLst := Flags.getConfigStringList(Flags.POST_OPT_MODULES);
 end getPostOptModules;
 
+public function getInitOptModules
+  output list<String> outStringLst;
+algorithm
+  outStringLst := Flags.getConfigStringList(Flags.INIT_OPT_MODULES);
+end getInitOptModules;
+
 public function setPreOptModules
   input list<String> inStringLst;
 algorithm

diff --git a/Compiler/Util/Flags.mo b/Compiler/Util/Flags.mo
@@ -1136,6 +1136,28 @@ constant ConfigFlag PARTLINTORN = CONFIG_FLAG(77, "partlintorn",
   NONE(), EXTERNAL(), INT_FLAG(0), NONE(),
   Util.gettext("Sets the limit for partitionin of linear torn systems."));
 
+constant ConfigFlag INIT_OPT_MODULES = CONFIG_FLAG(78, "initOptModules",
+  NONE(), EXTERNAL(), STRING_LIST_FLAG({
+    "constantLinearSystem",
+    "simplifyComplexFunction",
+      //"reduceDynamicOptimization", // before tearing
+    "tearingSystem",
+    "simplifyLoops",
+    "recursiveTearing",
+    "calculateStrongComponentJacobians",
+    "solveSimpleEquations"
+      //"inputDerivativesUsed",
+      //"extendDynamicOptimization"
+    }),
+  SOME(STRING_DESC_OPTION({
+    ("extendDynamicOptimization", Util.gettext("Move loops to constraints.")),
+    ("constantLinearSystem", Util.gettext("Evaluates constant linear systems (a*x+b*y=c; d*x+e*y=f; a,b,c,d,e,f are constants) at compile-time.")),
+    ("tearingSystem",Util.notrans("For method selection use flag tearingMethod.")),
+    ("inputDerivativesUsed", Util.gettext("Checks if derivatives of inputs are need to calculate the model.")),
+    ("calculateStrongComponentJacobians", Util.gettext("Generates analytical Jacobian for non-linear strong components."))
+    })),
+  Util.gettext("Sets the initialization optimization modules to use in the back end. See --help=optmodules for more info."));
+
 protected
 // This is a list of all configuration flags. A flag can not be used unless it's
 // in this list, and the list is checked at initialization so that all flags are
@@ -1217,7 +1239,8 @@ constant list<ConfigFlag> allConfigFlags = {
   RTEARING,
   FLOW_THRESHOLD,
   MATRIX_FORMAT,
-  PARTLINTORN
+  PARTLINTORN,
+  INIT_OPT_MODULES
 };
 
 public function new