From c4e59335403ae48117eb506d01431619664ee356 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 8 May 2023 08:47:32 +0200 Subject: [PATCH 1/4] adjust comments --- .../input/connector/type/Transformer2WTypeInput.java | 2 +- .../input/connector/type/Transformer3WTypeInput.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index fa2280c5f..9221e8cb9 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -46,7 +46,7 @@ public class Transformer2WTypeInput extends AssetTypeInput { * @param id of the type * @param rSc Short circuit resistance * @param xSc Short circuit reactance - * @param sRated Rated apparent power (typically in MVA) + * @param sRated Rated apparent power (typically in kVA) * @param vRatedA Rated voltage of the high voltage winding * @param vRatedB Rated voltage of the low voltage winding * @param gM Phase-to-ground conductance diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index 488e142c6..e08ee67e4 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -14,11 +14,11 @@ /** Describes the type of a {@link edu.ie3.datamodel.models.input.connector.Transformer3WInput} */ public class Transformer3WTypeInput extends AssetTypeInput { - /** Rated apparent power of the high voltage winding (typically in MVA) */ + /** Rated apparent power of the high voltage winding (typically in kVA) */ private final ComparableQuantity sRatedA; // Hv - /** Rated apparent power of the medium voltage winding (typically in MVA) */ + /** Rated apparent power of the medium voltage winding (typically in kVA) */ private final ComparableQuantity sRatedB; // Mv - /** Rated apparent power of the low voltage windings (typically in MVA) */ + /** Rated apparent power of the low voltage windings (typically in kVA) */ private final ComparableQuantity sRatedC; // Lv /** Rated voltage magnitude of the high voltage winding (typically in kV) */ private final ComparableQuantity vRatedA; // Hv @@ -27,7 +27,7 @@ public class Transformer3WTypeInput extends AssetTypeInput { /** Rated voltage magnitude of the low voltage winding (typically in kV) */ private final ComparableQuantity vRatedC; // Lv /** Short-circuit resistance of the high voltage winding (typically in Ohm) */ - private final ComparableQuantity rScA; // Hv + private final ComparableQuantity rScA; // Hvk /** Short-circuit resistance of the medium voltage winding (typically in Ohm) */ private final ComparableQuantity rScB; // Mv /** Short-circuit resistance of the low voltage winding (typically in Ohm) */ From 66b6ad6699cf38f39a3b46ea2391b89488379bba Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 8 May 2023 08:49:00 +0200 Subject: [PATCH 2/4] fix typo --- .../models/input/connector/type/Transformer3WTypeInput.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index e08ee67e4..65c308071 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -27,7 +27,7 @@ public class Transformer3WTypeInput extends AssetTypeInput { /** Rated voltage magnitude of the low voltage winding (typically in kV) */ private final ComparableQuantity vRatedC; // Lv /** Short-circuit resistance of the high voltage winding (typically in Ohm) */ - private final ComparableQuantity rScA; // Hvk + private final ComparableQuantity rScA; // Hv /** Short-circuit resistance of the medium voltage winding (typically in Ohm) */ private final ComparableQuantity rScB; // Mv /** Short-circuit resistance of the low voltage winding (typically in Ohm) */ From 6ca95ac8d43f57437ac62275f57912e9fbefb748 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 8 May 2023 08:51:36 +0200 Subject: [PATCH 3/4] adjust missing entry --- .../models/input/connector/type/Transformer2WTypeInput.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index 9221e8cb9..319c4cf3f 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -18,7 +18,7 @@ public class Transformer2WTypeInput extends AssetTypeInput { private final ComparableQuantity rSc; /** Short circuit reactance (typically in Ohm) */ private final ComparableQuantity xSc; - /** Rated apparent power (typically in MVA) */ + /** Rated apparent power (typically in kVA) */ private final ComparableQuantity sRated; /** Rated voltage of the high voltage winding (typically in kV) */ private final ComparableQuantity vRatedA; From 6203d429cc60d6dca02dcea0eb08d0a07878e826 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 8 May 2023 08:55:35 +0200 Subject: [PATCH 4/4] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ab3c6a2d..5528cbbec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Allow hierarchic grid structure for JointGridContainer [#768](https://github.com/ie3-institute/PowerSystemDataModel/issues/768) ### Fixed +- Fixed wrong rated power unit hint [#804](https://github.com/ie3-institute/PowerSystemDataModel/issues/804) ### Changed