maxSizeLinearTearing=200 as default

Belonging to [master]: - OpenModelica/OMCompiler#1885 - OpenModelica/OpenModelica-testsuite#735
OpenModelica · Oct 11, 2017 · ccd5c42 · ccd5c42
1 parent 624b9a6
commit ccd5c42
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/Compiler/BackEnd/Tearing.mo b/Compiler/BackEnd/Tearing.mo
@@ -312,9 +312,7 @@ algorithm
       true = BackendDAEUtil.getLinearfromJacType(jacType);
       maxSize = Flags.getConfigInt(Flags.MAX_SIZE_LINEAR_TEARING);
       if intGt(listLength(vindx),maxSize) then
-        if debugFlag then
-          Error.addMessage(Error.MAX_TEARING_SIZE, {intString(strongComponentIndexOut), intString(listLength(vindx)),"linear",intString(maxSize)});
-        end if;
+        Error.addMessage(Error.MAX_TEARING_SIZE, {intString(strongComponentIndexOut), intString(listLength(vindx)),"linear",intString(maxSize)});
         fail();
       end if;
       if listMember(strongComponentIndexOut,Flags.getConfigIntList(Flags.NO_TEARING_FOR_COMPONENT)) then
@@ -341,9 +339,7 @@ algorithm
       false = BackendDAEUtil.getLinearfromJacType(jacType);
       maxSize = Flags.getConfigInt(Flags.MAX_SIZE_NONLINEAR_TEARING);
       if intGt(listLength(vindx),maxSize) then
-        if debugFlag then
-          Error.addMessage(Error.MAX_TEARING_SIZE, {intString(strongComponentIndexOut), intString(listLength(vindx)),"nonlinear",intString(maxSize)});
-        end if;
+        Error.addMessage(Error.MAX_TEARING_SIZE, {intString(strongComponentIndexOut), intString(listLength(vindx)),"nonlinear",intString(maxSize)});
         fail();
       end if;
       if listMember(strongComponentIndexOut,Flags.getConfigIntList(Flags.NO_TEARING_FOR_COMPONENT)) then

diff --git a/Compiler/Util/Flags.mo b/Compiler/Util/Flags.mo
@@ -1286,7 +1286,7 @@ constant ConfigFlag INST_CACHE_SIZE = CONFIG_FLAG(90, "instCacheSize",
   NONE(), EXTERNAL(), INT_FLAG(25343), NONE(),
   Util.gettext("Sets the size of the internal hash table used for instantiation caching."));
 constant ConfigFlag MAX_SIZE_LINEAR_TEARING = CONFIG_FLAG(91, "maxSizeLinearTearing",
-  NONE(), EXTERNAL(), INT_FLAG(4000), NONE(),
+  NONE(), EXTERNAL(), INT_FLAG(200), NONE(),
   Util.gettext("Sets the maximum system size for tearing of linear systems (default 4000)."));
 constant ConfigFlag MAX_SIZE_NONLINEAR_TEARING = CONFIG_FLAG(92, "maxSizeNonlinearTearing",
   NONE(), EXTERNAL(), INT_FLAG(10000), NONE(),

diff --git a/SimulationRuntime/c/simulation/solver/linearSystem.c b/SimulationRuntime/c/simulation/solver/linearSystem.c
@@ -114,7 +114,7 @@ int initializeLinearSystems(DATA *data, threadData_t *threadData)
     if(nnz/(double)(size*size)<=linearSparseSolverMaxDensity && size>=linearSparseSolverMinSize)
     {
       linsys[i].useSparseSolver = 1;
-      infoStreamPrint(LOG_STDOUT, 0, "Using sparse solver for linear system %d,\nbecause density of %.2f remains under threshold of %.2f and size of %d exceeds threshold of %d.\nThe maximum density and the minimal system size for using sparse solvers can be specified\nusing the runtime flags '<-lssMaxDensity=value>' and '<-lssMinSize=value>'.", i, nnz/(double)(size*size), linearSparseSolverMaxDensity, size, linearSparseSolverMinSize);
+      infoStreamPrint(LOG_STDOUT, 0, "Using sparse solver for linear system %d,\nbecause density of %.3f remains under threshold of %.3f and size of %d exceeds threshold of %d.\nThe maximum density and the minimal system size for using sparse solvers can be specified\nusing the runtime flags '<-lssMaxDensity=value>' and '<-lssMinSize=value>'.", i, nnz/(double)(size*size), linearSparseSolverMaxDensity, size, linearSparseSolverMinSize);
     }
 
     /* allocate more system data */

diff --git a/SimulationRuntime/c/simulation/solver/model_help.c b/SimulationRuntime/c/simulation/solver/model_help.c
@@ -52,7 +52,7 @@
 
 int maxEventIterations = 20;
 double linearSparseSolverMaxDensity = 0.2;
-int linearSparseSolverMinSize = 4001;
+int linearSparseSolverMinSize = 201;
 double nonlinearSparseSolverMaxDensity = 0.2;
 int nonlinearSparseSolverMinSize = 10001;
 double maxStepFactor = 1e12;