Merge branch 'dev' into df/#1352-air-condition-input

# Conflicts:
#	CHANGELOG.md

Author: danielfeismann

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
 
       #Deployment
       - name: Deploy
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
+        if: github.ref == 'refs/heads/main'
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVENCENTRAL_SIGNINGKEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVENCENTRAL_SIGNINGPASS }}
@@ -108,7 +108,7 @@ jobs:
 
       #MavenCentral Staging
       - name: MavenCentral Staging
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
+        if: github.ref == 'refs/heads/main'
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVENCENTRAL_SIGNINGKEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVENCENTRAL_SIGNINGPASS }}

CHANGELOG.md

@@ -7,13 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### Added
--Added weathersource documentation [#1390](https://github.com/ie3-institute/PowerSystemDataModel/issues/1390)
+- Added weathersource documentation [#1390](https://github.com/ie3-institute/PowerSystemDataModel/issues/1390)
+- Added standard asset parameter for `3wTransformer` in `ReadTheDocs` [#1417](https://github.com/ie3-institute/PowerSystemDataModel/issues/1417)
 - Create data model for air condition [#1396](https://github.com/ie3-institute/PowerSystemDataModel/issues/1396)
 
 ### Fixed
 - Fixed small issues in tests [#1400](https://github.com/ie3-institute/PowerSystemDataModel/issues/1400)
+- Fix transformer susceptance in readTheDocs to negative values [#1078](https://github.com/ie3-institute/PowerSystemDataModel/issues/1078)
+
 
 ### Changed
+- Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)
+- Extend `GermanVoltageLevelUtils` with more synonymousIds [#143](https://github.com/ie3-institute/PowerSystemDataModel/issues/143)
 
 ## [8.1.0] - 2025-07-25
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
   id 'signing'
   id 'pmd' // code check, working on source code
   id 'com.diffplug.spotless' version '7.2.1' //code format
-  id 'com.github.spotbugs' version '6.2.2' // code check, working on byte code
+  id 'com.github.spotbugs' version '6.2.3' // code check, working on byte code
   id 'de.undercouch.download' version '5.6.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
   id 'jacoco' // java code coverage plugin
@@ -99,12 +99,12 @@ dependencies {
 
   // Databases
   implementation 'org.influxdb:influxdb-java:2.25'
-  implementation 'com.couchbase.client:java-client:3.8.3'
+  implementation 'com.couchbase.client:java-client:3.9.0'
   runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
 
   implementation 'commons-io:commons-io:2.20.0' // I/O functionalities
   implementation 'commons-codec:commons-codec:1.19.0' // needed by commons-compress
-  implementation 'org.apache.commons:commons-compress:1.27.1' // I/O functionalities
+  implementation 'org.apache.commons:commons-compress:1.28.0' // I/O functionalities
 }
 
 tasks.withType(JavaCompile) {

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

@@ -137,10 +137,9 @@ A list with some standard transformer types can be found here: [Standard Two Win
 ## Standard Two Winding Transformer Types
 
 
-Following there are some standard two winding transformer types with their source. A ``csv file`` containing the types listed
-below can be found [here](https://github.com/ie3-institute/PowerSystemDataModel/tree/dev/input/StandardAssetTypes). This
-file can be used directly for any simulation with ``simona``.
-The transformers which source is ``simBench`` are from [here](https://simbench.de/en/download/datasets/).
+Following there are some standard two winding transformer types with their source. The types are listed below in a ``csv file`` [here](https://github.com/ie3-institute/PowerSystemDataModel/tree/dev/input/StandardAssetTypes). This
+file can be used directly for any simulation with [SIMONA](https://github.com/ie3-institute/simona).
+The source for transformers from ``simBench`` can be found [here](https://simbench.de/en/download/datasets/).
 
 ```{list-table}
    :widths: auto
@@ -165,7 +164,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - source
      
    * - 5a890aae-b9c9-4ebf-8a49-8850ae9df402
-     - 219.43184927638458
+     - -219.43184927638458
      - 0.0
      - 1.0
      - 1731.3019390581715
@@ -182,7 +181,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 03159c0d-126e-47cc-9871-066870df3a3f
-     - 1193.4686938790917
+     - -1193.4686938790917
      - 0.0
      - 1.0
      - 831.0249307479223
@@ -199,7 +198,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 7cb289cb-e6af-4470-9c68-e5a91978a5e7
-     - 2013.800484464662
+     - -2013.800484464662
      - 0.0
      - 1.0
      - 1446.280991735537
@@ -216,7 +215,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 73644bc6-78cf-4882-9837-e6508cab092d
-     - 867.7685950413226
+     - -867.7685950413226
      - 0.0
      - 1.5
      - 1157.0247933884295
@@ -233,7 +232,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 6935ae26-374a-4c24-aeee-6d5760d6ddf3
-     - 720.4791642215993
+     - -720.4791642215993
      - 0.0
      - 1.5
      - 1487.603305785124
@@ -250,7 +249,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - b49db20f-b8b5-4265-8318-f669b9d121e9
-     - 1015.6886939330394
+     - -1015.6886939330394
      - 0.0
      - 1.5
      - 1818.181818181818
@@ -267,7 +266,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 0843b836-cee4-4a8c-81a4-098400fe91cf
-     - 24.495101551166183
+     - -24.495101551166183
      - 0.0
      - 2.5
      - 2999.9999999999995
@@ -284,7 +283,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1
-     - 9.591746452043322
+     - -9.591746452043322
      - 0.0
      - 2.5
      - 1149.9999999999998
@@ -301,7 +300,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 0644c120-a247-425f-bbe4-31b153f7f440
-     - 16.583241729259253
+     - -16.583241729259253
      - 0.0
      - 2.5
      - 2199.9999999999995
@@ -318,7 +317,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - bdf22ee4-deba-41f4-a187-ae00638a6880
-     - 36.47380569074435
+     - -36.47380569074435
      - 0.0
      - 2.5
      - 4125.0
@@ -335,7 +334,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - a0cbd90a-4e9f-47db-8dca-041d3a288f77
-     - 145.8952227629774
+     - -145.8952227629774
      - 0.0
      - 2.5
      - 16500.0

docs/readthedocs/models/input/grid/transformer3w.md

@@ -178,9 +178,67 @@ All impedances and admittances are given with respect to the higher voltage side
 
 ```
 
+## Standard Three Winding Transformer Types
+
+Following there are some standard three winding transformer types with their source. The types are listed below in a ``csv file`` [here](https://github.com/ie3-institute/PowerSystemDataModel/tree/dev/input/StandardAssetTypes). This
+file can be used directly for any simulation with [SIMONA](https://github.com/ie3-institute/simona).
+
+```{list-table}
+   :widths: auto
+   :class: wrapping
+   :header-rows: 1
+   
+   * - uuid
+     - bM
+     - dPhi
+     - dV
+     - gM
+     - id
+     - rScA
+     - rScB
+     - rScC
+     - sRatedA
+     - sRatedB
+     - sRatedC
+     - tapMax
+     - tapMin
+     - tapNeutr
+     - vRatedA
+     - vRatedB
+     - vRatedC
+     - xScA
+     - xScB
+     - xScC
+     - source
+     
+   * - 62aef8ec-7e68-43e5-9678-8cde101f0116
+     - -519.4864
+     - 0.0
+     - 1.5
+     - 12.985
+     - HoeS_HS_MS
+     - 0.1444
+     - 0.5776
+     - 1.1552
+     - 300000.0
+     - 300000.0
+     - 100000.0
+     - 10
+     - -10
+     - 0
+     - 380.0
+     - 110.0
+     - 30.0
+     - 24.066121
+     - 60.164118
+     - 199.750106
+     - Dissertation C. Kittl TU Dortmund[^cite_kittl2022]     
+```
+
 ## Caveats
 
 Nothing - at least not known.
 If you found something, please contact us!
 
 [^cite_gremmel1999]: Gremmel, H., Ed., Schaltanlagen. Cornelsen Verlag, 1999, Vol. 10, isbn: 3-464-48235-9.
+[^cite_kittl2022]: Kittl, C., Entwurf und Validierung eines individualitätszentrierten, interdisziplinären Energiesystemsimulators basierend auf ereignisdiskreter Simulation und Agententheorie, Dortmunder Beiträge zu Energiesystemen, Energieeffizienz und Energiewirtschaft, Shaker Verlag, 2022, Vol. 25, isbn: 9-783-84408463-4.

input/StandardAssetTypes/transformer_2_w_type_input.csv

@@ -1,12 +1,12 @@
 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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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

input/StandardAssetTypes/transformer_3_w_type_input.csv

@@ -0,0 +1,2 @@
+uuid,b_m,d_phi,d_v,g_m,id,r_sc_a,r_sc_b,r_sc_c,s_rated_a,s_rated_b,s_rated_c,tap_max,tap_min,tap_neutr,v_rated_a,v_rated_b,v_rated_c,x_sc_a,x_sc_b,x_sc_c
+62aef8ec-7e68-43e5-9678-8cde101f0116,-519.4864,0.0,1.5,12.985,HoeS_HS_MS,0.1444,0.5776,1.1552,300000.0,300000.0,100000.0,10,-10,0,380.0,110.0,30.0,24.066121,60.164118,199.750106

src/main/java/edu/ie3/datamodel/models/voltagelevels/GermanVoltageLevelUtils.java

@@ -27,28 +27,28 @@ public class GermanVoltageLevelUtils {
       new CommonVoltageLevel(
           "Niederspannung",
           Quantities.getQuantity(0.4, KILOVOLT),
-          new HashSet<>(Arrays.asList("lv", "ns")),
+          new HashSet<>(Arrays.asList("lv", "ns", "0.4kV")),
           new RightOpenInterval<>(
               Quantities.getQuantity(0d, KILOVOLT), Quantities.getQuantity(10d, KILOVOLT)));
   public static final CommonVoltageLevel MV_10KV =
       new CommonVoltageLevel(
           MS,
           Quantities.getQuantity(10d, KILOVOLT),
-          new HashSet<>(Arrays.asList("ms", "mv", "ms_10kv", "mv_10kV")),
+          new HashSet<>(Arrays.asList("ms", "mv", "ms_10kv", "mv_10kV", "10.0kV", "10kV")),
           new RightOpenInterval<>(
               Quantities.getQuantity(10d, KILOVOLT), Quantities.getQuantity(20d, KILOVOLT)));
   public static final CommonVoltageLevel MV_20KV =
       new CommonVoltageLevel(
           MS,
           Quantities.getQuantity(20d, KILOVOLT),
-          new HashSet<>(Arrays.asList("ms", "mv", "ms_20kv", "mv_20kV")),
+          new HashSet<>(Arrays.asList("ms", "mv", "ms_20kv", "mv_20kV", "20.0kV", "20kV")),
           new RightOpenInterval<>(
               Quantities.getQuantity(20d, KILOVOLT), Quantities.getQuantity(30d, KILOVOLT)));
   public static final CommonVoltageLevel MV_30KV =
       new CommonVoltageLevel(
           MS,
           Quantities.getQuantity(30d, KILOVOLT),
-          new HashSet<>(Arrays.asList("ms", "mv", "ms_30kv", "mv_30kV")),
+          new HashSet<>(Arrays.asList("ms", "mv", "ms_30kv", "mv_30kV", "30.0kV", "30kV")),
           new RightOpenInterval<>(
               Quantities.getQuantity(30d, KILOVOLT), Quantities.getQuantity(110d, KILOVOLT)));
   public static final CommonVoltageLevel HV =

src/test/groovy/edu/ie3/datamodel/models/GermanVoltageLevelUtilsTest.groovy

@@ -24,9 +24,16 @@ class GermanVoltageLevelUtilsTest extends Specification {
     where:
     id      || vRated                                   || expected
     "NS"    || Quantities.getQuantity(0.4d, KILOVOLT)   || LV
+    "0.4kV" || Quantities.getQuantity(0.4d, KILOVOLT)   || LV
+    "10.0kV"|| Quantities.getQuantity(10d, KILOVOLT)    || MV_10KV
+    "10kV"  || Quantities.getQuantity(10d, KILOVOLT)    || MV_10KV
     "MS"    || Quantities.getQuantity(15d, KILOVOLT)    || MV_10KV
     "MS"    || Quantities.getQuantity(20d, KILOVOLT)    || MV_20KV
+    "20.0kV"|| Quantities.getQuantity(20d, KILOVOLT)    || MV_20KV
+    "20kV"  || Quantities.getQuantity(20d, KILOVOLT)    || MV_20KV
     "MS"    || Quantities.getQuantity(35d, KILOVOLT)    || MV_30KV
+    "30.0kV"|| Quantities.getQuantity(30d, KILOVOLT)    || MV_30KV
+    "30kV"  || Quantities.getQuantity(30d, KILOVOLT)    || MV_30KV
     "HS"    || Quantities.getQuantity(110d, KILOVOLT)   || HV
     "HoeS"  || Quantities.getQuantity(220d, KILOVOLT)   || EHV_220KV
     "HoeS"  || Quantities.getQuantity(380d, KILOVOLT)   || EHV_380KV

src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy

@@ -278,8 +278,8 @@ class ContainerUtilsTest extends Specification {
     InvalidGridException ex = thrown()
     ex.message == "There are 2 voltage levels apparent, although only one is expected. Following voltage levels" +
         " are present: CommonVoltageLevel{id='Mittelspannung', nominalVoltage=10 kV, synonymousIds=" +
-        "[Mittelspannung, ms, ms_10kv, mv, mv_10kV], voltageRange=Interval [10 kV, 20 kV)}, CommonVoltageLevel" +
-        "{id='Mittelspannung', nominalVoltage=20 kV, synonymousIds=[Mittelspannung, ms, ms_20kv, mv, mv_20kV], " +
+        "[10.0kV, 10kV, Mittelspannung, ms, ms_10kv, mv, mv_10kV], voltageRange=Interval [10 kV, 20 kV)}, CommonVoltageLevel" +
+        "{id='Mittelspannung', nominalVoltage=20 kV, synonymousIds=[20.0kV, 20kV, Mittelspannung, ms, ms_20kv, mv, mv_20kV], " +
         "voltageRange=Interval [20 kV, 30 kV)}"
   }