diff --git a/ampl-converter/src/test/resources/inputs/eurostag-tutorial-example1-branches-tl.txt b/ampl-converter/src/test/resources/inputs/eurostag-tutorial-example1-branches-tl.txt index c0e3b56702d..664c7b14587 100644 --- a/ampl-converter/src/test/resources/inputs/eurostag-tutorial-example1-branches-tl.txt +++ b/ampl-converter/src/test/resources/inputs/eurostag-tutorial-example1-branches-tl.txt @@ -2,7 +2,7 @@ #"variant" "num" "bus1" "bus2" "3wt num" "sub.1" "sub.2" "r (pu)" "x (pu)" "g1 (pu)" "g2 (pu)" "b1 (pu)" "b2 (pu)" "cst ratio (pu)" "ratio tc" "phase tc" "p1 (MW)" "p2 (MW)" "q1 (MVar)" "q2 (MVar)" "patl1 (A)" "patl2 (A)" "merged" "fault" "curative" "id" "description" 1 2 2 5 -1 2 5 0.00103878 0.0138504 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 302.444 -301.316 98.7403 -116.525 100.000 -99999.0 false 0 0 "NHV1_XNODE1" "NHV1_XNODE1" 1 3 5 3 -1 5 3 0.00103878 0.00900277 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 301.782 -300.434 116.442 -137.188 -99999.0 100.000 false 0 0 "XNODE1_NHV2" "XNODE1_NHV2" -1 5 2 6 -1 2 6 0.00103878 0.0138504 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 302.444 -301.316 98.7403 -116.525 100.000 -99999.0 false 0 0 "NVH1_XNODE2" "NVH1_XNODE2" +1 5 2 6 -1 2 6 0.00103878 0.0138504 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 302.444 -301.316 98.7403 -116.525 100.000 -99999.0 false 0 0 "NHV1_XNODE2" "NHV1_XNODE2" 1 6 6 3 -1 6 3 0.00103878 0.00900277 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 301.782 -300.434 116.442 -137.188 -99999.0 100.000 false 0 0 "XNODE2_NHV2" "XNODE2_NHV2" 1 7 1 2 -1 1 2 0.000184615 0.00769009 0.00000 0.00000 0.00000 0.00000 1.05263 -1 -1 605.558 -604.891 225.283 -197.480 -99999.0 -99999.0 false 0 0 "NGEN_NHV1" "NGEN_NHV1" 1 8 3 4 -1 3 4 0.000210000 0.0179988 0.00000 0.00000 0.00000 0.00000 1.00067 1 -1 600.868 -600.000 274.377 -200.000 -99999.0 -99999.0 false 0 0 "NHV2_NLOAD" "NHV2_NLOAD" diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml index ed3e658768b..9a4f2d0fc68 100644 --- a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml +++ b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml index 21f973621ae..d654a5f5765 100644 --- a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml +++ b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml @@ -14,7 +14,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml b/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml index 216e721b49a..0f3fadb8137 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml @@ -55,7 +55,7 @@ XNODE2 + NHV1_XNODE2 XNODE2_NHV2 - NVH1_XNODE2 diff --git a/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/TieLineReductionTest.java b/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/TieLineReductionTest.java index 52646c96365..564494dad0e 100644 --- a/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/TieLineReductionTest.java +++ b/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/TieLineReductionTest.java @@ -41,7 +41,7 @@ void testOneSideTieLineReduction() { assertEquals(0, observer.getTieLineRemovedCount()); reducer.reduce(network); assertEquals(2, observer.getTieLineRemovedCount()); - assertEquals(List.of("P1", "P2", "VLGEN", "LOAD", "NGEN", "NGEN_NHV1", "NHV2_NLOAD", "sim1", "VLLOAD", "NHV1", "GEN", "VLHV1", "NHV1_XNODE1", "NLOAD", "NVH1_XNODE2"), + assertEquals(List.of("P1", "P2", "VLGEN", "LOAD", "NGEN", "NGEN_NHV1", "NHV2_NLOAD", "sim1", "VLLOAD", "NHV1", "GEN", "VLHV1", "NHV1_XNODE2", "NHV1_XNODE1", "NLOAD"), network.getIdentifiables().stream().map(Identifiable::getId).toList()); } diff --git a/iidm/iidm-serde/src/test/resources/V1_11/tieLineTerminalRefBug.xml b/iidm/iidm-serde/src/test/resources/V1_11/tieLineTerminalRefBug.xml index baaa80ff336..5b1ccaf2dd0 100644 --- a/iidm/iidm-serde/src/test/resources/V1_11/tieLineTerminalRefBug.xml +++ b/iidm/iidm-serde/src/test/resources/V1_11/tieLineTerminalRefBug.xml @@ -15,7 +15,7 @@ - + @@ -43,5 +43,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/V1_12/tieLineTerminalRefBug.xml b/iidm/iidm-serde/src/test/resources/V1_12/tieLineTerminalRefBug.xml index 6356d53452e..b2e287f7e41 100644 --- a/iidm/iidm-serde/src/test/resources/V1_12/tieLineTerminalRefBug.xml +++ b/iidm/iidm-serde/src/test/resources/V1_12/tieLineTerminalRefBug.xml @@ -15,7 +15,7 @@ - + @@ -43,5 +43,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml b/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml index 9aeb50e8541..4b4e349a170 100644 --- a/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml +++ b/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml @@ -15,7 +15,7 @@ - + @@ -43,5 +43,5 @@ - + diff --git a/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractAreaTest.java b/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractAreaTest.java index c47e513dc58..fbeb8424364 100644 --- a/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractAreaTest.java +++ b/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractAreaTest.java @@ -56,7 +56,7 @@ void setUp() { vlload = network.getVoltageLevel("VLLOAD"); dlXnode1A = network.getDanglingLine("NHV1_XNODE1"); dlXnode1B = network.getDanglingLine("XNODE1_NHV2"); - dlXnode2A = network.getDanglingLine("NVH1_XNODE2"); + dlXnode2A = network.getDanglingLine("NHV1_XNODE2"); dlXnode2B = network.getDanglingLine("XNODE2_NHV2"); tieLine1 = network.getTieLine("NHV1_NHV2_1"); tieLine2 = network.getTieLine("NHV1_NHV2_2"); @@ -449,7 +449,7 @@ public void removeEquipmentRemovesAreaBoundaryMergeAndDetach() { network = network.detach(); controlAreaA = network.getArea("ControlArea_A"); controlAreaB = network.getArea("ControlArea_B"); - dlXnode2A = network.getDanglingLine("NVH1_XNODE2"); + dlXnode2A = network.getDanglingLine("NHV1_XNODE2"); tieLine2 = network.getTieLine("NHV1_NHV2_2"); // Verify the cleanup listener is now effective on the detached network @@ -480,7 +480,7 @@ public void mergeAndFlatten() { controlAreaB = network0.getArea("ControlArea_B"); checkAreas(network0, network0, network0); - dlXnode2A = network0.getDanglingLine("NVH1_XNODE2"); + dlXnode2A = network0.getDanglingLine("NHV1_XNODE2"); tieLine2 = network0.getTieLine("NHV1_NHV2_2"); // Verify the cleanup listener is always effective diff --git a/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/EurostagTutorialExample1Factory.java b/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/EurostagTutorialExample1Factory.java index 690b27e1a52..a70455a1968 100644 --- a/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/EurostagTutorialExample1Factory.java +++ b/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/EurostagTutorialExample1Factory.java @@ -23,7 +23,7 @@ public final class EurostagTutorialExample1Factory { public static final String CASE_DATE = "2018-01-01T11:00:00+01:00"; public static final String DANGLING_LINE_XNODE1_1 = "NHV1_XNODE1"; public static final String DANGLING_LINE_XNODE1_2 = "XNODE1_NHV2"; - public static final String DANGLING_LINE_XNODE2_1 = "NVH1_XNODE2"; + public static final String DANGLING_LINE_XNODE2_1 = "NHV1_XNODE2"; public static final String DANGLING_LINE_XNODE2_2 = "XNODE2_NHV2"; public static final String VLHV1 = "VLHV1"; public static final String VLHV2 = "VLHV2"; @@ -243,7 +243,7 @@ public static Network createWithTieLines(NetworkFactory networkFactory) { .setDanglingLine1(nhv1xnode1.getId()) .setDanglingLine2(xnode1nhv2.getId()) .add(); - DanglingLine nvh1xnode2 = network.getVoltageLevel(VLHV1).newDanglingLine() + DanglingLine nhv1xnode2 = network.getVoltageLevel(VLHV1).newDanglingLine() .setId(DANGLING_LINE_XNODE2_1) .setP0(0.0) .setQ0(0.0) @@ -267,7 +267,7 @@ public static Network createWithTieLines(NetworkFactory networkFactory) { .add(); network.newTieLine() .setId(NHV1_NHV2_2) - .setDanglingLine1(nvh1xnode2.getId()) + .setDanglingLine1(nhv1xnode2.getId()) .setDanglingLine2(xnode2nhv2.getId()) .add(); network.getTieLine(NHV1_NHV2_1).getDanglingLine1().getTerminal()