Use config flag for total tearing

OpenModelica · Jun 1, 2016 · 55a76f7 · 55a76f7
1 parent 22f7bdf
commit 55a76f7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/simulation/modelica/tearing/totalTearing1.mos b/simulation/modelica/tearing/totalTearing1.mos
@@ -4,7 +4,7 @@
 
 loadFile("Tearing1.mo"); getErrorString();
 
-setCommandLineOptions("+d=backenddaeinfo, +tearingMethod=totalTearing"); getErrorString();
+setCommandLineOptions("+d=backenddaeinfo, --totalTearing=2"); getErrorString();
 simulate(Tearing1); getErrorString();
 
 
@@ -34,14 +34,12 @@ simulate(Tearing1); getErrorString();
 //  * Record equations: 0
 //  * When equations: 0
 //  * If-equations: 0
-//  * Equation systems (linear and non-linear blocks): 1
-//  * Torn equation systems: 0
+//  * Equation systems (linear and non-linear blocks): 0
+//  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
-// Notification: Equation system details:
-//  * Constant Jacobian: 0
-//  * Linear Jacobian (size,density): 1 {(5,44.0%)}
-//  * Non-linear Jacobian: 0
-//  * Without analytic Jacobian: 0
+// Notification: Torn system details for strict tearing set:
+//  * Linear torn systems: 1 {(2,100.0%) 3}
+//  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
 //  * Number of states: 0 ('+d=stateselection' for list of states)

diff --git a/simulation/modelica/tearing/totalTearing2.mos b/simulation/modelica/tearing/totalTearing2.mos
@@ -13,7 +13,7 @@ equation
 end totalTearing2;
 "); getErrorString();
 
-setCommandLineOptions("+d=backenddaeinfo,totaltearingdump, +tearingMethod=totalTearing"); getErrorString();
+setCommandLineOptions("+d=backenddaeinfo,totaltearingdump, --totalTearing=2"); getErrorString();
 simulate(totalTearing2); getErrorString();
 
 
@@ -253,14 +253,12 @@ simulate(totalTearing2); getErrorString();
 //  * Record equations: 0
 //  * When equations: 0
 //  * If-equations: 0
-//  * Equation systems (linear and non-linear blocks): 1
-//  * Torn equation systems: 0
+//  * Equation systems (linear and non-linear blocks): 0
+//  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
-// Notification: Equation system details:
-//  * Constant Jacobian: 0
-//  * Linear Jacobian (size,density): 0
-//  * Non-linear Jacobian: 1 {3}
-//  * Without analytic Jacobian: 0
+// Notification: Torn system details for strict tearing set:
+//  * Linear torn systems: 0
+//  * Non-linear torn systems: 1 {2 1}
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
 //  * Number of states: 0 ('+d=stateselection' for list of states)

diff --git a/simulation/modelica/tearing/totalTearing3.mos b/simulation/modelica/tearing/totalTearing3.mos
@@ -5,7 +5,7 @@
 
 loadFile("Tearing11.mo"); getErrorString();
 
-setCommandLineOptions("+d=backenddaeinfo, +tearingmethod=totalTearing"); getErrorString();
+setCommandLineOptions("+d=backenddaeinfo, --totalTearing=2"); getErrorString();
 simulate(Tearing11); getErrorString();
 
 // Result:
@@ -34,14 +34,12 @@ simulate(Tearing11); getErrorString();
 //  * Record equations: 0
 //  * When equations: 0
 //  * If-equations: 0
-//  * Equation systems (linear and non-linear blocks): 1
-//  * Torn equation systems: 0
+//  * Equation systems (linear and non-linear blocks): 0
+//  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
-// Notification: Equation system details:
-//  * Constant Jacobian: 0
-//  * Linear Jacobian (size,density): 1 {(10,23.0%)}
-//  * Non-linear Jacobian: 0
-//  * Without analytic Jacobian: 0
+// Notification: Torn system details for strict tearing set:
+//  * Linear torn systems: 1 {(3,88.9%) 7}
+//  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
 //  * Number of states: 0 ('+d=stateselection' for list of states)