diff --git a/openmodelica/debugDumps/optdaedump.mos b/openmodelica/debugDumps/optdaedump.mos
index e62d62cf52c..10a9d863dd9 100644
--- a/openmodelica/debugDumps/optdaedump.mos
+++ b/openmodelica/debugDumps/optdaedump.mos
@@ -1562,8 +1562,12 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: initialization
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (0)
+// Known variables only depending on parameters and constants - globalKnownVars (4)
 // ========================================
+// 1: C:PARAM()  = 3.0  type: Real 
+// 2: L:PARAM()  = 0.5  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: R1:PARAM()  = 1.0  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -1686,8 +1690,12 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: initialization
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (0)
+// Known variables only depending on parameters and constants - globalKnownVars (4)
 // ========================================
+// 1: C:PARAM()  = 3.0  type: Real 
+// 2: L:PARAM()  = 0.5  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: R1:PARAM()  = 1.0  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -1842,8 +1850,12 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: initialization
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (0)
+// Known variables only depending on parameters and constants - globalKnownVars (4)
 // ========================================
+// 1: C:PARAM()  = 3.0  type: Real 
+// 2: L:PARAM()  = 0.5  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: R1:PARAM()  = 1.0  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -1989,8 +2001,8 @@ buildModel(testOptdaedump); getErrorString();
 // {9:10}
 // {4:1}
 // {1:7}
-// {{{8:9}, {2:4}, {7:8}}
-// ,{6:5}} Size: 1 linear
+// {{{7:9}, {6:4}, {8:5}}
+// ,{2:8}} Size: 1 linear
 // {5:2}
 // {3:6}
 //
@@ -1999,8 +2011,12 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: initialization
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (0)
+// Known variables only depending on parameters and constants - globalKnownVars (4)
 // ========================================
+// 1: C:PARAM()  = 3.0  type: Real 
+// 2: L:PARAM()  = 0.5  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: R1:PARAM()  = 1.0  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2059,7 +2075,7 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Variables (4)
 // ========================================
-// 1: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
 // 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
 // 3: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
 // 4: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
@@ -2067,10 +2083,10 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Equations (4, 4)
 // ========================================
-// 1/1 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i2.$pDERLSJac0.dummyVarLSJac0 - uL.$pDERLSJac0.dummyVarLSJac0   [dynamic]
-// 2/2 (1): u1.$pDERLSJac0.dummyVarLSJac0 = -uL.$pDERLSJac0.dummyVarLSJac0   [dynamic]
-// 3/3 (1): i1SeedLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0   [dynamic]
-// 4/4 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
+// 1/1 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 2/2 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 3/3 (1): uLSeedLSJac0 = R2 * i2.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 4/4 (1): u1.$pDERLSJac0.dummyVarLSJac0 = -uLSeedLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2104,15 +2120,17 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input uL:VARIABLE()  type: Real 
+// 1: input i1:VARIABLE()  type: Real 
 // 2: input i2:VARIABLE()  type: Real 
 // 3: input u1:VARIABLE()  type: Real 
 // 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input uC:DUMMY_STATE()  type: Real 
-// 6: input iL:VARIABLE()  type: Real 
-// 7: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input R2:PARAM()  = 2.0  type: Real 
+// 7: input uC:DUMMY_STATE()  type: Real 
+// 8: input iL:VARIABLE()  type: Real 
+// 9: input uLSeedLSJac0:STATE_DER()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2169,16 +2187,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): uLSeedLSJac0 = R2 * i2.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 2/2 (1): -uLSeedLSJac0 = R1 * i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2196,15 +2216,17 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2219,10 +2241,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2263,16 +2284,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): uLSeedLSJac0 = R2 * i2.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 2/2 (1): -uLSeedLSJac0 = R1 * i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2290,15 +2313,17 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2313,10 +2338,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2358,16 +2382,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): uLSeedLSJac0 = R2 * i2.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 2/2 (1): -uLSeedLSJac0 = R1 * i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2380,30 +2406,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2418,10 +2448,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2462,16 +2491,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): uLSeedLSJac0 = R2 * i2.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 2/2 (1): -uLSeedLSJac0 = R1 * i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2484,30 +2515,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2522,10 +2557,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2566,16 +2600,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): uLSeedLSJac0 = R2 * i2.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 2/2 (1): -uLSeedLSJac0 = R1 * i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2588,30 +2624,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2626,10 +2666,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2670,16 +2709,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): i2.$pDERLSJac0.dummyVarLSJac0 = uLSeedLSJac0 / R2   [dynamic]
+// 2/2 (1): i1.$pDERLSJac0.dummyVarLSJac0 = (-uLSeedLSJac0) / R1   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2692,30 +2733,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2730,10 +2775,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2774,16 +2818,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): i2.$pDERLSJac0.dummyVarLSJac0 = uLSeedLSJac0 / R2   [dynamic]
+// 2/2 (1): i1.$pDERLSJac0.dummyVarLSJac0 = (-uLSeedLSJac0) / R1   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2796,30 +2842,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2834,10 +2884,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2878,16 +2927,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): i2.$pDERLSJac0.dummyVarLSJac0 = uLSeedLSJac0 / R2   [dynamic]
+// 2/2 (1): i1.$pDERLSJac0.dummyVarLSJac0 = (-uLSeedLSJac0) / R1   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -2900,30 +2951,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -2938,10 +2993,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -2982,16 +3036,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): i2.$pDERLSJac0.dummyVarLSJac0 = uLSeedLSJac0 / R2   [dynamic]
+// 2/2 (1): i1.$pDERLSJac0.dummyVarLSJac0 = (-uLSeedLSJac0) / R1   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -3004,30 +3060,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -3042,10 +3102,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -3086,16 +3145,18 @@ buildModel(testOptdaedump); getErrorString();
 // unknown partition
 // ========================================
 //
-// Variables (2)
+// Variables (3)
 // ========================================
-// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
-// 2: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
+// 1: i1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 2: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  type: Real 
+// 3: $res_1_.$pDERLSJac0.dummyVarLSJac0:STATE_DER()  type: Real  unreplaceable
 //
 //
-// Equations (2, 2)
+// Equations (3, 3)
 // ========================================
-// 1/1 (1): u1.$pDERLSJac0.dummyVarLSJac0 = R1 * i1SeedLSJac0   [dynamic]
-// 2/2 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = R2 * i1SeedLSJac0 + u1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
+// 1/1 (1): i2.$pDERLSJac0.dummyVarLSJac0 = uLSeedLSJac0 / R2   [dynamic]
+// 2/2 (1): i1.$pDERLSJac0.dummyVarLSJac0 = (-uLSeedLSJac0) / R1   [dynamic]
+// 3/3 (1): $res_1_.$pDERLSJac0.dummyVarLSJac0 = i2.$pDERLSJac0.dummyVarLSJac0 - i1.$pDERLSJac0.dummyVarLSJac0   [dynamic]
 //
 //
 // Simple Equations (0, 0)
@@ -3108,30 +3169,34 @@ buildModel(testOptdaedump); getErrorString();
 //
 // Matching
 // ========================================
-// 2 variables and equations
-// var 1 is solved in eqn 1
-// var 2 is solved in eqn 2
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
 //
 //
 // StrongComponents
 // ========================================
-// {1:1}
-// {2:2}
+// {2:1}
+// {1:2}
+// {3:3}
 //
 //
 //
 // BackendDAEType: jacobian
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (7)
+// Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
-// 1: input i1SeedLSJac0:STATE_DER()  type: Real 
+// 1: input uLSeedLSJac0:STATE_DER()  type: Real 
 // 2: input iL:VARIABLE()  type: Real 
 // 3: input uC:DUMMY_STATE()  type: Real 
-// 4: input $res[1]:VARIABLE()  type: Real 
-// 5: input u1:VARIABLE()  type: Real 
-// 6: input i2:VARIABLE()  type: Real 
-// 7: input uL:VARIABLE()  type: Real 
+// 4: input R2:PARAM()  = 2.0  type: Real 
+// 5: input R1:PARAM()  = 1.0  type: Real 
+// 6: input $res[1]:VARIABLE()  type: Real 
+// 7: input u1:VARIABLE()  type: Real 
+// 8: input i2:VARIABLE()  type: Real 
+// 9: input i1:VARIABLE()  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -3146,10 +3211,9 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
-// Alias Variables (2)
+// Alias Variables (1)
 // ========================================
-// 1: i2.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = i1SeedLSJac0  type: Real 
-// 2: uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -u1.$pDERLSJac0.dummyVarLSJac0  type: Real 
+// 1: u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE()  = -uLSeedLSJac0  type: Real 
 //
 //
 // Simple Shared Equations (0, 0)
@@ -3280,8 +3344,8 @@ buildModel(testOptdaedump); getErrorString();
 // {9:10}
 // {4:1}
 // {1:7}
-// {{{8:9}, {2:4}, {7:8}}
-// ,{6:5}} Size: 1 linear
+// {{{7:9}, {6:4}, {8:5}}
+// ,{2:8}} Size: 1 linear
 // {5:2}
 // {3:6}
 //
@@ -3290,8 +3354,12 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: initialization
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (0)
+// Known variables only depending on parameters and constants - globalKnownVars (4)
 // ========================================
+// 1: C:PARAM()  = 3.0  type: Real 
+// 2: L:PARAM()  = 0.5  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: R1:PARAM()  = 1.0  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -3437,8 +3505,8 @@ buildModel(testOptdaedump); getErrorString();
 // {9:10}
 // {4:1}
 // {1:7}
-// {{{8:9}, {2:4}, {7:8}}
-// ,{6:5}} Size: 1 linear
+// {{{7:9}, {6:4}, {8:5}}
+// ,{2:8}} Size: 1 linear
 // {5:2}
 // {3:6}
 //
@@ -3447,8 +3515,12 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: initialization
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (0)
+// Known variables only depending on parameters and constants - globalKnownVars (4)
 // ========================================
+// 1: C:PARAM()  = 3.0  type: Real 
+// 2: L:PARAM()  = 0.5  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: R1:PARAM()  = 1.0  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
@@ -3594,8 +3666,8 @@ buildModel(testOptdaedump); getErrorString();
 // {9:10}
 // {4:1}
 // {1:7}
-// {{{8:9}, {2:4}, {7:8}}
-// ,{6:5}} Size: 1 linear
+// {{{7:9}, {6:4}, {8:5}}
+// ,{2:8}} Size: 1 linear
 // {5:2}
 // {3:6}
 //
@@ -3604,8 +3676,12 @@ buildModel(testOptdaedump); getErrorString();
 // BackendDAEType: initialization
 //
 //
-// Known variables only depending on parameters and constants - globalKnownVars (0)
+// Known variables only depending on parameters and constants - globalKnownVars (4)
 // ========================================
+// 1: C:PARAM()  = 3.0  type: Real 
+// 2: L:PARAM()  = 0.5  type: Real 
+// 3: R2:PARAM()  = 2.0  type: Real 
+// 4: R1:PARAM()  = 1.0  type: Real 
 //
 //
 // Known variables only depending on states and inputs - localKnownVars (0)
diff --git a/openmodelica/fmi/ModelExchange/1.0/JuliansBib.mos b/openmodelica/fmi/ModelExchange/1.0/JuliansBib.mos
index d74551aa004..64645d45ecb 100644
--- a/openmodelica/fmi/ModelExchange/1.0/JuliansBib.mos
+++ b/openmodelica/fmi/ModelExchange/1.0/JuliansBib.mos
@@ -80,10 +80,10 @@ val(s, 1);
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'JuliansBib_Connector_Hebelarm_einfach_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;
-// 127.2093118472222
-// -1.473681007769134
-// 12720.93118472221
-// -2.525875185738147
+// 29.87032083226751
+// -2.843354040235435
+// 2987.032083226751
+// -1.180467185324341
 // 0.0
-// -0.5326885425096911
+// 2.726903938445847
 // endResult
diff --git a/simulation/libraries/msl32/Modelica.Electrical.Spice3.Examples.Spice3BenchmarkFourBitBinaryAdder.mos b/simulation/libraries/msl32/Modelica.Electrical.Spice3.Examples.Spice3BenchmarkFourBitBinaryAdder.mos
index 72bee7ed992..28a4b24ad26 100644
--- a/simulation/libraries/msl32/Modelica.Electrical.Spice3.Examples.Spice3BenchmarkFourBitBinaryAdder.mos
+++ b/simulation/libraries/msl32/Modelica.Electrical.Spice3.Examples.Spice3BenchmarkFourBitBinaryAdder.mos
@@ -80,8 +80,6 @@ runScript(modelTesting);getErrorString();
 // Simulation options: startTime = 0.0, stopTime = 1e-09, numberOfIntervals = 999, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Spice3.Examples.Spice3BenchmarkFourBitBinaryAdder', options = '', outputFormat = 'mat', variableFilter = 'time|X1.X1.X1.X1.Q1.vbe|X1.X1.X1.X1.Q2.vbc|X1.X1.X1.X1.Q2.vbe|X1.X1.X1.X1.Q3.vbc|X1.X1.X1.X1.Q3.vbe|X1.X1.X1.X1.Q4.vbc|X1.X1.X1.X1.Q4.vbe|X1.X1.X1.X1.Q5.vbc|X1.X1.X1.X1.Q5.vbe|X1.X1.X1.X2.Q1.vbc|X1.X1.X1.X2.Q1.vbe|X1.X1.X1.X2.Q2.vbe|X1.X1.X1.X2.Q3.vbc|X1.X1.X1.X2.Q3.vbe|X1.X1.X1.X2.Q4.vbc|X1.X1.X1.X2.Q4.vbe|X1.X1.X1.X2.Q5.vbc|X1.X1.X1.X2.Q5.vbe|X1.X1.X2.X3.Q1.vbc|X1.X1.X2.X3.Q1.vbe|X1.X1.X2.X3.Q2.vbe|X1.X1.X2.X3.Q3.vbc|X1.X1.X2.X3.Q3.vbe|X1.X1.X2.X3.Q4.vbc|X1.X1.X2.X3.Q4.vbe|X1.X1.X2.X3.Q5.vbe|X1.X1.X2.X4.Q1.vbc|X1.X1.X2.X4.Q1.vbe|X1.X1.X2.X4.Q2.vbc|X1.X1.X2.X4.Q2.vbe|X1.X1.X2.X4.Q3.vbc|X1.X1.X2.X4.Q3.vbe|X1.X1.X2.X4.Q4.vbc|X1.X1.X2.X4.Q4.vbe|X1.X1.X2.X4.Q5.vbc|X1.X1.X2.X4.Q5.vbe|X1.X2.X2.X9.Q1.vbc|X1.X2.X2.X9.Q1.vbe|X1.X2.X2.X9.Q2.vbc|X1.X2.X2.X9.Q2.vbe|X1.X2.X2.X9.Q3.vbc|X1.X2.X2.X9.Q3.vbe|X1.X2.X2.X9.Q4.vbc|X1.X2.X2.X9.Q4.vbe|X1.X2.X2.X9.Q5.vbc|X1.X2.X2.X9.Q5.vbe', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
 // Result file: Modelica.Electrical.Spice3.Examples.Spice3BenchmarkFourBitBinaryAdder_res.mat
 // Files Equal!
-// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
-//
 // "true
 // "
 // ""
diff --git a/simulation/modelica/initialization/scaling1.mos b/simulation/modelica/initialization/scaling1.mos
index 7d9ea178d46..89da082477b 100644
--- a/simulation/modelica/initialization/scaling1.mos
+++ b/simulation/modelica/initialization/scaling1.mos
@@ -56,6 +56,6 @@ res := readSimulationResult("initializationTests.forest_res.mat", {time, foxes,
 // end SimulationResult;
 // "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
-// {{0.0,0.0},{6.051192201167479,6.051192201167479},{841.0267641520733,841.0267641520733}}
+// {{0.0,0.0},{52.88214113216586,52.88214113216586},{255.6399025145935,255.6399025145935}}
 // ""
 // endResult
diff --git a/simulation/modelica/initialization/scaling2.mos b/simulation/modelica/initialization/scaling2.mos
index b4a5987ef3d..5d01abc48ea 100644
--- a/simulation/modelica/initialization/scaling2.mos
+++ b/simulation/modelica/initialization/scaling2.mos
@@ -56,6 +56,6 @@ res := readSimulationResult("initializationTests.forest_res.mat", {time, foxes,
 // end SimulationResult;
 // "Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
-// {{0.0,0.0},{6.051192201167479,6.051192201167479},{841.0267641520733,841.0267641520733}}
+// {{0.0,0.0},{52.88214113216586,52.88214113216586},{255.6399025145935,255.6399025145935}}
 // ""
 // endResult
diff --git a/simulation/modelica/linear_system/problem2.mos b/simulation/modelica/linear_system/problem2.mos
index 2249b4c0568..66c0abd6b42 100644
--- a/simulation/modelica/linear_system/problem2.mos
+++ b/simulation/modelica/linear_system/problem2.mos
@@ -151,9 +151,9 @@ val(i2, 1.0);
 //     messages = ""
 // end SimulationResult;
 // ""
-// 8.881784197001252e-16
+// 0.0
 // 2.804903282692988
-// 8.881784197001253e-17
+// 0.0
 // 0.2804903282692989
 // record SimulationResult
 //     resultFile = "linear_system.problem2_res.mat",
@@ -166,6 +166,19 @@ val(i2, 1.0);
 // 0.0
 // 0.2804903282692989
 // true
+// INeqn => u1 = u0 - u2[1]
+// INeqn => i3 = u2 / r3[2]
+// INeqn => i1 = u1 / r1[3]
+// INeqn => i2 = u2 / r2[4]
+// INres => i1 + (-i2) - i3 = 0.0[1]
+// OUTeqn => u1 = u0 - u2[0]
+// OUTeqn => i3 = u2 / r3[1]
+// OUTeqn => i1 = (u0 - u2) / r1[2]
+// OUTeqn => i2 = u2 / r2[3]
+// OUTres => (u0 - u2) / r1 - __OMC__1$RTEARINGF * u2 = 0.0[0]
+// ****************
+// TearVar: u2[0]
+// ****************
 // INeqn => i2 = u2 / r2[1]
 // INeqn => i3 = u2 / r3[2]
 // INeqn => u1 = u0 - u2[3]
diff --git a/simulation/modelica/resolveLoops/ElectricalCircuit1.mos b/simulation/modelica/resolveLoops/ElectricalCircuit1.mos
index f3e99e1b359..31529775a5b 100644
--- a/simulation/modelica/resolveLoops/ElectricalCircuit1.mos
+++ b/simulation/modelica/resolveLoops/ElectricalCircuit1.mos
@@ -55,7 +55,7 @@ res := OpenModelica.Scripting.compareSimulationResults("ElectricalCircuit1_res.m
 //  * Torn equation systems: 4
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 4 {(2,100.0%) 6,(1,100.0%) 2,(1,100.0%) 2,(1,100.0%) 2}
+//  * Linear torn systems: 4 {(1,100.0%) 7,(1,100.0%) 2,(1,100.0%) 2,(1,100.0%) 2}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 7
diff --git a/simulation/modelica/start_value_selection/asmaFlow.mos b/simulation/modelica/start_value_selection/asmaFlow.mos
index 6e71e490b13..7b92c5e8503 100644
--- a/simulation/modelica/start_value_selection/asmaFlow.mos
+++ b/simulation/modelica/start_value_selection/asmaFlow.mos
@@ -524,10 +524,8 @@ val(aimc.inertiaRotor.flange_b.tau, 0);
 // ========================================
 // $res_1_.$pDERLSJac0.dummyVarLSJac0
 //
-// Unreplaceable Crefs: (6)
+// Unreplaceable Crefs: (4)
 // ========================================
-// $res_6_.$pDERLSJac1.dummyVarLSJac1
-// $res_5_.$pDERLSJac1.dummyVarLSJac1
 // $res_4_.$pDERLSJac1.dummyVarLSJac1
 // $res_3_.$pDERLSJac1.dummyVarLSJac1
 // $res_2_.$pDERLSJac1.dummyVarLSJac1
diff --git a/simulation/modelica/tearing/Tearing1-cel.mos b/simulation/modelica/tearing/Tearing1-cel.mos
index f8d607a1933..069ef2f2fa1 100644
--- a/simulation/modelica/tearing/Tearing1-cel.mos
+++ b/simulation/modelica/tearing/Tearing1-cel.mos
@@ -50,7 +50,7 @@ val(i3,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(2,100.0%) 3}
+//  * Linear torn systems: 1 {(1,100.0%) 4}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing1-celMC3.mos b/simulation/modelica/tearing/Tearing1-celMC3.mos
index 03b6709c214..5b5d96d2672 100644
--- a/simulation/modelica/tearing/Tearing1-celMC3.mos
+++ b/simulation/modelica/tearing/Tearing1-celMC3.mos
@@ -50,7 +50,7 @@ val(i3,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(2,100.0%) 3}
+//  * Linear torn systems: 1 {(1,100.0%) 4}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing1-omc.mos b/simulation/modelica/tearing/Tearing1-omc.mos
index 671164abc36..10beb8b303e 100644
--- a/simulation/modelica/tearing/Tearing1-omc.mos
+++ b/simulation/modelica/tearing/Tearing1-omc.mos
@@ -48,7 +48,7 @@ val(i3,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(2,100.0%) 3}
+//  * Linear torn systems: 1 {(1,100.0%) 4}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing11-cel.mos b/simulation/modelica/tearing/Tearing11-cel.mos
index 8929659871c..64b8a634a1f 100644
--- a/simulation/modelica/tearing/Tearing11-cel.mos
+++ b/simulation/modelica/tearing/Tearing11-cel.mos
@@ -57,7 +57,7 @@ val(i5,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(4,68.8%) 6}
+//  * Linear torn systems: 1 {(1,100.0%) 9}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing11-celMC3.mos b/simulation/modelica/tearing/Tearing11-celMC3.mos
index 29d2d30a5c8..c49793ae266 100644
--- a/simulation/modelica/tearing/Tearing11-celMC3.mos
+++ b/simulation/modelica/tearing/Tearing11-celMC3.mos
@@ -57,7 +57,7 @@ val(i5,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(3,88.9%) 7}
+//  * Linear torn systems: 1 {(2,100.0%) 8}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing11-omc.mos b/simulation/modelica/tearing/Tearing11-omc.mos
index 5decd7cabe4..eddb0d9ae92 100644
--- a/simulation/modelica/tearing/Tearing11-omc.mos
+++ b/simulation/modelica/tearing/Tearing11-omc.mos
@@ -54,7 +54,7 @@ val(i5,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(3,88.9%) 7}
+//  * Linear torn systems: 1 {(2,100.0%) 8}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing16-cel.mos b/simulation/modelica/tearing/Tearing16-cel.mos
index 227191c90ca..e96148d56a8 100644
--- a/simulation/modelica/tearing/Tearing16-cel.mos
+++ b/simulation/modelica/tearing/Tearing16-cel.mos
@@ -72,16 +72,16 @@ val(i3,0.0); getErrorString();
 //  * Linear torn systems: 0
 //  * Non-linear torn systems: 1 {3 3}
 // "
-// 0.0
+// 3.514816394081884e-40
 // ""
-// 0.0
+// -3.514816394081884e-40
 // ""
-// 0.0
+// -3.514816394081884e-40
 // ""
-// -12.56637061435917
+// 3.465266176269019e-13
 // ""
-// -12.56637061435917
+// 3.465266176269019e-13
 // ""
-// 0.0
+// -3.514816394081884e-41
 // ""
 // endResult
diff --git a/simulation/modelica/tearing/Tearing16-celMC3.mos b/simulation/modelica/tearing/Tearing16-celMC3.mos
index 8fabc478c0a..4bb2c3ef030 100644
--- a/simulation/modelica/tearing/Tearing16-celMC3.mos
+++ b/simulation/modelica/tearing/Tearing16-celMC3.mos
@@ -51,7 +51,7 @@ val(i3,0.0); getErrorString();
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
 //  * Linear torn systems: 0
-//  * Non-linear torn systems: 1 {3 3}
+//  * Non-linear torn systems: 1 {2 4}
 // 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)
@@ -78,9 +78,9 @@ val(i3,0.0); getErrorString();
 // ""
 // 0.0
 // ""
-// -12.56637061435917
+// 3.302928029719854e-13
 // ""
-// -12.56637061435917
+// 3.302928029719854e-13
 // ""
 // 0.0
 // ""
diff --git a/simulation/modelica/tearing/Tearing16-omc.mos b/simulation/modelica/tearing/Tearing16-omc.mos
index 510ed34f7a6..ed29219052c 100644
--- a/simulation/modelica/tearing/Tearing16-omc.mos
+++ b/simulation/modelica/tearing/Tearing16-omc.mos
@@ -48,7 +48,7 @@ val(i3,0.0); getErrorString();
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
 //  * Linear torn systems: 0
-//  * Non-linear torn systems: 1 {2 4}
+//  * Non-linear torn systems: 1 {1 5}
 // 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)
@@ -75,7 +75,7 @@ val(i3,0.0); getErrorString();
 // ""
 // -1.17951120141919e-24
 // ""
-// 3.434401259927543e-13
+// 3.434401259927544e-13
 // ""
 // 3.434401259928723e-13
 // ""
diff --git a/simulation/modelica/tearing/Tearing4-cel.mos b/simulation/modelica/tearing/Tearing4-cel.mos
index c13f84a1992..7f4bde98486 100644
--- a/simulation/modelica/tearing/Tearing4-cel.mos
+++ b/simulation/modelica/tearing/Tearing4-cel.mos
@@ -49,14 +49,17 @@ val(k,0.0); getErrorString();
 //  * Record equations: 0
 //  * When equations: 0
 //  * If-equations: 0
-//  * Equation systems (linear and non-linear blocks): 2
-//  * Torn equation systems: 0
+//  * Equation systems (linear and non-linear blocks): 1
+//  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Equation system details:
 //  * Constant Jacobian: 0
-//  * Linear Jacobian (size,density): 1 {(3,66.7%)}
+//  * Linear Jacobian (size,density): 0
 //  * Non-linear Jacobian: 1 {1}
 //  * Without analytic Jacobian: 0
+// Notification: Torn system details for strict tearing set:
+//  * Linear torn systems: 1 {(1,100.0%) 2}
+//  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
 //  * Number of states: 2 ('-d=stateselection' for list of states)
diff --git a/simulation/modelica/tearing/Tearing4-celMC3.mos b/simulation/modelica/tearing/Tearing4-celMC3.mos
index a4988d00596..17d3fca6020 100644
--- a/simulation/modelica/tearing/Tearing4-celMC3.mos
+++ b/simulation/modelica/tearing/Tearing4-celMC3.mos
@@ -49,14 +49,17 @@ val(k,0.0); getErrorString();
 //  * Record equations: 0
 //  * When equations: 0
 //  * If-equations: 0
-//  * Equation systems (linear and non-linear blocks): 2
-//  * Torn equation systems: 0
+//  * Equation systems (linear and non-linear blocks): 1
+//  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Equation system details:
 //  * Constant Jacobian: 0
-//  * Linear Jacobian (size,density): 1 {(3,66.7%)}
+//  * Linear Jacobian (size,density): 0
 //  * Non-linear Jacobian: 1 {1}
 //  * Without analytic Jacobian: 0
+// Notification: Torn system details for strict tearing set:
+//  * Linear torn systems: 1 {(1,100.0%) 2}
+//  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
 //  * Number of states: 2 ('-d=stateselection' for list of states)
diff --git a/simulation/modelica/tearing/Tearing4-omc.mos b/simulation/modelica/tearing/Tearing4-omc.mos
index d452b8f7a3e..646342cdd8b 100644
--- a/simulation/modelica/tearing/Tearing4-omc.mos
+++ b/simulation/modelica/tearing/Tearing4-omc.mos
@@ -46,14 +46,17 @@ val(k,0.0); getErrorString();
 //  * Record equations: 0
 //  * When equations: 0
 //  * If-equations: 0
-//  * Equation systems (linear and non-linear blocks): 2
-//  * Torn equation systems: 0
+//  * Equation systems (linear and non-linear blocks): 1
+//  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Equation system details:
 //  * Constant Jacobian: 0
-//  * Linear Jacobian (size,density): 1 {(3,66.7%)}
+//  * Linear Jacobian (size,density): 0
 //  * Non-linear Jacobian: 1 {1}
 //  * Without analytic Jacobian: 0
+// Notification: Torn system details for strict tearing set:
+//  * Linear torn systems: 1 {(1,100.0%) 2}
+//  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
 //  * Number of states: 2 ('-d=stateselection' for list of states)
diff --git a/simulation/modelica/tearing/Tearing5-cel.mos b/simulation/modelica/tearing/Tearing5-cel.mos
index c590f42ff81..91ad3e0e280 100644
--- a/simulation/modelica/tearing/Tearing5-cel.mos
+++ b/simulation/modelica/tearing/Tearing5-cel.mos
@@ -58,7 +58,7 @@ val(i5,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(4,68.8%) 6}
+//  * Linear torn systems: 1 {(1,100.0%) 9}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing5-celMC3.mos b/simulation/modelica/tearing/Tearing5-celMC3.mos
index b6523e3d8a3..38e29e59067 100644
--- a/simulation/modelica/tearing/Tearing5-celMC3.mos
+++ b/simulation/modelica/tearing/Tearing5-celMC3.mos
@@ -58,7 +58,7 @@ val(i5,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(3,88.9%) 7}
+//  * Linear torn systems: 1 {(1,100.0%) 9}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/Tearing5-omc.mos b/simulation/modelica/tearing/Tearing5-omc.mos
index 5a1b7dac8e3..0e9df3d2489 100644
--- a/simulation/modelica/tearing/Tearing5-omc.mos
+++ b/simulation/modelica/tearing/Tearing5-omc.mos
@@ -55,7 +55,7 @@ val(i5,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(3,88.9%) 7}
+//  * Linear torn systems: 1 {(2,100.0%) 8}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/dynamicTearing3.mos b/simulation/modelica/tearing/dynamicTearing3.mos
index 1c142858ecc..2a1018e536e 100644
--- a/simulation/modelica/tearing/dynamicTearing3.mos
+++ b/simulation/modelica/tearing/dynamicTearing3.mos
@@ -115,22 +115,22 @@ simulate(dynamicTearing3,startTime=0,stopTime=2,numberOfIntervals=500); getError
 // ====================================
 // number of rows: 4
 // 1:(4,unsolvable) (3,solved) 
-// 2:(3,variable(true)) (4,variable(true)) (1,nonlinear) 
-// 3:(3,constone) (1,const(true)) (2,variable(true)) 
-// 4:(3,variable(true)) (4,variable(true)) (2,variable(true)) (1,constone) 
+// 2:(3,variable(false)) (4,variable(false)) (1,nonlinear) 
+// 3:(3,constone) (1,const(true)) (2,param(true)) 
+// 4:(3,param(false)) (4,variable(true)) (2,variable(true)) (1,constone) 
 //
 // AdjacencyMatrixTransposedEnhanced:
 // Transpose Adjacency Matrix Enhanced (row == var)
 // =====================================
 // number of rows: 4
 // 1:(4,constone) (3,const(true)) (2,nonlinear) 
-// 2:(4,variable(true)) (3,variable(true)) 
-// 3:(4,variable(true)) (3,constone) (2,variable(true)) (1,solved) 
-// 4:(4,variable(true)) (2,variable(true)) (1,unsolvable) 
+// 2:(4,variable(true)) (3,param(true)) 
+// 3:(4,param(false)) (3,constone) (2,variable(false)) (1,solved) 
+// 4:(4,variable(true)) (2,variable(false)) (1,unsolvable) 
 //
 // Forced selection of Tearing Variables:
 // ========================================
-// Unsolvables as tVars: 4,2
+// Unsolvables as tVars: 4
 // Variables with annotation attribute 'always' as tVars: 
 //
 // Matching
@@ -152,7 +152,7 @@ simulate(dynamicTearing3,startTime=0,stopTime=2,numberOfIntervals=500); getError
 // * No of equations in strong component: 4
 // * No of tVars: 2
 // *
-// * tVars: 2,4
+// * tVars: 4,2
 // *
 // * resEq: 4,2
 // *
diff --git a/simulation/modelica/tearing/tearingSelect-celMC3.mos b/simulation/modelica/tearing/tearingSelect-celMC3.mos
index 4aecc53fb54..fdfa284ff9f 100644
--- a/simulation/modelica/tearing/tearingSelect-celMC3.mos
+++ b/simulation/modelica/tearing/tearingSelect-celMC3.mos
@@ -33,6 +33,7 @@ val(i3,0.0); getErrorString();
 // "Notification: Model statistics after passing the front-end and creating the data structures used by the back-end:
 //  * Number of equations: 7
 //  * Number of variables: 7
+// Warning: The Tearing heuristic has chosen variables with annotation attribute 'tearingSelect = avoid'. Use -d=tearingdump and -d=tearingdumpV for more information.
 // Notification: Model statistics after passing the back-end for initialization:
 //  * Number of independent subsystems: 1
 //  * Number of states: 0 ('-d=stateselection' for list of states)
@@ -50,7 +51,7 @@ val(i3,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(2,100.0%) 3}
+//  * Linear torn systems: 1 {(1,100.0%) 4}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/tearingSelect-omc.mos b/simulation/modelica/tearing/tearingSelect-omc.mos
index 6a550851796..b8bc98e4197 100644
--- a/simulation/modelica/tearing/tearingSelect-omc.mos
+++ b/simulation/modelica/tearing/tearingSelect-omc.mos
@@ -50,7 +50,7 @@ val(i3,0.0); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(2,100.0%) 3}
+//  * Linear torn systems: 1 {(1,100.0%) 4}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/totalTearing1.mos b/simulation/modelica/tearing/totalTearing1.mos
index 5f1816cace6..a70bf491e60 100644
--- a/simulation/modelica/tearing/totalTearing1.mos
+++ b/simulation/modelica/tearing/totalTearing1.mos
@@ -38,7 +38,7 @@ simulate(Tearing1); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(2,100.0%) 3}
+//  * Linear torn systems: 1 {(1,100.0%) 4}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/totalTearing2.mos b/simulation/modelica/tearing/totalTearing2.mos
index da9c9cef67e..71a20891bad 100644
--- a/simulation/modelica/tearing/totalTearing2.mos
+++ b/simulation/modelica/tearing/totalTearing2.mos
@@ -258,7 +258,7 @@ simulate(totalTearing2); getErrorString();
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
 //  * Linear torn systems: 0
-//  * Non-linear torn systems: 1 {2 1}
+//  * Non-linear torn systems: 1 {1 2}
 // 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
index fb0172ed1ff..2098e24b300 100644
--- a/simulation/modelica/tearing/totalTearing3.mos
+++ b/simulation/modelica/tearing/totalTearing3.mos
@@ -38,7 +38,7 @@ simulate(Tearing11); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(3,88.9%) 7}
+//  * Linear torn systems: 1 {(2,100.0%) 8}
 //  * Non-linear torn systems: 0
 // Notification: Model statistics after passing the back-end for simulation:
 //  * Number of independent subsystems: 1
diff --git a/simulation/modelica/tearing/userDefinedTearing1.mos b/simulation/modelica/tearing/userDefinedTearing1.mos
index 530567d3dfd..584f00e9a65 100644
--- a/simulation/modelica/tearing/userDefinedTearing1.mos
+++ b/simulation/modelica/tearing/userDefinedTearing1.mos
@@ -38,7 +38,7 @@ simulate(Tearing11); getErrorString();
 //  * Torn equation systems: 1
 //  * Mixed (continuous/discrete) equation systems: 0
 // Notification: Torn system details for strict tearing set:
-//  * Linear torn systems: 1 {(3,88.9%) 7}
+//  * Linear torn systems: 1 {(2,100.0%) 8}
 //  * Non-linear torn systems: 0
 // Notification: Following iteration variables are selected by the user for strong component 2 (DAE kind: simulation):
 //   i2:VARIABLE()  type: Real