Skip to content

Commit 5b6b1de

Browse files
dietmarwdietmarw
authored
Fixes the variability of function variables (OpenIPSL#356)
Fixes OpenIPSL#355
1 parent e33a490 commit 5b6b1de

31 files changed

Lines changed: 2225 additions & 2225 deletions

‎OpenIPSL/Electrical/ThreePhase/Branches/MonoTri/LineFcn/MT_FiniteImpedance.mo‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -11,146 +11,146 @@ function MT_FiniteImpedance "Calculation of impedance matrices for hybrid line w
1111

1212
// Getting data for the norton equivalent impedances
1313
protected
14-
parameter Real g0=Y012[1, 1];
15-
parameter Real b0=Y012[1, 2];
16-
parameter Real g1=Y012[1, 9];
17-
parameter Real b1=Y012[1, 10];
18-
parameter Real g2=Y012[1, 17];
19-
parameter Real b2=Y012[1, 18];
14+
Real g0=Y012[1, 1];
15+
Real b0=Y012[1, 2];
16+
Real g1=Y012[1, 9];
17+
Real b1=Y012[1, 10];
18+
Real g2=Y012[1, 17];
19+
Real b2=Y012[1, 18];
2020

2121
// Writing the Yabc norton equivalent matrix
22-
parameter Real g11=(g0 + g1 + g2)/3;
23-
parameter Real b11=(b0 + b1 + b2)/3;
24-
parameter Real g12=(2*g0 - g1 + b1*sqrt(3) - g2 - b2*sqrt(3))/6;
25-
parameter Real b12=(2*b0 - g1*sqrt(3) - b1 + g2*sqrt(3) - b2)/6;
26-
parameter Real g13=(2*g0 - g1 - b1*sqrt(3) - g2 + b2*sqrt(3))/6;
27-
parameter Real b13=(2*b0 + g1*sqrt(3) - b1 - g2*sqrt(3) - b2)/6;
28-
parameter Real g21=g13;
29-
parameter Real b21=b13;
30-
parameter Real g22=g11;
31-
parameter Real b22=b11;
32-
parameter Real g23=g12;
33-
parameter Real b23=b12;
34-
parameter Real g31=g12;
35-
parameter Real b31=b12;
36-
parameter Real g32=g13;
37-
parameter Real b32=b13;
38-
parameter Real g33=g11;
39-
parameter Real b33=b11;
22+
Real g11=(g0 + g1 + g2)/3;
23+
Real b11=(b0 + b1 + b2)/3;
24+
Real g12=(2*g0 - g1 + b1*sqrt(3) - g2 - b2*sqrt(3))/6;
25+
Real b12=(2*b0 - g1*sqrt(3) - b1 + g2*sqrt(3) - b2)/6;
26+
Real g13=(2*g0 - g1 - b1*sqrt(3) - g2 + b2*sqrt(3))/6;
27+
Real b13=(2*b0 + g1*sqrt(3) - b1 - g2*sqrt(3) - b2)/6;
28+
Real g21=g13;
29+
Real b21=b13;
30+
Real g22=g11;
31+
Real b22=b11;
32+
Real g23=g12;
33+
Real b23=b12;
34+
Real g31=g12;
35+
Real b31=b12;
36+
Real g32=g13;
37+
Real b32=b13;
38+
Real g33=g11;
39+
Real b33=b11;
4040

4141
// Writing Yabc norton equivalent
4242

43-
parameter Real[1, 18] Yabcnrt=[g11, b11, g12, b12, g13, b13, g21, b21, g22,
43+
Real[1, 18] Yabcnrt=[g11, b11, g12, b12, g13, b13, g21, b21, g22,
4444
b22, g23, b23, g31, b31, g32, b32, g33, b33];
4545

4646
// Writing the calculations for matrix that will be placed in parallel with Yshtm and the matrix that will replace Yser
47-
parameter Real[1, 18] A=Yabcnrt + Yshtk;
48-
parameter Real[1, 18] B=Inverse(A);
49-
parameter Real[1, 18] C=Inverse(Yser);
50-
parameter Real[1, 18] D=B + C;
51-
parameter Real[1, 18] E=Inverse(D);
52-
parameter Real[1, 18] Yshtm2=NegZerFilter(E);
53-
parameter Real[1, 18] Ysernew=PositiveFilter(Yser);
54-
parameter Real[1, 18] Yshtm=Yshtk;
47+
Real[1, 18] A=Yabcnrt + Yshtk;
48+
Real[1, 18] B=Inverse(A);
49+
Real[1, 18] C=Inverse(Yser);
50+
Real[1, 18] D=B + C;
51+
Real[1, 18] E=Inverse(D);
52+
Real[1, 18] Yshtm2=NegZerFilter(E);
53+
Real[1, 18] Ysernew=PositiveFilter(Yser);
54+
Real[1, 18] Yshtm=Yshtk;
5555
// Specifically in Transmission Line
56-
parameter Real[1, 18] Yshtmnew=Yshtm + Yshtm2;
56+
Real[1, 18] Yshtmnew=Yshtm + Yshtm2;
5757

5858
// Now, we can calculate everything normally
5959

6060
//Writing the Y_ser matrix
61-
parameter Real Gaaser=Ysernew[1, 1];
62-
parameter Real Baaser=Ysernew[1, 2];
63-
parameter Real Gabser=Ysernew[1, 3];
64-
parameter Real Babser=Ysernew[1, 4];
65-
parameter Real Gacser=Ysernew[1, 5];
66-
parameter Real Bacser=Ysernew[1, 6];
67-
parameter Real Gbaser=Ysernew[1, 7];
68-
parameter Real Bbaser=Ysernew[1, 8];
69-
parameter Real Gbbser=Ysernew[1, 9];
70-
parameter Real Bbbser=Ysernew[1, 10];
71-
parameter Real Gbcser=Ysernew[1, 11];
72-
parameter Real Bbcser=Ysernew[1, 12];
73-
parameter Real Gcaser=Ysernew[1, 13];
74-
parameter Real Bcaser=Ysernew[1, 14];
75-
parameter Real Gcbser=Ysernew[1, 15];
76-
parameter Real Bcbser=Ysernew[1, 16];
77-
parameter Real Gccser=Ysernew[1, 17];
78-
parameter Real Bccser=Ysernew[1, 18];
61+
Real Gaaser=Ysernew[1, 1];
62+
Real Baaser=Ysernew[1, 2];
63+
Real Gabser=Ysernew[1, 3];
64+
Real Babser=Ysernew[1, 4];
65+
Real Gacser=Ysernew[1, 5];
66+
Real Bacser=Ysernew[1, 6];
67+
Real Gbaser=Ysernew[1, 7];
68+
Real Bbaser=Ysernew[1, 8];
69+
Real Gbbser=Ysernew[1, 9];
70+
Real Bbbser=Ysernew[1, 10];
71+
Real Gbcser=Ysernew[1, 11];
72+
Real Bbcser=Ysernew[1, 12];
73+
Real Gcaser=Ysernew[1, 13];
74+
Real Bcaser=Ysernew[1, 14];
75+
Real Gcbser=Ysernew[1, 15];
76+
Real Bcbser=Ysernew[1, 16];
77+
Real Gccser=Ysernew[1, 17];
78+
Real Bccser=Ysernew[1, 18];
7979
//Writing the Y_sht matrix
80-
parameter Real Gaasht=Yshtmnew[1, 1];
81-
parameter Real Baasht=Yshtmnew[1, 2];
82-
parameter Real Gabsht=Yshtmnew[1, 3];
83-
parameter Real Babsht=Yshtmnew[1, 4];
84-
parameter Real Gacsht=Yshtmnew[1, 5];
85-
parameter Real Bacsht=Yshtmnew[1, 6];
86-
parameter Real Gbasht=Yshtmnew[1, 7];
87-
parameter Real Bbasht=Yshtmnew[1, 8];
88-
parameter Real Gbbsht=Yshtmnew[1, 9];
89-
parameter Real Bbbsht=Yshtmnew[1, 10];
90-
parameter Real Gbcsht=Yshtmnew[1, 11];
91-
parameter Real Bbcsht=Yshtmnew[1, 12];
92-
parameter Real Gcasht=Yshtmnew[1, 13];
93-
parameter Real Bcasht=Yshtmnew[1, 14];
94-
parameter Real Gcbsht=Yshtmnew[1, 15];
95-
parameter Real Bcbsht=Yshtmnew[1, 16];
96-
parameter Real Gccsht=Yshtmnew[1, 17];
97-
parameter Real Bccsht=Yshtmnew[1, 18];
80+
Real Gaasht=Yshtmnew[1, 1];
81+
Real Baasht=Yshtmnew[1, 2];
82+
Real Gabsht=Yshtmnew[1, 3];
83+
Real Babsht=Yshtmnew[1, 4];
84+
Real Gacsht=Yshtmnew[1, 5];
85+
Real Bacsht=Yshtmnew[1, 6];
86+
Real Gbasht=Yshtmnew[1, 7];
87+
Real Bbasht=Yshtmnew[1, 8];
88+
Real Gbbsht=Yshtmnew[1, 9];
89+
Real Bbbsht=Yshtmnew[1, 10];
90+
Real Gbcsht=Yshtmnew[1, 11];
91+
Real Bbcsht=Yshtmnew[1, 12];
92+
Real Gcasht=Yshtmnew[1, 13];
93+
Real Bcasht=Yshtmnew[1, 14];
94+
Real Gcbsht=Yshtmnew[1, 15];
95+
Real Bcbsht=Yshtmnew[1, 16];
96+
Real Gccsht=Yshtmnew[1, 17];
97+
Real Bccsht=Yshtmnew[1, 18];
9898
//Calculating the parameters for the MonoxTri interface
9999
//Calculating some auxiliary variables
100-
parameter Real G1=(Gaasht + Gaaser + Gbbsht + Gbbser + Gccsht + Gccser)/3;
101-
parameter Real B1=(Baasht + Baaser + Bbbsht + Bbbser + Bccsht + Bccser)/3;
102-
parameter Real G2=(Gbasht + Gbaser + Gacsht + Gacser + Gcbsht + Gcbser)/3;
103-
parameter Real B2=(Bbasht + Bbaser + Bacsht + Bacser + Bcbsht + Bcbser)/3;
104-
parameter Real G3=(Gabsht + Gabser + Gbcsht + Gbcser + Gcasht + Gcaser)/3;
105-
parameter Real B3=(Babsht + Babser + Bbcsht + Bbcser + Bcasht + Bcaser)/3;
100+
Real G1=(Gaasht + Gaaser + Gbbsht + Gbbser + Gccsht + Gccser)/3;
101+
Real B1=(Baasht + Baaser + Bbbsht + Bbbser + Bccsht + Bccser)/3;
102+
Real G2=(Gbasht + Gbaser + Gacsht + Gacser + Gcbsht + Gcbser)/3;
103+
Real B2=(Bbasht + Bbaser + Bacsht + Bacser + Bcbsht + Bcbser)/3;
104+
Real G3=(Gabsht + Gabser + Gbcsht + Gbcser + Gcasht + Gcaser)/3;
105+
Real B3=(Babsht + Babser + Bbcsht + Bbcser + Bcasht + Bcaser)/3;
106106
//Calculating the element of Matrix A
107-
parameter Real Ar=(2*G1 - G2 - sqrt(3)*B2 - G3 + sqrt(3)*B3)/2;
108-
parameter Real Ai=(2*B1 - B2 + sqrt(3)*G2 - B3 - sqrt(3)*G3)/2;
107+
Real Ar=(2*G1 - G2 - sqrt(3)*B2 - G3 + sqrt(3)*B3)/2;
108+
Real Ai=(2*B1 - B2 + sqrt(3)*G2 - B3 - sqrt(3)*G3)/2;
109109
//Calculating elements of Matrix MB
110-
parameter Real MB1r=-(2*Gaaser - Gbaser - sqrt(3)*Bbaser - Gcaser + sqrt(3)*
110+
Real MB1r=-(2*Gaaser - Gbaser - sqrt(3)*Bbaser - Gcaser + sqrt(3)*
111111
Bcaser)/6;
112-
parameter Real MB1i=-(2*Baaser - Bbaser + sqrt(3)*Gbaser - Bcaser - sqrt(3)*
112+
Real MB1i=-(2*Baaser - Bbaser + sqrt(3)*Gbaser - Bcaser - sqrt(3)*
113113
Gcaser)/6;
114-
parameter Real MB2r=-(2*Gabser - Gbbser - sqrt(3)*Bbbser - Gcbser + sqrt(3)*
114+
Real MB2r=-(2*Gabser - Gbbser - sqrt(3)*Bbbser - Gcbser + sqrt(3)*
115115
Bcbser)/6;
116-
parameter Real MB2i=-(2*Babser - Bbbser + sqrt(3)*Gbbser - Bcbser - sqrt(3)*
116+
Real MB2i=-(2*Babser - Bbbser + sqrt(3)*Gbbser - Bcbser - sqrt(3)*
117117
Gcbser)/6;
118-
parameter Real MB3r=-(2*Gacser - Gbcser - sqrt(3)*Bbcser - Gccser + sqrt(3)*
118+
Real MB3r=-(2*Gacser - Gbcser - sqrt(3)*Bbcser - Gccser + sqrt(3)*
119119
Bccser)/6;
120-
parameter Real MB3i=-(2*Bacser - Bbcser + sqrt(3)*Gbcser - Bccser - sqrt(3)*
120+
Real MB3i=-(2*Bacser - Bbcser + sqrt(3)*Gbcser - Bccser - sqrt(3)*
121121
Gccser)/6;
122122
//Calculating elements of Matrix C
123-
parameter Real C1r=-(2*Gaaser - Gabser + sqrt(3)*Babser - Gacser - sqrt(3)*
123+
Real C1r=-(2*Gaaser - Gabser + sqrt(3)*Babser - Gacser - sqrt(3)*
124124
Bacser)/2;
125-
parameter Real C1i=-(2*Baaser - Babser - sqrt(3)*Gabser - Bacser + sqrt(3)*
125+
Real C1i=-(2*Baaser - Babser - sqrt(3)*Gabser - Bacser + sqrt(3)*
126126
Gacser)/2;
127-
parameter Real C2r=-(2*Gbaser - Gbbser + sqrt(3)*Bbbser - Gbcser - sqrt(3)*
127+
Real C2r=-(2*Gbaser - Gbbser + sqrt(3)*Bbbser - Gbcser - sqrt(3)*
128128
Bbcser)/2;
129-
parameter Real C2i=-(2*Bbaser - Bbbser - sqrt(3)*Gbbser - Bbcser + sqrt(3)*
129+
Real C2i=-(2*Bbaser - Bbbser - sqrt(3)*Gbbser - Bbcser + sqrt(3)*
130130
Gbcser)/2;
131-
parameter Real C3r=-(2*Gcaser - Gcbser + sqrt(3)*Bcbser - Gccser - sqrt(3)*
131+
Real C3r=-(2*Gcaser - Gcbser + sqrt(3)*Bcbser - Gccser - sqrt(3)*
132132
Bccser)/2;
133-
parameter Real C3i=-(2*Bcaser - Bcbser - sqrt(3)*Gcbser - Bccser + sqrt(3)*
133+
Real C3i=-(2*Bcaser - Bcbser - sqrt(3)*Gcbser - Bccser + sqrt(3)*
134134
Gccser)/2;
135135
//Calculating elements of Matrix D
136-
parameter Real D11r=Gaaser + Gaasht;
137-
parameter Real D11i=Baaser + Baasht;
138-
parameter Real D12r=Gabser + Gabsht;
139-
parameter Real D12i=Babser + Babsht;
140-
parameter Real D13r=Gacser + Gacsht;
141-
parameter Real D13i=Bacser + Bacsht;
142-
parameter Real D21r=Gbaser + Gbasht;
143-
parameter Real D21i=Bbaser + Bbasht;
144-
parameter Real D22r=Gbbser + Gbbsht;
145-
parameter Real D22i=Bbbser + Bbbsht;
146-
parameter Real D23r=Gbcser + Gbcsht;
147-
parameter Real D23i=Bbcser + Bbcsht;
148-
parameter Real D31r=Gcaser + Gcasht;
149-
parameter Real D31i=Bcaser + Bcasht;
150-
parameter Real D32r=Gcbser + Gcbsht;
151-
parameter Real D32i=Bcbser + Bcbsht;
152-
parameter Real D33r=Gccser + Gccsht;
153-
parameter Real D33i=Bccser + Bccsht;
136+
Real D11r=Gaaser + Gaasht;
137+
Real D11i=Baaser + Baasht;
138+
Real D12r=Gabser + Gabsht;
139+
Real D12i=Babser + Babsht;
140+
Real D13r=Gacser + Gacsht;
141+
Real D13i=Bacser + Bacsht;
142+
Real D21r=Gbaser + Gbasht;
143+
Real D21i=Bbaser + Bbasht;
144+
Real D22r=Gbbser + Gbbsht;
145+
Real D22i=Bbbser + Bbbsht;
146+
Real D23r=Gbcser + Gbcsht;
147+
Real D23i=Bbcser + Bbcsht;
148+
Real D31r=Gcaser + Gcasht;
149+
Real D31i=Bcaser + Bcasht;
150+
Real D32r=Gcbser + Gcbsht;
151+
Real D32i=Bcbser + Bcbsht;
152+
Real D33r=Gccser + Gccsht;
153+
Real D33i=Bccser + Bccsht;
154154
algorithm
155155
Y := [Ar, Ai, MB1r, MB1i, MB2r, MB2i, MB3r, MB3i, C1r, C1i, C2r, C2i, C3r,
156156
C3i, D11r, D11i, D12r, D12i, D13r, D13i, D21r, D21i, D22r, D22i, D23r, D23i,

0 commit comments

Comments
 (0)