From 2ffb731619995345c37cc3f861b4373313143f92 Mon Sep 17 00:00:00 2001 From: NOIR Nicolas ext Date: Fri, 23 Jul 2021 11:11:03 +0200 Subject: [PATCH] Addition of nominal voltage when available in returned equipment data Signed-off-by: NOIR Nicolas ext --- .../network/map/NetworkMapService.java | 21 ++++++++++-- .../AbstractHvdcConverterStationMapData.java | 3 ++ .../network/map/model/BatteryMapData.java | 3 ++ .../map/model/DanglingLineMapData.java | 3 ++ .../network/map/model/GeneratorMapData.java | 3 ++ .../network/map/model/LineMapData.java | 6 ++++ .../network/map/model/LoadMapData.java | 3 ++ .../map/model/ShuntCompensatorMapData.java | 3 ++ .../model/StaticVarCompensatorMapData.java | 3 ++ .../ThreeWindingsTransformerMapData.java | 9 +++++ .../model/TwoWindingsTransformerMapData.java | 6 ++++ .../2-windings-transformers-map-data.json | 4 +++ .../3-windings-transformers-map-data.json | 9 +++++ src/test/resources/all-map-data.json | 33 +++++++++++++++++++ src/test/resources/batteries-map-data.json | 2 ++ .../resources/dangling-lines-map-data.json | 2 ++ src/test/resources/generators-map-data.json | 1 + .../lcc-converter-stations-map-data.json | 2 ++ src/test/resources/lines-map-data.json | 6 ++++ src/test/resources/loads-map-data.json | 1 + ...tial-2-windings-transformers-map-data.json | 2 ++ src/test/resources/partial-all-map-data.json | 6 ++++ .../resources/partial-batteries-map-data.json | 1 + ...rtial-lcc-converter-stations-map-data.json | 2 ++ .../resources/partial-lines-map-data.json | 2 ++ .../resources/partial-loads-map-data.json | 1 + .../partial-shunt-compensators-map-data.json | 1 + ...tial-static-var-compensators-map-data.json | 2 ++ ...rtial-vsc-converter-stations-map-data.json | 1 + .../shunt-compensators-map-data.json | 2 ++ .../static-var-compensators-map-data.json | 2 ++ .../vsc-converter-stations-map-data.json | 2 ++ 32 files changed, 144 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gridsuite/network/map/NetworkMapService.java b/src/main/java/org/gridsuite/network/map/NetworkMapService.java index 52ac2537..39295f31 100644 --- a/src/main/java/org/gridsuite/network/map/NetworkMapService.java +++ b/src/main/java/org/gridsuite/network/map/NetworkMapService.java @@ -66,7 +66,9 @@ private static LineMapData toMapData(Line line) { .terminal1Connected(terminal1.isConnected()) .terminal2Connected(terminal2.isConnected()) .voltageLevelId1(terminal1.getVoltageLevel().getId()) - .voltageLevelId2(terminal2.getVoltageLevel().getId()); + .voltageLevelId2(terminal2.getVoltageLevel().getId()) + .nominalVoltage1(terminal1.getVoltageLevel().getNominalV()) + .nominalVoltage2(terminal2.getVoltageLevel().getNominalV()); if (!Double.isNaN(terminal1.getP())) { builder.p1(terminal1.getP()); } @@ -108,6 +110,7 @@ private static GeneratorMapData toMapData(Generator generator) { .id(generator.getId()) .terminalConnected(terminal.isConnected()) .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .targetP(generator.getTargetP()) .minP(generator.getMinP()) .maxP(generator.getMaxP()); @@ -130,6 +133,8 @@ private static TwoWindingsTransformerMapData toMapData(TwoWindingsTransformer tr .terminal2Connected(terminal2.isConnected()) .voltageLevelId1(terminal1.getVoltageLevel().getId()) .voltageLevelId2(terminal2.getVoltageLevel().getId()) + .nominalVoltage1(terminal1.getVoltageLevel().getNominalV()) + .nominalVoltage2(terminal2.getVoltageLevel().getNominalV()) .phaseTapChanger(toMapData(transformer.getPhaseTapChanger())) .ratioTapChanger(toMapData(transformer.getRatioTapChanger())); if (!Double.isNaN(terminal1.getP())) { @@ -193,7 +198,10 @@ private static ThreeWindingsTransformerMapData toMapData(ThreeWindingsTransforme .terminal3Connected(terminal3.isConnected()) .voltageLevelId1(terminal1.getVoltageLevel().getId()) .voltageLevelId2(terminal2.getVoltageLevel().getId()) - .voltageLevelId3(terminal3.getVoltageLevel().getId()); + .voltageLevelId3(terminal3.getVoltageLevel().getId()) + .nominalVoltage1(terminal1.getVoltageLevel().getNominalV()) + .nominalVoltage2(terminal2.getVoltageLevel().getNominalV()) + .nominalVoltage3(terminal3.getVoltageLevel().getNominalV()); if (!Double.isNaN(terminal1.getP())) { builder.p1(terminal1.getP()); } @@ -272,6 +280,7 @@ private static BatteryMapData toMapData(Battery battery) { .id(battery.getId()) .terminalConnected(terminal.isConnected()) .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .p0(battery.getP0()) .q0(battery.getQ0()); if (!Double.isNaN(terminal.getP())) { @@ -290,6 +299,7 @@ private static DanglingLineMapData toMapData(DanglingLine danglingLine) { .id(danglingLine.getId()) .terminalConnected(terminal.isConnected()) .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .ucteXnodeCode(danglingLine.getUcteXnodeCode()) .p0(danglingLine.getP0()) .q0(danglingLine.getQ0()); @@ -319,6 +329,7 @@ private static LccConverterStationMapData toMapData(LccConverterStation lccConve .name(lccConverterStation.getNameOrId()) .id(lccConverterStation.getId()) .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .terminalConnected(terminal.isConnected()) .lossFactor(lccConverterStation.getLossFactor()) .powerFactor(lccConverterStation.getPowerFactor()); @@ -340,6 +351,7 @@ private static VscConverterStationMapData toMapData(VscConverterStation vscConve .name(vscConverterStation.getNameOrId()) .id(vscConverterStation.getId()) .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .terminalConnected(terminal.isConnected()) .lossFactor(vscConverterStation.getLossFactor()); if (vscConverterStation.getHvdcLine() != null) { @@ -362,6 +374,7 @@ private static LoadMapData toMapData(Load load) { .type(load.getLoadType()) .terminalConnected(terminal.isConnected()) .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .p0(load.getP0()) .q0(load.getQ0()); if (!Double.isNaN(terminal.getP())) { @@ -379,7 +392,8 @@ private static ShuntCompensatorMapData toMapData(ShuntCompensator shuntCompensat .name(shuntCompensator.getNameOrId()) .id(shuntCompensator.getId()) .terminalConnected(terminal.isConnected()) - .voltageLevelId(terminal.getVoltageLevel().getId()); + .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()); if (!Double.isNaN(terminal.getQ())) { builder.q(terminal.getQ()); } @@ -399,6 +413,7 @@ private static StaticVarCompensatorMapData toMapData(StaticVarCompensator static .id(staticVarCompensator.getId()) .terminalConnected(terminal.isConnected()) .voltageLevelId(terminal.getVoltageLevel().getId()) + .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .regulationMode(staticVarCompensator.getRegulationMode()); if (!Double.isNaN(terminal.getP())) { builder.p(terminal.getP()); diff --git a/src/main/java/org/gridsuite/network/map/model/AbstractHvdcConverterStationMapData.java b/src/main/java/org/gridsuite/network/map/model/AbstractHvdcConverterStationMapData.java index 44bd5dac..b1515a3c 100644 --- a/src/main/java/org/gridsuite/network/map/model/AbstractHvdcConverterStationMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/AbstractHvdcConverterStationMapData.java @@ -29,6 +29,9 @@ public abstract class AbstractHvdcConverterStationMapData { private String hvdcLineId; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p; diff --git a/src/main/java/org/gridsuite/network/map/model/BatteryMapData.java b/src/main/java/org/gridsuite/network/map/model/BatteryMapData.java index 5ca52dc9..319ac291 100644 --- a/src/main/java/org/gridsuite/network/map/model/BatteryMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/BatteryMapData.java @@ -27,6 +27,9 @@ public class BatteryMapData { private Boolean terminalConnected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p0; diff --git a/src/main/java/org/gridsuite/network/map/model/DanglingLineMapData.java b/src/main/java/org/gridsuite/network/map/model/DanglingLineMapData.java index 81d651c9..bc144d24 100644 --- a/src/main/java/org/gridsuite/network/map/model/DanglingLineMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/DanglingLineMapData.java @@ -27,6 +27,9 @@ public class DanglingLineMapData { private Boolean terminalConnected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage; + @JsonInclude(JsonInclude.Include.NON_NULL) private String ucteXnodeCode; diff --git a/src/main/java/org/gridsuite/network/map/model/GeneratorMapData.java b/src/main/java/org/gridsuite/network/map/model/GeneratorMapData.java index 5e208535..15f42cbd 100644 --- a/src/main/java/org/gridsuite/network/map/model/GeneratorMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/GeneratorMapData.java @@ -27,6 +27,9 @@ public class GeneratorMapData { private Boolean terminalConnected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p; diff --git a/src/main/java/org/gridsuite/network/map/model/LineMapData.java b/src/main/java/org/gridsuite/network/map/model/LineMapData.java index 604b4dca..acaa6371 100644 --- a/src/main/java/org/gridsuite/network/map/model/LineMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/LineMapData.java @@ -32,6 +32,12 @@ public class LineMapData { private Boolean terminal2Connected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage1; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p1; diff --git a/src/main/java/org/gridsuite/network/map/model/LoadMapData.java b/src/main/java/org/gridsuite/network/map/model/LoadMapData.java index e469dd29..4976c5ab 100644 --- a/src/main/java/org/gridsuite/network/map/model/LoadMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/LoadMapData.java @@ -30,6 +30,9 @@ public class LoadMapData { private Boolean terminalConnected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p; diff --git a/src/main/java/org/gridsuite/network/map/model/ShuntCompensatorMapData.java b/src/main/java/org/gridsuite/network/map/model/ShuntCompensatorMapData.java index 17dbc975..27310c2f 100644 --- a/src/main/java/org/gridsuite/network/map/model/ShuntCompensatorMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/ShuntCompensatorMapData.java @@ -27,6 +27,9 @@ public class ShuntCompensatorMapData { private Boolean terminalConnected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double q; diff --git a/src/main/java/org/gridsuite/network/map/model/StaticVarCompensatorMapData.java b/src/main/java/org/gridsuite/network/map/model/StaticVarCompensatorMapData.java index 4ce7dbe6..c8e5f165 100644 --- a/src/main/java/org/gridsuite/network/map/model/StaticVarCompensatorMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/StaticVarCompensatorMapData.java @@ -30,6 +30,9 @@ public class StaticVarCompensatorMapData { private StaticVarCompensator.RegulationMode regulationMode; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p; diff --git a/src/main/java/org/gridsuite/network/map/model/ThreeWindingsTransformerMapData.java b/src/main/java/org/gridsuite/network/map/model/ThreeWindingsTransformerMapData.java index 091ea3b0..4aaaa7f1 100644 --- a/src/main/java/org/gridsuite/network/map/model/ThreeWindingsTransformerMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/ThreeWindingsTransformerMapData.java @@ -35,6 +35,15 @@ public class ThreeWindingsTransformerMapData { private Boolean terminal3Connected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage1; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage2; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage3; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p1; diff --git a/src/main/java/org/gridsuite/network/map/model/TwoWindingsTransformerMapData.java b/src/main/java/org/gridsuite/network/map/model/TwoWindingsTransformerMapData.java index b18db0df..082903ff 100644 --- a/src/main/java/org/gridsuite/network/map/model/TwoWindingsTransformerMapData.java +++ b/src/main/java/org/gridsuite/network/map/model/TwoWindingsTransformerMapData.java @@ -31,6 +31,12 @@ public class TwoWindingsTransformerMapData { private Boolean terminal2Connected; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage1; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private Double nominalVoltage2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double p1; diff --git a/src/test/resources/2-windings-transformers-map-data.json b/src/test/resources/2-windings-transformers-map-data.json index a7a19aad..e80b573f 100644 --- a/src/test/resources/2-windings-transformers-map-data.json +++ b/src/test/resources/2-windings-transformers-map-data.json @@ -3,6 +3,8 @@ "id": "NGEN_NHV1", "voltageLevelId1": "VLGEN", "voltageLevelId2": "VLHV1", + "nominalVoltage1": 24.0, + "nominalVoltage2": 380.0, "name": "NGEN_NHV1", "terminal1Connected": true, "terminal2Connected": true, @@ -22,6 +24,8 @@ "id": "NHV2_NLOAD", "voltageLevelId1": "VLHV2", "voltageLevelId2": "VLLOAD", + "nominalVoltage1": 380.0, + "nominalVoltage2": 150.0, "name": "NHV2_NLOAD", "terminal1Connected": true, "terminal2Connected": true, diff --git a/src/test/resources/3-windings-transformers-map-data.json b/src/test/resources/3-windings-transformers-map-data.json index 7ecdd2f0..0a6f871b 100644 --- a/src/test/resources/3-windings-transformers-map-data.json +++ b/src/test/resources/3-windings-transformers-map-data.json @@ -4,6 +4,9 @@ "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLNEW2", "voltageLevelId3": "VLGEN", + "nominalVoltage1": 380.0, + "nominalVoltage2": 225.0, + "nominalVoltage3": 24.0, "name": "TWT", "terminal1Connected": true, "terminal2Connected": true, @@ -32,6 +35,9 @@ "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLNEW2", "voltageLevelId3": "VLGEN", + "nominalVoltage1": 380.0, + "nominalVoltage2": 225.0, + "nominalVoltage3": 24.0, "name": "TWT21", "terminal1Connected": true, "terminal2Connected": true, @@ -60,6 +66,9 @@ "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLNEW2", "voltageLevelId3": "VLGEN", + "nominalVoltage1": 380.0, + "nominalVoltage2": 225.0, + "nominalVoltage3": 24.0, "name": "TWT32", "terminal1Connected": true, "terminal2Connected": true, diff --git a/src/test/resources/all-map-data.json b/src/test/resources/all-map-data.json index 07c0daf1..25c764c8 100644 --- a/src/test/resources/all-map-data.json +++ b/src/test/resources/all-map-data.json @@ -56,6 +56,8 @@ "id": "NHV1_NHV2_1", "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLHV2", + "nominalVoltage1": 380.0, + "nominalVoltage2": 380.0, "name": "NHV1_NHV2_1", "terminal1Connected": true, "terminal2Connected": true, @@ -70,6 +72,8 @@ "id": "NHV1_NHV2_2", "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLHV2", + "nominalVoltage1": 380.0, + "nominalVoltage2": 380.0, "name": "NHV1_NHV2_2", "terminal1Connected": true, "terminal2Connected": true @@ -78,6 +82,8 @@ "id": "LINE3", "voltageLevelId1": "VLGEN", "voltageLevelId2": "VLGEN3", + "nominalVoltage1": 24.0, + "nominalVoltage2": 24.0, "name": "LINE3", "terminal1Connected": true, "terminal2Connected": true, @@ -89,6 +95,8 @@ "id": "NGEN_NHV1", "voltageLevelId1": "VLGEN", "voltageLevelId2": "VLHV1", + "nominalVoltage1": 24.0, + "nominalVoltage2": 380.0, "name": "NGEN_NHV1", "terminal1Connected": true, "terminal2Connected": true, @@ -108,6 +116,8 @@ "id": "NHV2_NLOAD", "voltageLevelId1": "VLHV2", "voltageLevelId2": "VLLOAD", + "nominalVoltage1": 380.0, + "nominalVoltage2": 150.0, "name": "NHV2_NLOAD", "terminal1Connected": true, "terminal2Connected": true, @@ -130,6 +140,9 @@ "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLNEW2", "voltageLevelId3": "VLGEN", + "nominalVoltage1": 380.0, + "nominalVoltage2": 225.0, + "nominalVoltage3": 24.0, "name": "TWT", "terminal1Connected": true, "terminal2Connected": true, @@ -158,6 +171,9 @@ "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLNEW2", "voltageLevelId3": "VLGEN", + "nominalVoltage1": 380.0, + "nominalVoltage2": 225.0, + "nominalVoltage3": 24.0, "name": "TWT21", "terminal1Connected": true, "terminal2Connected": true, @@ -186,6 +202,9 @@ "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLNEW2", "voltageLevelId3": "VLGEN", + "nominalVoltage1": 380.0, + "nominalVoltage2": 225.0, + "nominalVoltage3": 24.0, "name": "TWT32", "terminal1Connected": true, "terminal2Connected": true, @@ -215,6 +234,7 @@ "id": "GEN", "name": "GEN", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "p": 25.0, "q": 32.0, @@ -228,6 +248,7 @@ "id": "BATTERY1", "name": "BATTERY1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": false, "p": 50.0, "q": 70.0, @@ -238,6 +259,7 @@ "id": "BATTERY2", "name": "BATTERY2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": false, "p0": 1.0, "q0": 1.0 @@ -247,6 +269,7 @@ { "id": "DL1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "name": "DL1", "terminalConnected": true, "ucteXnodeCode": "xnode1", @@ -258,6 +281,7 @@ { "id": "DL2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "name": "DL2", "terminalConnected": true, "ucteXnodeCode": "xnode1", @@ -280,6 +304,7 @@ "id": "LCC1", "name": "LCC1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "hvdcLineId": null, "powerFactor": 0.5, @@ -289,6 +314,7 @@ "id": "LCC2", "name": "LCC2", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 110.0, @@ -303,6 +329,7 @@ "name": "LOAD", "type": "UNDEFINED", "voltageLevelId": "VLLOAD", + "nominalVoltage": 150.0, "terminalConnected": true, "p0": 600.0, "q0": 200.0 @@ -313,6 +340,7 @@ "id": "SHUNT1", "name": "SHUNT1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "q": 90.0, "targetV": 225.0, @@ -322,6 +350,7 @@ "id": "SHUNT2", "name": "SHUNT2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": true, "targetV": 225.0, "targetDeadband": 10.0 @@ -332,6 +361,7 @@ "id": "SVC1", "name": "SVC1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "regulationMode": "VOLTAGE", "p": 120.0, @@ -343,6 +373,7 @@ "id": "SVC2", "name": "SVC2", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "regulationMode": "VOLTAGE", "voltageSetpoint": 200.0, @@ -354,6 +385,7 @@ "id": "VSC1", "name": "VSC1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 10.0, @@ -364,6 +396,7 @@ "id": "VSC2", "name": "VSC2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": true, "hvdcLineId": null, "lossFactor": 1.0 diff --git a/src/test/resources/batteries-map-data.json b/src/test/resources/batteries-map-data.json index f3f51cde..e385dba0 100644 --- a/src/test/resources/batteries-map-data.json +++ b/src/test/resources/batteries-map-data.json @@ -3,6 +3,7 @@ "id": "BATTERY1", "name": "BATTERY1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": false, "p": 50.0, "q": 70.0, @@ -13,6 +14,7 @@ "id": "BATTERY2", "name": "BATTERY2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": false, "p0": 1.0, "q0": 1.0 diff --git a/src/test/resources/dangling-lines-map-data.json b/src/test/resources/dangling-lines-map-data.json index 838e1323..c1e930a6 100644 --- a/src/test/resources/dangling-lines-map-data.json +++ b/src/test/resources/dangling-lines-map-data.json @@ -2,6 +2,7 @@ { "id": "DL1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "name": "DL1", "terminalConnected": true, "ucteXnodeCode": "xnode1", @@ -13,6 +14,7 @@ { "id": "DL2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "name": "DL2", "terminalConnected": true, "ucteXnodeCode": "xnode1", diff --git a/src/test/resources/generators-map-data.json b/src/test/resources/generators-map-data.json index 9a82bcc8..ad7bd330 100644 --- a/src/test/resources/generators-map-data.json +++ b/src/test/resources/generators-map-data.json @@ -3,6 +3,7 @@ "id": "GEN", "name": "GEN", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "p": 25, "q": 32, diff --git a/src/test/resources/lcc-converter-stations-map-data.json b/src/test/resources/lcc-converter-stations-map-data.json index ba42e303..c875808a 100644 --- a/src/test/resources/lcc-converter-stations-map-data.json +++ b/src/test/resources/lcc-converter-stations-map-data.json @@ -3,6 +3,7 @@ "id": "LCC1", "name": "LCC1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "hvdcLineId": null, "powerFactor": 0.5, @@ -12,6 +13,7 @@ "id": "LCC2", "name": "LCC2", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 110.0, diff --git a/src/test/resources/lines-map-data.json b/src/test/resources/lines-map-data.json index 30d87be2..ce672cb8 100644 --- a/src/test/resources/lines-map-data.json +++ b/src/test/resources/lines-map-data.json @@ -3,6 +3,8 @@ "id": "NHV1_NHV2_1", "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLHV2", + "nominalVoltage1": 380.0, + "nominalVoltage2": 380.0, "name": "NHV1_NHV2_1", "terminal1Connected": true, "terminal2Connected": true, @@ -17,6 +19,8 @@ "id": "NHV1_NHV2_2", "voltageLevelId1": "VLHV1", "voltageLevelId2": "VLHV2", + "nominalVoltage1": 380.0, + "nominalVoltage2": 380.0, "name": "NHV1_NHV2_2", "terminal1Connected": true, "terminal2Connected": true @@ -25,6 +29,8 @@ "id": "LINE3", "voltageLevelId1": "VLGEN", "voltageLevelId2": "VLGEN3", + "nominalVoltage1": 24.0, + "nominalVoltage2": 24.0, "name": "LINE3", "terminal1Connected": true, "terminal2Connected": true, diff --git a/src/test/resources/loads-map-data.json b/src/test/resources/loads-map-data.json index 92164c31..c9df2b56 100644 --- a/src/test/resources/loads-map-data.json +++ b/src/test/resources/loads-map-data.json @@ -4,6 +4,7 @@ "name": "LOAD", "type": "UNDEFINED", "voltageLevelId": "VLLOAD", + "nominalVoltage": 150.0, "terminalConnected": true, "p0": 600.0, "q0": 200.0 diff --git a/src/test/resources/partial-2-windings-transformers-map-data.json b/src/test/resources/partial-2-windings-transformers-map-data.json index 5b44a145..9fabddfe 100644 --- a/src/test/resources/partial-2-windings-transformers-map-data.json +++ b/src/test/resources/partial-2-windings-transformers-map-data.json @@ -3,6 +3,8 @@ "id": "NGEN_NHV1", "voltageLevelId1": "VLGEN", "voltageLevelId2": "VLHV1", + "nominalVoltage1": 24.0, + "nominalVoltage2": 380.0, "name": "NGEN_NHV1", "terminal1Connected": true, "terminal2Connected": true, diff --git a/src/test/resources/partial-all-map-data.json b/src/test/resources/partial-all-map-data.json index e4d69128..2de60b95 100644 --- a/src/test/resources/partial-all-map-data.json +++ b/src/test/resources/partial-all-map-data.json @@ -18,6 +18,8 @@ "id": "LINE3", "voltageLevelId1": "VLGEN", "voltageLevelId2": "VLGEN3", + "nominalVoltage1": 24.0, + "nominalVoltage2": 24.0, "name": "LINE3", "terminal1Connected": true, "terminal2Connected": true, @@ -32,6 +34,7 @@ "id": "BATTERY2", "name": "BATTERY2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": false, "p0": 1.0, "q0": 1.0 @@ -41,6 +44,7 @@ { "id": "DL2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "name": "DL2", "terminalConnected": true, "ucteXnodeCode": "xnode1", @@ -56,6 +60,7 @@ "id": "SHUNT2", "name": "SHUNT2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": true, "targetV": 225.0, "targetDeadband": 10.0 @@ -67,6 +72,7 @@ "id": "VSC2", "name": "VSC2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": true, "hvdcLineId": null, "lossFactor": 1.0 diff --git a/src/test/resources/partial-batteries-map-data.json b/src/test/resources/partial-batteries-map-data.json index 88ebf628..fe4f7f1f 100644 --- a/src/test/resources/partial-batteries-map-data.json +++ b/src/test/resources/partial-batteries-map-data.json @@ -3,6 +3,7 @@ "id": "BATTERY1", "name": "BATTERY1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": false, "p": 50.0, "q": 70.0, diff --git a/src/test/resources/partial-lcc-converter-stations-map-data.json b/src/test/resources/partial-lcc-converter-stations-map-data.json index ba42e303..c875808a 100644 --- a/src/test/resources/partial-lcc-converter-stations-map-data.json +++ b/src/test/resources/partial-lcc-converter-stations-map-data.json @@ -3,6 +3,7 @@ "id": "LCC1", "name": "LCC1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "hvdcLineId": null, "powerFactor": 0.5, @@ -12,6 +13,7 @@ "id": "LCC2", "name": "LCC2", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 110.0, diff --git a/src/test/resources/partial-lines-map-data.json b/src/test/resources/partial-lines-map-data.json index 74d7cfef..8e410219 100644 --- a/src/test/resources/partial-lines-map-data.json +++ b/src/test/resources/partial-lines-map-data.json @@ -3,6 +3,8 @@ "id": "LINE3", "voltageLevelId1": "VLGEN", "voltageLevelId2": "VLGEN3", + "nominalVoltage1": 24.0, + "nominalVoltage2": 24.0, "name": "LINE3", "terminal1Connected": true, "terminal2Connected": true, diff --git a/src/test/resources/partial-loads-map-data.json b/src/test/resources/partial-loads-map-data.json index 92164c31..c9df2b56 100644 --- a/src/test/resources/partial-loads-map-data.json +++ b/src/test/resources/partial-loads-map-data.json @@ -4,6 +4,7 @@ "name": "LOAD", "type": "UNDEFINED", "voltageLevelId": "VLLOAD", + "nominalVoltage": 150.0, "terminalConnected": true, "p0": 600.0, "q0": 200.0 diff --git a/src/test/resources/partial-shunt-compensators-map-data.json b/src/test/resources/partial-shunt-compensators-map-data.json index acd750e0..8eb4c73a 100644 --- a/src/test/resources/partial-shunt-compensators-map-data.json +++ b/src/test/resources/partial-shunt-compensators-map-data.json @@ -3,6 +3,7 @@ "id": "SHUNT1", "name": "SHUNT1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "q": 90.0, "targetV": 225.0, diff --git a/src/test/resources/partial-static-var-compensators-map-data.json b/src/test/resources/partial-static-var-compensators-map-data.json index c3eb46d3..23d0df69 100644 --- a/src/test/resources/partial-static-var-compensators-map-data.json +++ b/src/test/resources/partial-static-var-compensators-map-data.json @@ -3,6 +3,7 @@ "id": "SVC1", "name": "SVC1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "regulationMode": "VOLTAGE", "p": 120.0, @@ -14,6 +15,7 @@ "id": "SVC2", "name": "SVC2", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "regulationMode": "VOLTAGE", "voltageSetpoint": 200.0, diff --git a/src/test/resources/partial-vsc-converter-stations-map-data.json b/src/test/resources/partial-vsc-converter-stations-map-data.json index 75f5ef4e..9c647d2f 100644 --- a/src/test/resources/partial-vsc-converter-stations-map-data.json +++ b/src/test/resources/partial-vsc-converter-stations-map-data.json @@ -3,6 +3,7 @@ "id": "VSC1", "name": "VSC1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 10.0, diff --git a/src/test/resources/shunt-compensators-map-data.json b/src/test/resources/shunt-compensators-map-data.json index 4d5b3510..3689bbf6 100644 --- a/src/test/resources/shunt-compensators-map-data.json +++ b/src/test/resources/shunt-compensators-map-data.json @@ -3,6 +3,7 @@ "id": "SHUNT1", "name": "SHUNT1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "q": 90.0, "targetV": 225.0, @@ -12,6 +13,7 @@ "id": "SHUNT2", "name": "SHUNT2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": true, "targetV": 225.0, "targetDeadband": 10.0 diff --git a/src/test/resources/static-var-compensators-map-data.json b/src/test/resources/static-var-compensators-map-data.json index c3eb46d3..23d0df69 100644 --- a/src/test/resources/static-var-compensators-map-data.json +++ b/src/test/resources/static-var-compensators-map-data.json @@ -3,6 +3,7 @@ "id": "SVC1", "name": "SVC1", "voltageLevelId": "VLGEN", + "nominalVoltage": 24.0, "terminalConnected": true, "regulationMode": "VOLTAGE", "p": 120.0, @@ -14,6 +15,7 @@ "id": "SVC2", "name": "SVC2", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "regulationMode": "VOLTAGE", "voltageSetpoint": 200.0, diff --git a/src/test/resources/vsc-converter-stations-map-data.json b/src/test/resources/vsc-converter-stations-map-data.json index 5f20e437..724e981c 100644 --- a/src/test/resources/vsc-converter-stations-map-data.json +++ b/src/test/resources/vsc-converter-stations-map-data.json @@ -3,6 +3,7 @@ "id": "VSC1", "name": "VSC1", "voltageLevelId": "VLNEW2", + "nominalVoltage": 225.0, "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 10.0, @@ -13,6 +14,7 @@ "id": "VSC2", "name": "VSC2", "voltageLevelId": "VLGEN3", + "nominalVoltage": 24.0, "terminalConnected": true, "hvdcLineId": null, "lossFactor": 1.0