Skip to content

Commit

Permalink
Make cse variables protected
Browse files Browse the repository at this point in the history 
Belonging to [master]:
  - OpenModelica/OMCompiler#2161
  - OpenModelica/OpenModelica-testsuite#842
  • Loading branch information
@lochel @OpenModelica-Hudson
lochel authored and OpenModelica-Hudson committed Feb 5, 2018
1 parent 2008d81 commit 7f5924d
Show file tree
Hide file tree
Showing 33 changed files with 141 additions and 141 deletions.
34 changes: 17 additions & 17 deletions openmodelica/debugDumps/lateInline.mos
View file
Expand Up @@ -2262,7 +2262,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -2364,7 +2364,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -2466,7 +2466,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -2568,7 +2568,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -2670,7 +2670,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -2772,7 +2772,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -2874,7 +2874,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -2976,7 +2976,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3078,7 +3078,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3180,7 +3180,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3282,7 +3282,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3384,7 +3384,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3486,7 +3486,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3588,7 +3588,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3690,7 +3690,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3792,7 +3792,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down Expand Up @@ -3894,7 +3894,7 @@ buildModel(testOptdaedump); getErrorString();
// ========================================
// 1: y:VARIABLE() type: Real
// 2: x:VARIABLE() type: Real
// 3: $cse1:VARIABLE() type: Real unreplaceable
// 3: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (3, 3)
Expand Down
34 changes: 17 additions & 17 deletions openmodelica/debugDumps/optdaedump.mos
View file
Expand Up @@ -4416,7 +4416,7 @@ buildModel(testOptdaedump); getErrorString();
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $DER.uC:DUMMY_DER(fixed = false ) type: Real
// 10: $cse1:VARIABLE() type: Real unreplaceable
// 10: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (10, 10)
Expand Down Expand Up @@ -4552,7 +4552,7 @@ buildModel(testOptdaedump); getErrorString();
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $DER.uC:DUMMY_DER(fixed = false ) type: Real
// 10: $cse1:VARIABLE() type: Real unreplaceable
// 10: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (10, 10)
Expand Down Expand Up @@ -4688,7 +4688,7 @@ buildModel(testOptdaedump); getErrorString();
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $DER.uC:DUMMY_DER(fixed = false ) type: Real
// 10: $cse1:VARIABLE() type: Real unreplaceable
// 10: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (10, 10)
Expand Down Expand Up @@ -4824,7 +4824,7 @@ buildModel(testOptdaedump); getErrorString();
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $DER.uC:DUMMY_DER(fixed = false ) type: Real
// 10: $cse1:VARIABLE() type: Real unreplaceable
// 10: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// Equations (10, 10)
Expand Down Expand Up @@ -4959,7 +4959,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -5095,7 +5095,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -5231,7 +5231,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -5367,7 +5367,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -5504,7 +5504,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -6856,7 +6856,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -6993,7 +6993,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -7130,7 +7130,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -7267,7 +7267,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -7404,7 +7404,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -7541,7 +7541,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -7678,7 +7678,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down Expand Up @@ -7815,7 +7815,7 @@ buildModel(testOptdaedump); getErrorString();
// 6: uC:DUMMY_STATE() type: Real
// 7: uL:VARIABLE() type: Real
// 8: u1:VARIABLE() type: Real
// 9: $cse1:VARIABLE() type: Real unreplaceable
// 9: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $DER.uC:DUMMY_DER(fixed = false ) type: Real
//
//
Expand Down
34 changes: 17 additions & 17 deletions simulation/modelica/commonSubExp/cse1.mos
View file
Expand Up @@ -50,8 +50,8 @@ simulate(Tearing15); getErrorString();
// 2: v2.$pDERNLSJac0.dummyVarNLSJac0:VARIABLE(start = 1.0 ) type: Real
// 3: $res2.$pDERNLSJac0.dummyVarNLSJac0:VARIABLE() type: Real unreplaceable
// 4: $res1.$pDERNLSJac0.dummyVarNLSJac0:VARIABLE() type: Real unreplaceable
// 5: $cse2:VARIABLE() type: Real unreplaceable
// 6: $cse1:VARIABLE() type: Real unreplaceable
// 5: $cse2:VARIABLE(protected = true ) type: Real unreplaceable
// 6: $cse1:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// ########### Updated Equation List (jacobian) (6, 6)
Expand Down Expand Up @@ -90,8 +90,8 @@ simulate(Tearing15); getErrorString();
// ========================================
// 1: v5.$pDERNLSJac1.dummyVarNLSJac1:VARIABLE(start = 1.0 ) type: Real
// 2: $res1.$pDERNLSJac1.dummyVarNLSJac1:VARIABLE() type: Real unreplaceable
// 3: $cse4:VARIABLE() type: Real unreplaceable
// 4: $cse3:VARIABLE() type: Real unreplaceable
// 3: $cse4:VARIABLE(protected = true ) type: Real unreplaceable
// 4: $cse3:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// ########### Updated Equation List (jacobian) (4, 4)
Expand Down Expand Up @@ -132,8 +132,8 @@ simulate(Tearing15); getErrorString();
// 6: v2:VARIABLE(start = 1.0 ) type: Real
// 7: v1:VARIABLE(start = 7.0 ) type: Real
// 8: source:VARIABLE() type: Real
// 9: $cse6:VARIABLE() type: Real unreplaceable
// 10: $cse5:VARIABLE() type: Real unreplaceable
// 9: $cse6:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $cse5:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// ########### Updated Equation List (simulation) (10, 10)
Expand Down Expand Up @@ -170,10 +170,10 @@ simulate(Tearing15); getErrorString();
// 6: v2:VARIABLE(start = 1.0 ) type: Real
// 7: v1:VARIABLE(start = 7.0 ) type: Real
// 8: source:VARIABLE() type: Real
// 9: $cse6:VARIABLE() type: Real unreplaceable
// 10: $cse5:VARIABLE() type: Real unreplaceable
// 11: $cseb17:VARIABLE() type: Real unreplaceable
// 12: $cseb3:VARIABLE() type: Real unreplaceable
// 9: $cse6:VARIABLE(protected = true ) type: Real unreplaceable
// 10: $cse5:VARIABLE(protected = true ) type: Real unreplaceable
// 11: $cseb17:VARIABLE(protected = true ) type: Real unreplaceable
// 12: $cseb3:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (12, 12)
Expand All @@ -200,9 +200,9 @@ simulate(Tearing15); getErrorString();
//
// ########### Updated Variable List (jacobian) (3)
// ========================================
// 1: $cse5.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE() type: Real unreplaceable
// 1: $cse5.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE(protected = true ) type: Real unreplaceable
// 2: $res1.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE() type: Real unreplaceable
// 3: $cse7:VARIABLE() type: Real unreplaceable
// 3: $cse7:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// ########### Updated Equation List (jacobian) (3, 3)
Expand All @@ -215,9 +215,9 @@ simulate(Tearing15); getErrorString();
// ########### Updated globalKnownVars (jacobian) (4)
// ========================================
// 1: input v1SeedNLSJac3:STATE_DER() type: Real unreplaceable
// 2: input $cseb3:VARIABLE() type: Real unreplaceable
// 2: input $cseb3:VARIABLE(protected = true ) type: Real unreplaceable
// 3: input $res1:VARIABLE() type: Real
// 4: input $cse5:VARIABLE() type: Real unreplaceable
// 4: input $cse5:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// ########### CSE Replacements (1/44)
Expand All @@ -233,9 +233,9 @@ simulate(Tearing15); getErrorString();
// ########### Updated Variable List (jacobian) (4)
// ========================================
// 1: v5.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE(start = 1.0 ) type: Real
// 2: $cse6.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real unreplaceable
// 2: $cse6.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE(protected = true ) type: Real unreplaceable
// 3: $res1.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real unreplaceable
// 4: $cse8:VARIABLE() type: Real unreplaceable
// 4: $cse8:VARIABLE(protected = true ) type: Real unreplaceable
//
//
// ########### Updated Equation List (jacobian) (4, 4)
Expand All @@ -252,7 +252,7 @@ simulate(Tearing15); getErrorString();
// 2: input v3:VARIABLE(start = 1.0 ) type: Real
// 3: input source:VARIABLE() type: Real
// 4: input $res1:VARIABLE() type: Real
// 5: input $cse6:VARIABLE() type: Real unreplaceable
// 5: input $cse6:VARIABLE(protected = true ) type: Real unreplaceable
// 6: input v5:VARIABLE(start = 1.0 ) type: Real
//
//
Expand Down

0 comments on commit 7f5924d

Please sign in to comment.