Skip to content

Commit fb50ce2

Browse files
samirromdhanisamirromdhani
committed
perf: up to date with iidm v1.17
Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>
1 parent 9f46798 commit fb50ce2

File tree

64 files changed

+1284
-1451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1284
-1451
lines changed

‎entsoe-util/src/test/resources/entsoeAreaRef.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_17" xmlns:ea="http://www.itesla_project.eu/schema/iidm/ext/entsoe_area/1_0" id="test" caseDate="2016-06-27T12:27:58.535+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
32
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_17" xmlns:ea="http://www.itesla_project.eu/schema/iidm/ext/entsoe_area/1_0" id="test" caseDate="2016-06-27T12:27:58.535+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
43
<iidm:substation id="S" country="FR"/>
54
<iidm:extension id="S">

‎iidm/iidm-serde/src/test/resources/V1_17/VscRoundTripRef.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<iidm:busBreakerTopology>
66
<iidm:bus id="B1"/>
77
</iidm:busBreakerTopology>
8-
<iidm:vscConverterStation id="C1" name="Converter1" lossFactor="1.1" voltageRegulatorOn="true" voltageSetpoint="405.0" bus="B1" connectableBus="B1" p="100.0" q="50.0" >
8+
<iidm:vscConverterStation id="C1" name="Converter1" voltageRegulatorOn="true" lossFactor="1.1" voltageSetpoint="405.0" bus="B1" connectableBus="B1" p="100.0" q="50.0">
99
<iidm:reactiveCapabilityCurve>
1010
<iidm:point p="5.0" minQ="0.0" maxQ="10.0"/>
1111
<iidm:point p="10.0" minQ="0.0" maxQ="10.0"/>
@@ -20,7 +20,7 @@
2020
<iidm:switch id="DISC_BBS1_BK1" name="Disconnector" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="1"/>
2121
<iidm:switch id="BK1" name="Breaker" kind="BREAKER" retained="true" open="false" node1="1" node2="2"/>
2222
</iidm:nodeBreakerTopology>
23-
<iidm:vscConverterStation id="C2" name="Converter2" lossFactor="1.1" voltageRegulatorOn="false" reactivePowerSetpoint="123.0" node="2">
23+
<iidm:vscConverterStation id="C2" name="Converter2" voltageRegulatorOn="false" lossFactor="1.1" reactivePowerSetpoint="123.0" node="2">
2424
<iidm:minMaxReactiveLimits minQ="0.0" maxQ="10.0"/>
2525
<iidm:regulatingTerminal id="C1"/>
2626
</iidm:vscConverterStation>

‎iidm/iidm-serde/src/test/resources/V1_17/activePowerControlRoundTripRef.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NBAT" connectableBus="NBAT"/>
2828
</iidm:voltageLevel>
2929
</iidm:substation>
30-
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NBAT" connectableBus2="NBAT" voltageLevelId2="VLBAT"/>
31-
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NBAT" connectableBus2="NBAT" voltageLevelId2="VLBAT"/>
30+
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLBAT" bus2="NBAT" connectableBus2="NBAT"/>
31+
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLBAT" bus2="NBAT" connectableBus2="NBAT"/>
3232
<iidm:extension id="GEN">
3333
<apc:activePowerControl participate="false" droop="3.0" participationFactor="1.0"/>
3434
</iidm:extension>

‎iidm/iidm-serde/src/test/resources/V1_17/activePowerControlWithLimitRoundTripRef.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NBAT" connectableBus="NBAT"/>
2828
</iidm:voltageLevel>
2929
</iidm:substation>
30-
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NBAT" connectableBus2="NBAT" voltageLevelId2="VLBAT"/>
31-
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NBAT" connectableBus2="NBAT" voltageLevelId2="VLBAT"/>
30+
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLBAT" bus2="NBAT" connectableBus2="NBAT"/>
31+
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLBAT" bus2="NBAT" connectableBus2="NBAT"/>
3232
<iidm:extension id="GEN">
3333
<apc:activePowerControl participate="false" droop="3.0" participationFactor="1.0" maxTargetP="800.0"/>
3434
</iidm:extension>
3535
<iidm:extension id="BAT">
3636
<apc:activePowerControl participate="true" droop="4.0" participationFactor="1.2" minTargetP="10.0"/>
3737
</iidm:extension>
38-
</iidm:network>
38+
</iidm:network>

‎iidm/iidm-serde/src/test/resources/V1_17/batteryRoundTripRef.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_17" id="fictitious" caseDate="2017-06-25T17:43:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
3-
<iidm:substation id="P1" country="FR" geographicalTags="A" tso="R">
3+
<iidm:substation id="P1" country="FR" tso="R" geographicalTags="A">
44
<iidm:voltageLevel id="VLGEN" nominalV="400.0" topologyKind="BUS_BREAKER">
55
<iidm:busBreakerTopology>
66
<iidm:bus id="NGEN"/>
@@ -10,7 +10,7 @@
1010
</iidm:generator>
1111
</iidm:voltageLevel>
1212
</iidm:substation>
13-
<iidm:substation id="P2" country="FR" geographicalTags="B" tso="R">
13+
<iidm:substation id="P2" country="FR" tso="R" geographicalTags="B">
1414
<iidm:voltageLevel id="VLBAT" nominalV="400.0" topologyKind="BUS_BREAKER">
1515
<iidm:busBreakerTopology>
1616
<iidm:bus id="NBAT"/>
@@ -27,6 +27,6 @@
2727
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NBAT" connectableBus="NBAT"/>
2828
</iidm:voltageLevel>
2929
</iidm:substation>
30-
<iidm:line id="NHV1_NHV2_1" voltageLevelId1="VLGEN" voltageLevelId2="VLBAT" bus1="NGEN" connectableBus1="NGEN" bus2="NBAT" connectableBus2="NBAT" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4"/>
31-
<iidm:line id="NHV1_NHV2_2" voltageLevelId1="VLGEN" voltageLevelId2="VLBAT" bus1="NGEN" connectableBus1="NGEN" bus2="NBAT" connectableBus2="NBAT" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4"/>
30+
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLBAT" bus2="NBAT" connectableBus2="NBAT"/>
31+
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLBAT" bus2="NBAT" connectableBus2="NBAT"/>
3232
</iidm:network>

‎iidm/iidm-serde/src/test/resources/V1_17/bl-loading-limits.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_17" id="boundary-line"
3-
caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test"
4-
minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_17" id="boundary-line" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
53
<iidm:substation id="S" country="FR">
6-
<iidm:voltageLevel id="VL" nominalV="100.0" lowVoltageLimit="80.0" highVoltageLimit="120.0"
7-
topologyKind="BUS_BREAKER">
4+
<iidm:voltageLevel id="VL" nominalV="100.0" lowVoltageLimit="80.0" highVoltageLimit="120.0" topologyKind="BUS_BREAKER">
85
<iidm:busBreakerTopology>
96
<iidm:bus id="BUS"/>
107
</iidm:busBreakerTopology>
11-
<iidm:generator id="G" energySource="OTHER" minP="0.0" maxP="100.0" voltageRegulatorOn="true" targetP="50.0"
12-
targetV="100.0" targetQ="30.0" bus="BUS" connectableBus="BUS">
8+
<iidm:generator id="G" energySource="OTHER" minP="0.0" maxP="100.0" voltageRegulatorOn="true" targetP="50.0" targetV="100.0" targetQ="30.0" bus="BUS" connectableBus="BUS">
139
<iidm:minMaxReactiveLimits minQ="-1.7976931348623157E308" maxQ="1.7976931348623157E308"/>
1410
</iidm:generator>
15-
<iidm:boundaryLine id="BL" p0="50.0" q0="30.0" r="10.0" x="1.0" g="1.0E-4" b="1.0E-5" bus="BUS"
16-
connectableBus="BUS" selectedOperationalLimitsGroupIds="DEFAULT">
11+
<iidm:boundaryLine id="BL" p0="50.0" q0="30.0" r="10.0" x="1.0" g="1.0E-4" b="1.0E-5" bus="BUS" connectableBus="BUS" selectedOperationalLimitsGroupIds="DEFAULT">
1712
<iidm:operationalLimitsGroup id="DEFAULT">
1813
<iidm:activePowerLimits permanentLimit="350.0">
1914
<iidm:temporaryLimit name="20'" acceptableDuration="1200" value="370.0"/>

‎iidm/iidm-serde/src/test/resources/V1_17/boundaryLine.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</iidm:busBreakerTopology>
1515
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NLOAD" connectableBus="NLOAD" p="600.0" q="200.0"/>
1616
</iidm:voltageLevel>
17-
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.3769836425781" p2="-600.0" q2="-200.0">
18-
<iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" loadTapChangingCapabilities="true" regulating="true" regulationMode="VOLTAGE" regulationValue="158.0" targetDeadband="0.0">
17+
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" voltageLevelId1="VLHV2" bus1="NHV2" connectableBus1="NHV2" voltageLevelId2="VLLOAD" bus2="NLOAD" connectableBus2="NLOAD" p1="600.8677978515625" q1="274.3769836425781" p2="-600.0" q2="-200.0">
18+
<iidm:ratioTapChanger regulating="true" lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulationMode="VOLTAGE" regulationValue="158.0">
1919
<iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
2020
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="0.8505666905244191"/>
2121
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.0006666666666666"/>

‎iidm/iidm-serde/src/test/resources/V1_17/boundaryLineWithGeneration.xml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_17" id="boundary-line"
3-
caseDate="2020-07-16T10:08:48.321+02:00" forecastDistance="0" sourceFormat="test"
4-
minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_17" id="boundary-line" caseDate="2020-07-16T10:08:48.321+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
53
<iidm:substation id="S" country="FR">
6-
<iidm:voltageLevel id="VL" nominalV="100.0" lowVoltageLimit="80.0" highVoltageLimit="120.0"
7-
topologyKind="BUS_BREAKER">
4+
<iidm:voltageLevel id="VL" nominalV="100.0" lowVoltageLimit="80.0" highVoltageLimit="120.0" topologyKind="BUS_BREAKER">
85
<iidm:busBreakerTopology>
96
<iidm:bus id="BUS"/>
107
</iidm:busBreakerTopology>
11-
<iidm:generator id="G" energySource="OTHER" minP="0.0" maxP="100.0" voltageRegulatorOn="true" targetP="50.0"
12-
targetV="100.0" targetQ="30.0" bus="BUS" connectableBus="BUS">
8+
<iidm:generator id="G" energySource="OTHER" minP="0.0" maxP="100.0" voltageRegulatorOn="true" targetP="50.0" targetV="100.0" targetQ="30.0" bus="BUS" connectableBus="BUS">
139
<iidm:minMaxReactiveLimits minQ="-1.7976931348623157E308" maxQ="1.7976931348623157E308"/>
1410
</iidm:generator>
15-
<iidm:boundaryLine id="BL" p0="50.0" q0="30.0" r="10.0" x="1.0" g="1.0E-4" b="1.0E-5" generationMinP="0.0"
16-
generationMaxP="900.0" generationVoltageRegulationOn="true" generationTargetP="440.0"
17-
generationTargetV="101.0" bus="BUS" connectableBus="BUS" selectedOperationalLimitsGroupIds="DEFAULT">
11+
<iidm:boundaryLine id="BL" p0="50.0" q0="30.0" r="10.0" x="1.0" g="1.0E-4" b="1.0E-5" generationVoltageRegulationOn="true" generationMinP="0.0" generationMaxP="900.0" generationTargetP="440.0" generationTargetV="101.0" bus="BUS" connectableBus="BUS" selectedOperationalLimitsGroupIds="DEFAULT">
1812
<iidm:property name="test" value="test"/>
1913
<iidm:reactiveCapabilityCurve>
2014
<iidm:point p="0.0" minQ="-59.3" maxQ="60.0"/>

‎iidm/iidm-serde/src/test/resources/V1_17/branchObservabilityRoundTripRef.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<iidm:bus id="NHV1"/>
1515
</iidm:busBreakerTopology>
1616
</iidm:voltageLevel>
17-
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
17+
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLHV1" bus2="NHV1" connectableBus2="NHV1"/>
1818
</iidm:substation>
1919
<iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
2020
<iidm:voltageLevel id="VLHV2" nominalV="380.0" topologyKind="BUS_BREAKER">
@@ -28,19 +28,19 @@
2828
</iidm:busBreakerTopology>
2929
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NLOAD" connectableBus="NLOAD"/>
3030
</iidm:voltageLevel>
31-
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
32-
<iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulating="true" regulationMode="VOLTAGE" regulationValue="158.0">
31+
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" voltageLevelId1="VLHV2" bus1="NHV2" connectableBus1="NHV2" voltageLevelId2="VLLOAD" bus2="NLOAD" connectableBus2="NLOAD">
32+
<iidm:ratioTapChanger regulating="true" lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulationMode="VOLTAGE" regulationValue="158.0">
3333
<iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
3434
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="0.8505666905244191"/>
3535
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.0006666666666666"/>
3636
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.150766642808914"/>
3737
</iidm:ratioTapChanger>
3838
</iidm:twoWindingsTransformer>
3939
</iidm:substation>
40-
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
41-
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
40+
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLHV1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId2="VLHV2" bus2="NHV2" connectableBus2="NHV2"/>
41+
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLHV1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId2="VLHV2" bus2="NHV2" connectableBus2="NHV2"/>
4242
<iidm:extension id="NGEN_NHV1">
43-
<bo:branchObservability observable="true"></bo:branchObservability>
43+
<bo:branchObservability observable="true"/>
4444
</iidm:extension>
4545
<iidm:extension id="NHV1_NHV2_1">
4646
<bo:branchObservability observable="true">

0 commit comments

Comments
 (0)