Skip to content

Commit f3441c6

Browse files
danielfeismanndanielfeismann
authored
Merge branch 'dev' into df/#1409-spotless-java-format
2 parents a23b2ed + 9bf97c8 commit f3441c6

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Fixed
1313
- Fixed small issues in tests [#1400](https://github.com/ie3-institute/PowerSystemDataModel/issues/1400)
14+
- Fix transformer susceptance in readTheDocs to negative values [#1078](https://github.com/ie3-institute/PowerSystemDataModel/issues/1078)
15+
1416

1517
### Changed
1618
- Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)

‎docs/readthedocs/models/input/grid/transformer2w.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
165165
- source
166166
167167
* - 5a890aae-b9c9-4ebf-8a49-8850ae9df402
168-
- 219.43184927638458
168+
- -219.43184927638458
169169
- 0.0
170170
- 1.0
171171
- 1731.3019390581715
@@ -182,7 +182,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
182182
- simBench
183183
184184
* - 03159c0d-126e-47cc-9871-066870df3a3f
185-
- 1193.4686938790917
185+
- -1193.4686938790917
186186
- 0.0
187187
- 1.0
188188
- 831.0249307479223
@@ -199,7 +199,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
199199
- simBench
200200
201201
* - 7cb289cb-e6af-4470-9c68-e5a91978a5e7
202-
- 2013.800484464662
202+
- -2013.800484464662
203203
- 0.0
204204
- 1.0
205205
- 1446.280991735537
@@ -216,7 +216,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
216216
- simBench
217217
218218
* - 73644bc6-78cf-4882-9837-e6508cab092d
219-
- 867.7685950413226
219+
- -867.7685950413226
220220
- 0.0
221221
- 1.5
222222
- 1157.0247933884295
@@ -233,7 +233,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
233233
- simBench
234234
235235
* - 6935ae26-374a-4c24-aeee-6d5760d6ddf3
236-
- 720.4791642215993
236+
- -720.4791642215993
237237
- 0.0
238238
- 1.5
239239
- 1487.603305785124
@@ -250,7 +250,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
250250
- simBench
251251
252252
* - b49db20f-b8b5-4265-8318-f669b9d121e9
253-
- 1015.6886939330394
253+
- -1015.6886939330394
254254
- 0.0
255255
- 1.5
256256
- 1818.181818181818
@@ -267,7 +267,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
267267
- simBench
268268
269269
* - 0843b836-cee4-4a8c-81a4-098400fe91cf
270-
- 24.495101551166183
270+
- -24.495101551166183
271271
- 0.0
272272
- 2.5
273273
- 2999.9999999999995
@@ -284,7 +284,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
284284
- simBench
285285
286286
* - a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1
287-
- 9.591746452043322
287+
- -9.591746452043322
288288
- 0.0
289289
- 2.5
290290
- 1149.9999999999998
@@ -301,7 +301,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
301301
- simBench
302302
303303
* - 0644c120-a247-425f-bbe4-31b153f7f440
304-
- 16.583241729259253
304+
- -16.583241729259253
305305
- 0.0
306306
- 2.5
307307
- 2199.9999999999995
@@ -318,7 +318,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
318318
- simBench
319319
320320
* - bdf22ee4-deba-41f4-a187-ae00638a6880
321-
- 36.47380569074435
321+
- -36.47380569074435
322322
- 0.0
323323
- 2.5
324324
- 4125.0
@@ -335,7 +335,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
335335
- simBench
336336
337337
* - a0cbd90a-4e9f-47db-8dca-041d3a288f77
338-
- 145.8952227629774
338+
- -145.8952227629774
339339
- 0.0
340340
- 2.5
341341
- 16500.0

‎input/StandardAssetTypes/transformer_2_w_type_input.csv‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
uuid,b_m,d_phi,d_v,g_m,id,r_sc,s_rated,tap_max,tap_min,tap_neutr,tap_side,v_rated_a,v_rated_b,x_sc
2-
5a890aae-b9c9-4ebf-8a49-8850ae9df402,219.43184927638458,0.0,1.0,1731.3019390581715,Typ_x_380/220,0.6016666666666666,600000.0,16,-16,0,false,380.0,220.0,44.51926783240413
3-
03159c0d-126e-47cc-9871-066870df3a3f,1193.4686938790917,0.0,1.0,831.0249307479223,350MVA_380/110,1.0608979591836734,350000.0,16,-16,0,false,380.0,110.0,90.75951402093402
4-
7cb289cb-e6af-4470-9c68-e5a91978a5e7,2013.800484464662,0.0,1.0,1446.280991735537,300MVA_220/110,0.20704444444444442,300000.0,16,-16,0,false,220.0,110.0,19.358892855688435
5-
73644bc6-78cf-4882-9837-e6508cab092d,867.7685950413226,0.0,1.5,1157.0247933884295,25 MVA 110/20 kV YNd5,1.9843999999999997,25000.0,9,-9,0,false,110.0,20.0,58.04608993412045
6-
6935ae26-374a-4c24-aeee-6d5760d6ddf3,720.4791642215993,0.0,1.5,1487.603305785124,40 MVA 110/20 kV YNd5,1.0285,40000.0,9,-9,0,false,110.0,20.0,48.994205909984906
7-
b49db20f-b8b5-4265-8318-f669b9d121e9,1015.6886939330394,0.0,1.5,1818.181818181818,63 MVA 110/10 kV YNd5,0.6146031746031745,63000.0,9,-9,0,false,110.0,10.0,34.56596500037509
8-
0843b836-cee4-4a8c-81a4-098400fe91cf,24.495101551166183,0.0,2.5,2999.9999999999995,0.4 MVA 20/0.4 kV Dyn5 ASEA,11.999999999999998,400.0,2,-2,0,false,20.0,0.4,58.787753826796276
9-
a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1,9.591746452043322,0.0,2.5,1149.9999999999998,0.16 MVA 20/0.4 kV DOTE 160/20 SGB,36.71874999999999,160.0,2,-2,0,false,20.0,0.4,93.01469452961452
10-
0644c120-a247-425f-bbe4-31b153f7f440,16.583241729259253,0.0,2.5,2199.9999999999995,0.25 MVA 20/0.4 kV Dyn5 ASEA,21.119999999999997,250.0,2,-2,0,false,20.0,0.4,93.6479876986153
11-
bdf22ee4-deba-41f4-a187-ae00638a6880,36.47380569074435,0.0,2.5,4125.0,0.63 MVA 20/0.4 kV Dyn5 ASEA,6.953892668178382,630.0,2,-2,0,false,20.0,0.4,37.45518044666632
12-
a0cbd90a-4e9f-47db-8dca-041d3a288f77,145.8952227629774,0.0,2.5,16500.0,0.63 MVA 10/0.4 kV Dyn5 ASEA,1.7384731670445954,630.0,2,-2,0,false,10.0,0.4,9.36379511166658
2+
5a890aae-b9c9-4ebf-8a49-8850ae9df402,-219.43184927638458,0.0,1.0,1731.3019390581715,Typ_x_380/220,0.6016666666666666,600000.0,16,-16,0,false,380.0,220.0,44.51926783240413
3+
03159c0d-126e-47cc-9871-066870df3a3f,-1193.4686938790917,0.0,1.0,831.0249307479223,350MVA_380/110,1.0608979591836734,350000.0,16,-16,0,false,380.0,110.0,90.75951402093402
4+
7cb289cb-e6af-4470-9c68-e5a91978a5e7,-2013.800484464662,0.0,1.0,1446.280991735537,300MVA_220/110,0.20704444444444442,300000.0,16,-16,0,false,220.0,110.0,19.358892855688435
5+
73644bc6-78cf-4882-9837-e6508cab092d,-867.7685950413226,0.0,1.5,1157.0247933884295,25 MVA 110/20 kV YNd5,1.9843999999999997,25000.0,9,-9,0,false,110.0,20.0,58.04608993412045
6+
6935ae26-374a-4c24-aeee-6d5760d6ddf3,-720.4791642215993,0.0,1.5,1487.603305785124,40 MVA 110/20 kV YNd5,1.0285,40000.0,9,-9,0,false,110.0,20.0,48.994205909984906
7+
b49db20f-b8b5-4265-8318-f669b9d121e9,-1015.6886939330394,0.0,1.5,1818.181818181818,63 MVA 110/10 kV YNd5,0.6146031746031745,63000.0,9,-9,0,false,110.0,10.0,34.56596500037509
8+
0843b836-cee4-4a8c-81a4-098400fe91cf,-24.495101551166183,0.0,2.5,2999.9999999999995,0.4 MVA 20/0.4 kV Dyn5 ASEA,11.999999999999998,400.0,2,-2,0,false,20.0,0.4,58.787753826796276
9+
a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1,-9.591746452043322,0.0,2.5,1149.9999999999998,0.16 MVA 20/0.4 kV DOTE 160/20 SGB,36.71874999999999,160.0,2,-2,0,false,20.0,0.4,93.01469452961452
10+
0644c120-a247-425f-bbe4-31b153f7f440,-16.583241729259253,0.0,2.5,2199.9999999999995,0.25 MVA 20/0.4 kV Dyn5 ASEA,21.119999999999997,250.0,2,-2,0,false,20.0,0.4,93.6479876986153
11+
bdf22ee4-deba-41f4-a187-ae00638a6880,-36.47380569074435,0.0,2.5,4125.0,0.63 MVA 20/0.4 kV Dyn5 ASEA,6.953892668178382,630.0,2,-2,0,false,20.0,0.4,37.45518044666632
12+
a0cbd90a-4e9f-47db-8dca-041d3a288f77,-145.8952227629774,0.0,2.5,16500.0,0.63 MVA 10/0.4 kV Dyn5 ASEA,1.7384731670445954,630.0,2,-2,0,false,10.0,0.4,9.36379511166658

0 commit comments

Comments
 (0)