Skip to content

Commit 8972b33

Browse files
danielfeismanndanielfeismann
authored
Merge branch 'dev' into df/#1417-3wTransformer-rtd
2 parents 31ef624 + 9bf97c8 commit 8972b33

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
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212

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

1618
### Changed
1719
- 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
@@ -164,7 +164,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
164164
- source
165165
166166
* - 5a890aae-b9c9-4ebf-8a49-8850ae9df402
167-
- 219.43184927638458
167+
- -219.43184927638458
168168
- 0.0
169169
- 1.0
170170
- 1731.3019390581715
@@ -181,7 +181,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
181181
- simBench
182182
183183
* - 03159c0d-126e-47cc-9871-066870df3a3f
184-
- 1193.4686938790917
184+
- -1193.4686938790917
185185
- 0.0
186186
- 1.0
187187
- 831.0249307479223
@@ -198,7 +198,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
198198
- simBench
199199
200200
* - 7cb289cb-e6af-4470-9c68-e5a91978a5e7
201-
- 2013.800484464662
201+
- -2013.800484464662
202202
- 0.0
203203
- 1.0
204204
- 1446.280991735537
@@ -215,7 +215,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
215215
- simBench
216216
217217
* - 73644bc6-78cf-4882-9837-e6508cab092d
218-
- 867.7685950413226
218+
- -867.7685950413226
219219
- 0.0
220220
- 1.5
221221
- 1157.0247933884295
@@ -232,7 +232,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
232232
- simBench
233233
234234
* - 6935ae26-374a-4c24-aeee-6d5760d6ddf3
235-
- 720.4791642215993
235+
- -720.4791642215993
236236
- 0.0
237237
- 1.5
238238
- 1487.603305785124
@@ -249,7 +249,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
249249
- simBench
250250
251251
* - b49db20f-b8b5-4265-8318-f669b9d121e9
252-
- 1015.6886939330394
252+
- -1015.6886939330394
253253
- 0.0
254254
- 1.5
255255
- 1818.181818181818
@@ -266,7 +266,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
266266
- simBench
267267
268268
* - 0843b836-cee4-4a8c-81a4-098400fe91cf
269-
- 24.495101551166183
269+
- -24.495101551166183
270270
- 0.0
271271
- 2.5
272272
- 2999.9999999999995
@@ -283,7 +283,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
283283
- simBench
284284
285285
* - a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1
286-
- 9.591746452043322
286+
- -9.591746452043322
287287
- 0.0
288288
- 2.5
289289
- 1149.9999999999998
@@ -300,7 +300,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
300300
- simBench
301301
302302
* - 0644c120-a247-425f-bbe4-31b153f7f440
303-
- 16.583241729259253
303+
- -16.583241729259253
304304
- 0.0
305305
- 2.5
306306
- 2199.9999999999995
@@ -317,7 +317,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
317317
- simBench
318318
319319
* - bdf22ee4-deba-41f4-a187-ae00638a6880
320-
- 36.47380569074435
320+
- -36.47380569074435
321321
- 0.0
322322
- 2.5
323323
- 4125.0
@@ -334,7 +334,7 @@ The source for transformers from ``simBench`` can be found [here](https://simben
334334
- simBench
335335
336336
* - a0cbd90a-4e9f-47db-8dca-041d3a288f77
337-
- 145.8952227629774
337+
- -145.8952227629774
338338
- 0.0
339339
- 2.5
340340
- 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)