diff --git a/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java b/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java index 56f544f35e6..c6cd1cf5223 100644 --- a/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java +++ b/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java @@ -839,51 +839,6 @@ public static GridModelReferenceResources miniBusBranchT3xTwoRegulatingControlsE MINI_GRID_TP)); } - public static GridModelReferenceResources miniBusBranchPhaseAngleClockZero() { - String base = ENTSOE_CONFORMITY_1_MODIFIED - + "/MiniGrid/BusBranch/BaseCase_v3_phaseAngleClockZero/"; - return new GridModelReferenceResources( - "MiniGrid-BusBranch-PhaseAngleClockZero", - null, - new ResourceSet(base, - MINI_GRID_EQ), - new ResourceSet(MINI_GRID_BUS_BRANCH_BASE, - MINI_GRID_SSH, - MINI_GRID_TP, - MINI_GRID_DL, - MINI_GRID_SV)); - } - - public static GridModelReferenceResources miniBusBranchT2xPhaseAngleClock1NonZero() { - String base = ENTSOE_CONFORMITY_1_MODIFIED - + "/MiniGrid/BusBranch/BaseCase_v3_T2xPhaseAngleClock1NonZero/"; - return new GridModelReferenceResources( - "MiniGrid-BusBranch-T2xPhaseAngleClock1NonZero", - null, - new ResourceSet(base, - MINI_GRID_EQ), - new ResourceSet(MINI_GRID_BUS_BRANCH_BASE, - MINI_GRID_SSH, - MINI_GRID_TP, - MINI_GRID_DL, - MINI_GRID_SV)); - } - - public static GridModelReferenceResources miniBusBranchT3xAllPhaseAngleClockNonZero() { - String base = ENTSOE_CONFORMITY_1_MODIFIED - + "/MiniGrid/BusBranch/BaseCase_v3_T3xAllPhaseAngleClockNonZero/"; - return new GridModelReferenceResources( - "MiniGrid-BusBranch-T3xAllPhaseAngleClockNonZero", - null, - new ResourceSet(base, - MINI_GRID_EQ), - new ResourceSet(MINI_GRID_BUS_BRANCH_BASE, - MINI_GRID_SSH, - MINI_GRID_TP, - MINI_GRID_DL, - MINI_GRID_SV)); - } - public static GridModelReference miniBusBranchExternalInjectionControl() { String base = ENTSOE_CONFORMITY_1_MODIFIED + "/MiniGrid/BusBranch/BaseCase_v3_external_injection_control/"; diff --git a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_T2xPhaseAngleClock1NonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml b/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_T2xPhaseAngleClock1NonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml deleted file mode 100644 index f28aac6f5f4..00000000000 --- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_T2xPhaseAngleClock1NonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml +++ /dev/null @@ -1,1814 +0,0 @@ - - - - 2030-01-02T09:00:00 - 2015-02-05T12:20:50.830 - CGMES Conformity Assessment: Mini Grid Base Case Test Configuration. The model is owned by ENTSO-E and is provided by ENTSO-E "as it is". To the fullest extent permitted by law, ENTSO-E shall not be liable for any damages of any kind arising out of the use of the model (including any of its subsequent modifications). ENTSO-E neither warrants, nor represents that the use of the model will not infringe the rights of third parties. Any use of the model shall include a reference to ENTSO-E. ENTSO-E web site is the only official source of information related to the model. - 4 - http://entsoe.eu/CIM/EquipmentCore/3/1 - http://entsoe.eu/CIM/EquipmentShortCircuit/3/1 - http://A1.de/Planning/ENTSOE/2 - - - - L5_0 - 1 - - - - - L5_1 - 2 - - - - - L6_0 - 1 - - - - - L6_1 - 2 - - - - - L4_0 - 1 - - - - - L4_1 - 2 - - - - - L1_0 - 1 - - - - - L1_1 - 2 - - - - - L2_0 - 1 - - - - - L2_1 - 2 - - - - - L3_a_0 - 1 - - - - - L3_a_1 - 2 - - - - - L3_b_0 - 1 - - - - - L3_b_1 - 2 - - - - - T5_0 - 1 - - - - - T5_1 - 2 - - - - - T6_0 - 1 - - - - - T6_1 - 2 - - - - - T2_0 - 1 - - - - - T2_1 - 2 - - - - - T1_0 - 1 - - - - - T1_1 - 2 - - - - - T4_0 - 1 - - - - - T4_1 - 2 - - - - - T4_2 - 3 - - - - - T3_0 - 1 - - - - - T3_1 - 2 - - - - - T3_2 - 3 - - - - - G2_0 - 1 - - - - - G1_0 - 1 - - - - - G3_0 - 1 - - - - - M1_0 - 1 - - - - - M2_0 - 1 - - - - - ASM-1229750300_0 - 1 - - - - - Q1_0 - 1 - - - - - Q2_0 - 1 - - - - - 380kV - 380 - - - 21kV - 21 - - - 10kV - 10 - - - 110kV - 110 - - - 30kV - 30 - - - S2 10kV - - - - - S5 10kV - - - - - S4 10kV - - - - - S3 21kV - - - - - S2 110kV - - - - - S3 110kV - - - - - S1 380kV - - - - - S1 30kV - - - - - S4 110kV - - - - - S1 110kV - - - - - Sub1 - - - - Sub2 - - - - Sub3 - - - - Sub4 - - - - Sub5 - - - - AA - - - Z1 - - - - PATL - 45000 - - - - - TATL - 900 - - - - - TATL - 60 - - - - - Gen-1 - G2 - false - - 0 - 127.5 - 0 - - - G2 - - - 0.9 - 100 - 10.5 - - false - 43.6 - -43.6 - 100 - 0 - 0.004535 - 0.16 - 2 - 2 - - - 7.5 - 0.005 - 0.1 - 0.16 - - - Gen-2 - G1 - false - - 0 - 90 - 0 - - - G1 - - 0.85 - 150 - 21 - - false - 79 - -79 - 100 - 0 - 0.00068 - 0.14 - 1.8 - 1.8 - - - 0.002 - 0.1 - 0.14 - - - Gen-3 - G3 - false - - 0 - 8 - 0 - - - G3 - - 0.8 - 10 - 10.5 - - false - 6 - -6 - 100 - 0 - 0.00163 - 0.1 - 1.8 - 1.8 - - - 0.018 - 0.08 - 0.1 - - - M3 - false - - 0.88 - 5.828 - 10 - false - 97.5 - 5 - 1 - 5 - false - 0.1 - - - M2a - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - M2b - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - Q1 - - 0 - true - 38000 - 800 - 600 - 0.15 - 0.1 - 3.029 - 0 - -800 - -600 - 0.1 - 0.1 - 1 - 1.1 - - - Q2 - - 0 - true - 16000 - 88 - 66 - 0.2 - 0.1 - 3.34865 - 0 - -88 - -66 - 0 - 0 - 0 - 1.1 - - - Line-7 - L5 - false - - - 15 - 0 - 0 - 0 - 0 - 1.8 - 3.3 - 80 - 5.79 - 16.5 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-4 - L6 - false - - - 1 - 0 - 0 - 0 - 0 - 0.082 - 0.082 - 80 - 0.086 - 0.086 - - - Ratings - - - - Normal - - - 1155 - - - ShortTerm - - - 1328 - - - Emergency - - - 1617 - - - Line-5 - L4 - false - - - 10 - 0 - 0 - 0 - 0 - 0.96 - 2.2 - 80 - 3.88 - 11 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-1 - L1 - false - - - 20 - 0 - 0 - 0 - 0 - 2.4 - 6.4 - 80 - 7.8 - 25.2 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-6 - L2 - false - - - 10 - 0 - 0 - 0 - 0 - 1.2 - 3.2 - 80 - 3.9 - 12.6 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-2 - L3_a - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-3 - L3_b - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Trafo-1 - T5 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T5 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T5 - 0 - 2 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-2 - T6 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T6 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T6 - 0 - 2 - true - 100 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-3 - T2 - false - - 115 - true - false - - - T2 - 0 - 1 - false - 0 - - - 0 - - 0 - 3 - 100 - 0 - 120 - 0 - 0.72 - 0.72 - 17.2649937 - 17.2649937 - - - - Ratings - - - - Normal - - - 481 - - - ShortTerm - - - 553 - - - Emergency - - - 673 - - - T2 - 2 - false - - - 0 - - 0 - 5 - 100 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 5498 - - - ShortTerm - - - 6323 - - - Emergency - - - 7698 - - - Trafo-4 - T1 - false - - 115 - true - false - - - T1 - 2 - false - - - 0 - - 0 - 5 - 150 - 0 - 21 - 0 - 0.0147 - 0.0147 - 0.47017 - 0.446662 - - - - Ratings - - - - Normal - - - 4123 - - - ShortTerm - - - 4742 - - - Emergency - - - 5773 - - - T1 - 25 - 1 - true - 13 - 21 - 13 - - 1 - - - - T1 - 0 - 1 - true - 22 - - - 0 - - 0 - 0 - 150 - 0 - 115 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 753 - - - ShortTerm - - - 866 - - - Emergency - - - 1054 - - - T4 - false - - false - - - T4 - 3 - false - - - 0 - - 0 - 5 - 50 - 0 - 30 - 0 - 0.0254571438 - 0.0254571438 - 1.259741 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 0 - 2 - true - 0 - - - 0 - - 0 - 0 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T4 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - Trafo-5 - T3 - false - - false - - - T3 - 0 - 1 - true - 0 - - - 0 - - 0 - 0 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - T3 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - T3 - 0 - 2 - false - 0 - - - 0 - - 0 - 0 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T3 - 3 - false - - - 0 - - 0 - 5 - 50 - 0 - 30 - 0 - 0.02545714286 - 0.02545714286 - 1.259740894 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - 68-116_0 - 1 - - - - - 68-116_1 - 2 - - - - - Injection_0 - 1 - - - - - 71-73_0 - 1 - - - - - 71-73_1 - 2 - - - - - Injection_0 - 1 - - - - - XQ1-N1 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - XQ2-N5 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - Injection1 - - - 0.63185 - 2.85315 - 0.63185 - false - 6.3185 - 19.021 - 6.3185 - - - Injection2 - - - 0.43445 - 2.86738 - 0.43445 - false - 4.3445 - 14.3369 - 4.3445 - - - GEN_A1 - - - - - _CA_A1 - - - - Container for Line-7 - - - - Container for Line-4 - - - - Container for Line-5 - - - - Container for Line-1 - - - - Container for Line-6 - - - - Container for Line-2 - - - - Container for Line-3 - - - - TwinBrch SM - - - - - PATLT - 4000 - - - - - Normal - - - 525 - - - Normal - - - 1155 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 481 - - - Normal - - - 5498 - - - Normal - - - 4123 - - - Normal - - - 753 - - - Normal - - - 962 - - - Normal - - - 1683 - - - Normal - - - 505 - - - Normal - - - 505 - - - Normal - - - 1683 - - - Normal - - - 962 - - - Normal - - - 1000 - - - Normal - - - 1000 - - \ No newline at end of file diff --git a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_T3xAllPhaseAngleClockNonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml b/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_T3xAllPhaseAngleClockNonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml deleted file mode 100644 index 2d4a212a7af..00000000000 --- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_T3xAllPhaseAngleClockNonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml +++ /dev/null @@ -1,1814 +0,0 @@ - - - - 2030-01-02T09:00:00 - 2015-02-05T12:20:50.830 - CGMES Conformity Assessment: Mini Grid Base Case Test Configuration. The model is owned by ENTSO-E and is provided by ENTSO-E "as it is". To the fullest extent permitted by law, ENTSO-E shall not be liable for any damages of any kind arising out of the use of the model (including any of its subsequent modifications). ENTSO-E neither warrants, nor represents that the use of the model will not infringe the rights of third parties. Any use of the model shall include a reference to ENTSO-E. ENTSO-E web site is the only official source of information related to the model. - 4 - http://entsoe.eu/CIM/EquipmentCore/3/1 - http://entsoe.eu/CIM/EquipmentShortCircuit/3/1 - http://A1.de/Planning/ENTSOE/2 - - - - L5_0 - 1 - - - - - L5_1 - 2 - - - - - L6_0 - 1 - - - - - L6_1 - 2 - - - - - L4_0 - 1 - - - - - L4_1 - 2 - - - - - L1_0 - 1 - - - - - L1_1 - 2 - - - - - L2_0 - 1 - - - - - L2_1 - 2 - - - - - L3_a_0 - 1 - - - - - L3_a_1 - 2 - - - - - L3_b_0 - 1 - - - - - L3_b_1 - 2 - - - - - T5_0 - 1 - - - - - T5_1 - 2 - - - - - T6_0 - 1 - - - - - T6_1 - 2 - - - - - T2_0 - 1 - - - - - T2_1 - 2 - - - - - T1_0 - 1 - - - - - T1_1 - 2 - - - - - T4_0 - 1 - - - - - T4_1 - 2 - - - - - T4_2 - 3 - - - - - T3_0 - 1 - - - - - T3_1 - 2 - - - - - T3_2 - 3 - - - - - G2_0 - 1 - - - - - G1_0 - 1 - - - - - G3_0 - 1 - - - - - M1_0 - 1 - - - - - M2_0 - 1 - - - - - ASM-1229750300_0 - 1 - - - - - Q1_0 - 1 - - - - - Q2_0 - 1 - - - - - 380kV - 380 - - - 21kV - 21 - - - 10kV - 10 - - - 110kV - 110 - - - 30kV - 30 - - - S2 10kV - - - - - S5 10kV - - - - - S4 10kV - - - - - S3 21kV - - - - - S2 110kV - - - - - S3 110kV - - - - - S1 380kV - - - - - S1 30kV - - - - - S4 110kV - - - - - S1 110kV - - - - - Sub1 - - - - Sub2 - - - - Sub3 - - - - Sub4 - - - - Sub5 - - - - AA - - - Z1 - - - - PATL - 45000 - - - - - TATL - 900 - - - - - TATL - 60 - - - - - Gen-1 - G2 - false - - 0 - 127.5 - 0 - - - G2 - - - 0.9 - 100 - 10.5 - - false - 43.6 - -43.6 - 100 - 0 - 0.004535 - 0.16 - 2 - 2 - - - 7.5 - 0.005 - 0.1 - 0.16 - - - Gen-2 - G1 - false - - 0 - 90 - 0 - - - G1 - - 0.85 - 150 - 21 - - false - 79 - -79 - 100 - 0 - 0.00068 - 0.14 - 1.8 - 1.8 - - - 0.002 - 0.1 - 0.14 - - - Gen-3 - G3 - false - - 0 - 8 - 0 - - - G3 - - 0.8 - 10 - 10.5 - - false - 6 - -6 - 100 - 0 - 0.00163 - 0.1 - 1.8 - 1.8 - - - 0.018 - 0.08 - 0.1 - - - M3 - false - - 0.88 - 5.828 - 10 - false - 97.5 - 5 - 1 - 5 - false - 0.1 - - - M2a - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - M2b - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - Q1 - - 0 - true - 38000 - 800 - 600 - 0.15 - 0.1 - 3.029 - 0 - -800 - -600 - 0.1 - 0.1 - 1 - 1.1 - - - Q2 - - 0 - true - 16000 - 88 - 66 - 0.2 - 0.1 - 3.34865 - 0 - -88 - -66 - 0 - 0 - 0 - 1.1 - - - Line-7 - L5 - false - - - 15 - 0 - 0 - 0 - 0 - 1.8 - 3.3 - 80 - 5.79 - 16.5 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-4 - L6 - false - - - 1 - 0 - 0 - 0 - 0 - 0.082 - 0.082 - 80 - 0.086 - 0.086 - - - Ratings - - - - Normal - - - 1155 - - - ShortTerm - - - 1328 - - - Emergency - - - 1617 - - - Line-5 - L4 - false - - - 10 - 0 - 0 - 0 - 0 - 0.96 - 2.2 - 80 - 3.88 - 11 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-1 - L1 - false - - - 20 - 0 - 0 - 0 - 0 - 2.4 - 6.4 - 80 - 7.8 - 25.2 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-6 - L2 - false - - - 10 - 0 - 0 - 0 - 0 - 1.2 - 3.2 - 80 - 3.9 - 12.6 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-2 - L3_a - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-3 - L3_b - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Trafo-1 - T5 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T5 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T5 - 0 - 2 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-2 - T6 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T6 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T6 - 0 - 2 - true - 100 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-3 - T2 - false - - 115 - true - false - - - T2 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 100 - 0 - 120 - 0 - 0.72 - 0.72 - 17.2649937 - 17.2649937 - - - - Ratings - - - - Normal - - - 481 - - - ShortTerm - - - 553 - - - Emergency - - - 673 - - - T2 - 2 - false - - - 0 - - 0 - 5 - 100 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 5498 - - - ShortTerm - - - 6323 - - - Emergency - - - 7698 - - - Trafo-4 - T1 - false - - 115 - true - false - - - T1 - 2 - false - - - 0 - - 0 - 5 - 150 - 0 - 21 - 0 - 0.0147 - 0.0147 - 0.47017 - 0.446662 - - - - Ratings - - - - Normal - - - 4123 - - - ShortTerm - - - 4742 - - - Emergency - - - 5773 - - - T1 - 25 - 1 - true - 13 - 21 - 13 - - 1 - - - - T1 - 0 - 1 - true - 22 - - - 0 - - 0 - 0 - 150 - 0 - 115 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 753 - - - ShortTerm - - - 866 - - - Emergency - - - 1054 - - - T4 - false - - false - - - T4 - 3 - false - - - 0 - - 0 - 5 - 50 - 0 - 30 - 0 - 0.0254571438 - 0.0254571438 - 1.259741 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 0 - 2 - true - 0 - - - 0 - - 0 - 0 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T4 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - Trafo-5 - T3 - false - - false - - - T3 - 0 - 1 - true - 0 - - - 0 - - 0 - 1 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - T3 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - T3 - 0 - 2 - false - 0 - - - 0 - - 0 - 3 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T3 - 3 - false - - - 0 - - 0 - 5 - 50 - 0 - 30 - 0 - 0.02545714286 - 0.02545714286 - 1.259740894 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - 68-116_0 - 1 - - - - - 68-116_1 - 2 - - - - - Injection_0 - 1 - - - - - 71-73_0 - 1 - - - - - 71-73_1 - 2 - - - - - Injection_0 - 1 - - - - - XQ1-N1 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - XQ2-N5 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - Injection1 - - - 0.63185 - 2.85315 - 0.63185 - false - 6.3185 - 19.021 - 6.3185 - - - Injection2 - - - 0.43445 - 2.86738 - 0.43445 - false - 4.3445 - 14.3369 - 4.3445 - - - GEN_A1 - - - - - _CA_A1 - - - - Container for Line-7 - - - - Container for Line-4 - - - - Container for Line-5 - - - - Container for Line-1 - - - - Container for Line-6 - - - - Container for Line-2 - - - - Container for Line-3 - - - - TwinBrch SM - - - - - PATLT - 4000 - - - - - Normal - - - 525 - - - Normal - - - 1155 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 481 - - - Normal - - - 5498 - - - Normal - - - 4123 - - - Normal - - - 753 - - - Normal - - - 962 - - - Normal - - - 1683 - - - Normal - - - 505 - - - Normal - - - 505 - - - Normal - - - 1683 - - - Normal - - - 962 - - - Normal - - - 1000 - - - Normal - - - 1000 - - \ No newline at end of file diff --git a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_phaseAngleClockZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml b/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_phaseAngleClockZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml deleted file mode 100644 index 157f6e35cc5..00000000000 --- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/BusBranch/BaseCase_v3_phaseAngleClockZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml +++ /dev/null @@ -1,1814 +0,0 @@ - - - - 2030-01-02T09:00:00 - 2015-02-05T12:20:50.830 - CGMES Conformity Assessment: Mini Grid Base Case Test Configuration. The model is owned by ENTSO-E and is provided by ENTSO-E "as it is". To the fullest extent permitted by law, ENTSO-E shall not be liable for any damages of any kind arising out of the use of the model (including any of its subsequent modifications). ENTSO-E neither warrants, nor represents that the use of the model will not infringe the rights of third parties. Any use of the model shall include a reference to ENTSO-E. ENTSO-E web site is the only official source of information related to the model. - 4 - http://entsoe.eu/CIM/EquipmentCore/3/1 - http://entsoe.eu/CIM/EquipmentShortCircuit/3/1 - http://A1.de/Planning/ENTSOE/2 - - - - L5_0 - 1 - - - - - L5_1 - 2 - - - - - L6_0 - 1 - - - - - L6_1 - 2 - - - - - L4_0 - 1 - - - - - L4_1 - 2 - - - - - L1_0 - 1 - - - - - L1_1 - 2 - - - - - L2_0 - 1 - - - - - L2_1 - 2 - - - - - L3_a_0 - 1 - - - - - L3_a_1 - 2 - - - - - L3_b_0 - 1 - - - - - L3_b_1 - 2 - - - - - T5_0 - 1 - - - - - T5_1 - 2 - - - - - T6_0 - 1 - - - - - T6_1 - 2 - - - - - T2_0 - 1 - - - - - T2_1 - 2 - - - - - T1_0 - 1 - - - - - T1_1 - 2 - - - - - T4_0 - 1 - - - - - T4_1 - 2 - - - - - T4_2 - 3 - - - - - T3_0 - 1 - - - - - T3_1 - 2 - - - - - T3_2 - 3 - - - - - G2_0 - 1 - - - - - G1_0 - 1 - - - - - G3_0 - 1 - - - - - M1_0 - 1 - - - - - M2_0 - 1 - - - - - ASM-1229750300_0 - 1 - - - - - Q1_0 - 1 - - - - - Q2_0 - 1 - - - - - 380kV - 380 - - - 21kV - 21 - - - 10kV - 10 - - - 110kV - 110 - - - 30kV - 30 - - - S2 10kV - - - - - S5 10kV - - - - - S4 10kV - - - - - S3 21kV - - - - - S2 110kV - - - - - S3 110kV - - - - - S1 380kV - - - - - S1 30kV - - - - - S4 110kV - - - - - S1 110kV - - - - - Sub1 - - - - Sub2 - - - - Sub3 - - - - Sub4 - - - - Sub5 - - - - AA - - - Z1 - - - - PATL - 45000 - - - - - TATL - 900 - - - - - TATL - 60 - - - - - Gen-1 - G2 - false - - 0 - 127.5 - 0 - - - G2 - - - 0.9 - 100 - 10.5 - - false - 43.6 - -43.6 - 100 - 0 - 0.004535 - 0.16 - 2 - 2 - - - 7.5 - 0.005 - 0.1 - 0.16 - - - Gen-2 - G1 - false - - 0 - 90 - 0 - - - G1 - - 0.85 - 150 - 21 - - false - 79 - -79 - 100 - 0 - 0.00068 - 0.14 - 1.8 - 1.8 - - - 0.002 - 0.1 - 0.14 - - - Gen-3 - G3 - false - - 0 - 8 - 0 - - - G3 - - 0.8 - 10 - 10.5 - - false - 6 - -6 - 100 - 0 - 0.00163 - 0.1 - 1.8 - 1.8 - - - 0.018 - 0.08 - 0.1 - - - M3 - false - - 0.88 - 5.828 - 10 - false - 97.5 - 5 - 1 - 5 - false - 0.1 - - - M2a - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - M2b - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - Q1 - - 0 - true - 38000 - 800 - 600 - 0.15 - 0.1 - 3.029 - 0 - -800 - -600 - 0.1 - 0.1 - 1 - 1.1 - - - Q2 - - 0 - true - 16000 - 88 - 66 - 0.2 - 0.1 - 3.34865 - 0 - -88 - -66 - 0 - 0 - 0 - 1.1 - - - Line-7 - L5 - false - - - 15 - 0 - 0 - 0 - 0 - 1.8 - 3.3 - 80 - 5.79 - 16.5 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-4 - L6 - false - - - 1 - 0 - 0 - 0 - 0 - 0.082 - 0.082 - 80 - 0.086 - 0.086 - - - Ratings - - - - Normal - - - 1155 - - - ShortTerm - - - 1328 - - - Emergency - - - 1617 - - - Line-5 - L4 - false - - - 10 - 0 - 0 - 0 - 0 - 0.96 - 2.2 - 80 - 3.88 - 11 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-1 - L1 - false - - - 20 - 0 - 0 - 0 - 0 - 2.4 - 6.4 - 80 - 7.8 - 25.2 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-6 - L2 - false - - - 10 - 0 - 0 - 0 - 0 - 1.2 - 3.2 - 80 - 3.9 - 12.6 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-2 - L3_a - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-3 - L3_b - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Trafo-1 - T5 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T5 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T5 - 0 - 2 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-2 - T6 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T6 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T6 - 0 - 2 - true - 100 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-3 - T2 - false - - 115 - true - false - - - T2 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 100 - 0 - 120 - 0 - 0.72 - 0.72 - 17.2649937 - 17.2649937 - - - - Ratings - - - - Normal - - - 481 - - - ShortTerm - - - 553 - - - Emergency - - - 673 - - - T2 - 2 - false - - - 0 - - 0 - 0 - 100 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 5498 - - - ShortTerm - - - 6323 - - - Emergency - - - 7698 - - - Trafo-4 - T1 - false - - 115 - true - false - - - T1 - 2 - false - - - 0 - - 0 - 0 - 150 - 0 - 21 - 0 - 0.0147 - 0.0147 - 0.47017 - 0.446662 - - - - Ratings - - - - Normal - - - 4123 - - - ShortTerm - - - 4742 - - - Emergency - - - 5773 - - - T1 - 25 - 1 - true - 13 - 21 - 13 - - 1 - - - - T1 - 0 - 1 - true - 22 - - - 0 - - 0 - 0 - 150 - 0 - 115 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 753 - - - ShortTerm - - - 866 - - - Emergency - - - 1054 - - - T4 - false - - false - - - T4 - 3 - false - - - 0 - - 0 - 0 - 50 - 0 - 30 - 0 - 0.0254571438 - 0.0254571438 - 1.259741 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 0 - 2 - true - 0 - - - 0 - - 0 - 0 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T4 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - Trafo-5 - T3 - false - - false - - - T3 - 0 - 1 - true - 0 - - - 0 - - 0 - 0 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - T3 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - T3 - 0 - 2 - false - 0 - - - 0 - - 0 - 0 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T3 - 3 - false - - - 0 - - 0 - 0 - 50 - 0 - 30 - 0 - 0.02545714286 - 0.02545714286 - 1.259740894 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - 68-116_0 - 1 - - - - - 68-116_1 - 2 - - - - - Injection_0 - 1 - - - - - 71-73_0 - 1 - - - - - 71-73_1 - 2 - - - - - Injection_0 - 1 - - - - - XQ1-N1 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - XQ2-N5 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - Injection1 - - - 0.63185 - 2.85315 - 0.63185 - false - 6.3185 - 19.021 - 6.3185 - - - Injection2 - - - 0.43445 - 2.86738 - 0.43445 - false - 4.3445 - 14.3369 - 4.3445 - - - GEN_A1 - - - - - _CA_A1 - - - - Container for Line-7 - - - - Container for Line-4 - - - - Container for Line-5 - - - - Container for Line-1 - - - - Container for Line-6 - - - - Container for Line-2 - - - - Container for Line-3 - - - - TwinBrch SM - - - - - PATLT - 4000 - - - - - Normal - - - 525 - - - Normal - - - 1155 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 481 - - - Normal - - - 5498 - - - Normal - - - 4123 - - - Normal - - - 753 - - - Normal - - - 962 - - - Normal - - - 1683 - - - Normal - - - 505 - - - Normal - - - 505 - - - Normal - - - 1683 - - - Normal - - - 962 - - - Normal - - - 1000 - - - Normal - - - 1000 - - \ No newline at end of file diff --git a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/TransformerConversionTest.java b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/TransformerConversionTest.java index 0905264d09f..18160be481b 100644 --- a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/TransformerConversionTest.java +++ b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/TransformerConversionTest.java @@ -10,17 +10,20 @@ import com.powsybl.cgmes.conformity.Cgmes3ModifiedCatalog; import com.powsybl.cgmes.conformity.CgmesConformity1Catalog; -import com.powsybl.cgmes.conformity.CgmesConformity1ModifiedCatalog; import com.powsybl.cgmes.conversion.CgmesImportPostProcessor; import com.powsybl.cgmes.conversion.Conversion; import com.powsybl.cgmes.conversion.Conversion.*; import com.powsybl.cgmes.conversion.PhaseAngleClock; import com.powsybl.cgmes.model.GridModelReference; +import com.powsybl.cgmes.model.GridModelReferenceResources; import com.powsybl.commons.PowsyblException; +import com.powsybl.commons.datasource.ResourceSet; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.Terminal; import com.powsybl.iidm.network.ThreeWindingsTransformer; import com.powsybl.iidm.network.TwoWindingsTransformer; +import com.powsybl.iidm.network.extensions.ThreeWindingsTransformerPhaseAngleClock; +import com.powsybl.iidm.network.extensions.TwoWindingsTransformerPhaseAngleClock; import com.powsybl.loadflow.LoadFlowParameters; import com.powsybl.loadflow.validation.ValidationConfig; import org.junit.jupiter.api.Test; @@ -31,8 +34,7 @@ import java.util.Collections; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Luma Zamarreño {@literal } @@ -41,6 +43,7 @@ class TransformerConversionTest { private static final String EQUALS_LINE = "======================"; + private static final String DIR = "/issues/transformers/"; @Test void microGridBaseCaseBExfmr2ShuntDefault() { @@ -334,55 +337,47 @@ void microGridBaseCaseBExfmr3Ratio0End3() { } @Test - void miniBusBranchPhaseAngleClock() { - Conversion.Config config = new Conversion.Config(); - List postProcessors = new ArrayList<>(); - postProcessors.add(new PhaseAngleClock()); - - Network n = networkModel(CgmesConformity1Catalog.miniBusBranch(), config, postProcessors); + void phaseAngleClockTest() { + // A 2w- and a 3w-transformer with non-null phase angle clock value on respectively 2nd and 3rd winding + Network n = networkModelWithPhaseAngleClock(phaseAngleClock("PhaseAngleClock_EQ.xml")); - boolean ok = t2xCompareFlow(n, "f1e72854-ec35-46e9-b614-27db354e8dbb", -318.691633, 1424.484145, 436.204160, 1393.367311); - assertTrue(ok); - ok = t3xCompareFlow(n, "5d38b7ed-73fd-405a-9cdb-78425e003773", -7.505045, -1.896561, -288.380946, 1216.566903, 351.090362, 1199.878285); - assertTrue(ok); - } + // Phase angle clock values have been correctly read + assertEquals(5, n.getTwoWindingsTransformer("T2W").getExtension(TwoWindingsTransformerPhaseAngleClock.class).getPhaseAngleClock()); + assertEquals(0, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg2()); + assertEquals(5, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg3()); - @Test - void miniBusBranchPhaseAngleClockZero() { - Conversion.Config config = new Conversion.Config(); - List postProcessors = new ArrayList<>(); - postProcessors.add(new PhaseAngleClock()); - - Network n = networkModel(CgmesConformity1ModifiedCatalog.miniBusBranchPhaseAngleClockZero(), config, postProcessors); - - boolean ok = t2xCompareFlow(n, "f1e72854-ec35-46e9-b614-27db354e8dbb", -0.087780, -0.178561, 0.087782, 0.178613); - assertTrue(ok); - ok = t3xCompareFlow(n, "5d38b7ed-73fd-405a-9cdb-78425e003773", -0.000001, -0.000022, 0.000002, 0.000068, -0.000001, -0.000045); - assertTrue(ok); + // Power flows are calculated from SV voltages + assertTrue(t2xCompareFlow(n, "T2W", -318.691633, 1424.484145, 436.204160, 1393.367311)); + assertTrue(t3xCompareFlow(n, "T3W", -7.505045, -1.896561, -288.380946, 1216.566903, 351.090362, 1199.878285)); } @Test - void miniBusBranchT2xPhaseAngleClock1NonZero() { - Conversion.Config config = new Conversion.Config(); - List postProcessors = new ArrayList<>(); - postProcessors.add(new PhaseAngleClock()); + void phaseAngleClockAllZeroTest() { + // The same 2w- and a 3w-transformer as in phaseAngleClockTest() but with all phase angle clock equal to 0 + Network n = networkModelWithPhaseAngleClock(phaseAngleClock("PhaseAngleClock_EQ_AllZero.xml")); - Network n = networkModel(CgmesConformity1ModifiedCatalog.miniBusBranchT2xPhaseAngleClock1NonZero(), config, postProcessors); + // No phase angle clock extension has been created since all values are equal to 0 + assertNull(n.getTwoWindingsTransformer("T2W").getExtension(TwoWindingsTransformerPhaseAngleClock.class)); + assertNull(n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class)); - boolean ok = t2xCompareFlow(n, "f1e72854-ec35-46e9-b614-27db354e8dbb", -318.691633, 1424.484145, 436.204160, 1393.367311); - assertTrue(ok); + // Power flows are calculated from SV voltages and differ from the ones in phaseAngleClockTest() + assertTrue(t2xCompareFlow(n, "T2W", -0.087780, -0.178561, 0.087782, 0.178613)); + assertTrue(t3xCompareFlow(n, "T3W", -0.000001, -0.000022, 0.000002, 0.000068, -0.000001, -0.000045)); } @Test - void miniBusBranchT3xAllPhaseAngleClockNonZero() { - Conversion.Config config = new Conversion.Config(); - List postProcessors = new ArrayList<>(); - postProcessors.add(new PhaseAngleClock()); + void phaseAngleClockAllNonZeroTest() { + // The same 2w- and a 3w-transformer as in phaseAngleClockTest() but with non-null phase angle clock value on all windings + Network n = networkModelWithPhaseAngleClock(phaseAngleClock("PhaseAngleClock_EQ_AllNonZero.xml")); - Network n = networkModel(CgmesConformity1ModifiedCatalog.miniBusBranchT3xAllPhaseAngleClockNonZero(), config, postProcessors); + // Non-null phase angle clock values on 1st winding are discarded, the other ones are correctly read + assertEquals(5, n.getTwoWindingsTransformer("T2W").getExtension(TwoWindingsTransformerPhaseAngleClock.class).getPhaseAngleClock()); + assertEquals(3, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg2()); + assertEquals(5, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg3()); - boolean ok = t3xCompareFlow(n, "5d38b7ed-73fd-405a-9cdb-78425e003773", -1494.636083, 1530.638656, 981.686099, 1826.870720, 562.199867, 309.289551); - assertTrue(ok); + // Power flows are calculated from SV voltages and differ from the ones in phaseAngleClockTest() when the pac values differ (3w-transformer) + assertTrue(t2xCompareFlow(n, "T2W", -318.691633, 1424.484145, 436.204160, 1393.367311)); + assertTrue(t3xCompareFlow(n, "T3W", -1494.636083, 1530.638656, 981.686099, 1826.870720, 562.199867, 309.289551)); } @Test @@ -441,6 +436,13 @@ private boolean t3xCompareFlow(Network n, String id, double p1, double q1, doubl return ok; } + private Network networkModelWithPhaseAngleClock(GridModelReference gridModelReference) { + List postProcessors = new ArrayList<>(); + postProcessors.add(new PhaseAngleClock()); + + return networkModel(gridModelReference, new Conversion.Config(), postProcessors); + } + private Network networkModel(GridModelReference testGridModel, Conversion.Config config) { return networkModel(testGridModel, config, Collections.emptyList()); } @@ -457,6 +459,17 @@ private Network networkModel(GridModelReference testGridModel, Conversion.Config return n; } + private GridModelReferenceResources phaseAngleClock(String phaseAngleClockEQ) { + return new GridModelReferenceResources( + "PhaseAngleClock", + null, + new ResourceSet(DIR, + phaseAngleClockEQ, + "PhaseAngleClock_SSH.xml", + "PhaseAngleClock_TP.xml", + "PhaseAngleClock_SV.xml")); + } + private static ValidationConfig loadFlowValidationConfig(double threshold) { ValidationConfig config = ValidationConfig.load(); config.setVerbose(true); diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ.xml b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ.xml new file mode 100644 index 00000000000..7224adcf0dc --- /dev/null +++ b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ.xml @@ -0,0 +1,296 @@ + + + 2021-03-01T23:00:00Z + 2021-03-02T10:22:58Z + Phase angle clock + 001 + http://entsoe.eu/CIM/EquipmentCore/3/1 + http://entsoe.eu/CIM/EquipmentOperation/3/1 + powsybl.org + + + Geographical region + + + Subgeographical region + + + + Substation + + + + Voltage level 400 kV + + + + + Voltage level 120 kV + + + + + Voltage level 30 kV + + + + + Voltage level 11.5 kV + + + + + Power transformer 2-windings + + + + Power transformer 2-w end 1 + 0 + 1 + false + 0 + + + 0 + + 0 + 0 + 100 + 0 + 120 + 0 + 0.72 + 0.72 + 17.2649937 + 17.2649937 + + + + Terminal T2W_1 + 1 + + + + + Node 1 + + + + Power transformer 2-w end 2 + 2 + false + + + 0 + + 0 + 5 + 100 + 0 + 10.5 + 0 + 0 + 0 + 0 + 0 + + + + Terminal T2W_2 + 2 + + + + + Node 2 + + + + Power transformer 3-windings + + + + Power transformer 3-w end 1 + 0 + 1 + true + 0 + + + 0 + + 0 + 0 + 350 + 0 + 400 + 0 + 0.5942857143 + 0.5942857143 + 96.0051006 + 95.05666 + + + + Terminal T3W_1 + 1 + + + + + Node 3 + + + + Power transformer 3-w end 2 + 0 + 2 + false + 0 + + + 0 + + 0 + 0 + 350 + 0 + 120 + 0 + 0.05348571429 + 0.05348571429 + -0.001121283618 + -0.6881 + + + + Terminal T3W_2 + 2 + + + + + Node 4 + + + + Power transformer 3-w end 3 + 3 + false + + + 0 + + 0 + 5 + 50 + 0 + 30 + 0 + 0.02545714286 + 0.02545714286 + 1.259740894 + 1.176919 + + + + Terminal T3W_3 + 3 + + + + + Node 5 + + + + Series compensator + + 0.1 + 0.1 + false + 1000 + 250 + 1 + 1 + + + + Terminal SEC 1 + 1 + + + + + Terminal SEC 2 + 2 + + + + + Busbar section 1 + + + + Terminal BBS_1 + 1 + + + + + Busbar section 2 + + + + Terminal BBS_2 + 1 + + + + + Busbar section 3 + + + + Terminal BBS_3 + 1 + + + + + Busbar section 4 + + + + Terminal BBS_4 + 1 + + + + + Busbar section 5 + + + + Terminal BBS_5 + 1 + + + + + 400 kV + 400 + + + 120 kV + 120 + + + 30 kV + 30 + + + 11.5 kV + 11.5 + + diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ_AllNonZero.xml b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ_AllNonZero.xml new file mode 100644 index 00000000000..2155b26072b --- /dev/null +++ b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ_AllNonZero.xml @@ -0,0 +1,296 @@ + + + 2021-03-01T23:00:00Z + 2021-03-02T10:22:58Z + Phase angle clock + 001 + http://entsoe.eu/CIM/EquipmentCore/3/1 + http://entsoe.eu/CIM/EquipmentOperation/3/1 + powsybl.org + + + Geographical region + + + Subgeographical region + + + + Substation + + + + Voltage level 400 kV + + + + + Voltage level 120 kV + + + + + Voltage level 30 kV + + + + + Voltage level 11.5 kV + + + + + Power transformer 2-windings + + + + Power transformer 2-w end 1 + 0 + 1 + false + 0 + + + 0 + + 0 + 3 + 100 + 0 + 120 + 0 + 0.72 + 0.72 + 17.2649937 + 17.2649937 + + + + Terminal T2W_1 + 1 + + + + + Node 1 + + + + Power transformer 2-w end 2 + 2 + false + + + 0 + + 0 + 5 + 100 + 0 + 10.5 + 0 + 0 + 0 + 0 + 0 + + + + Terminal T2W_2 + 2 + + + + + Node 2 + + + + Power transformer 3-windings + + + + Power transformer 3-w end 1 + 0 + 1 + true + 0 + + + 0 + + 0 + 1 + 350 + 0 + 400 + 0 + 0.5942857143 + 0.5942857143 + 96.0051006 + 95.05666 + + + + Terminal T3W_1 + 1 + + + + + Node 3 + + + + Power transformer 3-w end 2 + 0 + 2 + false + 0 + + + 0 + + 0 + 3 + 350 + 0 + 120 + 0 + 0.05348571429 + 0.05348571429 + -0.001121283618 + -0.6881 + + + + Terminal T3W_2 + 2 + + + + + Node 4 + + + + Power transformer 3-w end 3 + 3 + false + + + 0 + + 0 + 5 + 50 + 0 + 30 + 0 + 0.02545714286 + 0.02545714286 + 1.259740894 + 1.176919 + + + + Terminal T3W_3 + 3 + + + + + Node 5 + + + + Series compensator + + 0.1 + 0.1 + false + 1000 + 250 + 1 + 1 + + + + Terminal SEC 1 + 1 + + + + + Terminal SEC 2 + 2 + + + + + Busbar section 1 + + + + Terminal BBS_1 + 1 + + + + + Busbar section 2 + + + + Terminal BBS_2 + 1 + + + + + Busbar section 3 + + + + Terminal BBS_3 + 1 + + + + + Busbar section 4 + + + + Terminal BBS_4 + 1 + + + + + Busbar section 5 + + + + Terminal BBS_5 + 1 + + + + + 400 kV + 400 + + + 120 kV + 120 + + + 30 kV + 30 + + + 11.5 kV + 11.5 + + diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ_AllZero.xml b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ_AllZero.xml new file mode 100644 index 00000000000..e1588bc62b5 --- /dev/null +++ b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_EQ_AllZero.xml @@ -0,0 +1,296 @@ + + + 2021-03-01T23:00:00Z + 2021-03-02T10:22:58Z + Phase angle clock + 001 + http://entsoe.eu/CIM/EquipmentCore/3/1 + http://entsoe.eu/CIM/EquipmentOperation/3/1 + powsybl.org + + + Geographical region + + + Subgeographical region + + + + Substation + + + + Voltage level 400 kV + + + + + Voltage level 120 kV + + + + + Voltage level 30 kV + + + + + Voltage level 11.5 kV + + + + + Power transformer 2-windings + + + + Power transformer 2-w end 1 + 0 + 1 + false + 0 + + + 0 + + 0 + 0 + 100 + 0 + 120 + 0 + 0.72 + 0.72 + 17.2649937 + 17.2649937 + + + + Terminal T2W_1 + 1 + + + + + Node 1 + + + + Power transformer 2-w end 2 + 2 + false + + + 0 + + 0 + 0 + 100 + 0 + 10.5 + 0 + 0 + 0 + 0 + 0 + + + + Terminal T2W_2 + 2 + + + + + Node 2 + + + + Power transformer 3-windings + + + + Power transformer 3-w end 1 + 0 + 1 + true + 0 + + + 0 + + 0 + 0 + 350 + 0 + 400 + 0 + 0.5942857143 + 0.5942857143 + 96.0051006 + 95.05666 + + + + Terminal T3W_1 + 1 + + + + + Node 3 + + + + Power transformer 3-w end 2 + 0 + 2 + false + 0 + + + 0 + + 0 + 0 + 350 + 0 + 120 + 0 + 0.05348571429 + 0.05348571429 + -0.001121283618 + -0.6881 + + + + Terminal T3W_2 + 2 + + + + + Node 4 + + + + Power transformer 3-w end 3 + 3 + false + + + 0 + + 0 + 0 + 50 + 0 + 30 + 0 + 0.02545714286 + 0.02545714286 + 1.259740894 + 1.176919 + + + + Terminal T3W_3 + 3 + + + + + Node 5 + + + + Series compensator + + 0.1 + 0.1 + false + 1000 + 250 + 1 + 1 + + + + Terminal SEC 1 + 1 + + + + + Terminal SEC 2 + 2 + + + + + Busbar section 1 + + + + Terminal BBS_1 + 1 + + + + + Busbar section 2 + + + + Terminal BBS_2 + 1 + + + + + Busbar section 3 + + + + Terminal BBS_3 + 1 + + + + + Busbar section 4 + + + + Terminal BBS_4 + 1 + + + + + Busbar section 5 + + + + Terminal BBS_5 + 1 + + + + + 400 kV + 400 + + + 120 kV + 120 + + + 30 kV + 30 + + + 11.5 kV + 11.5 + + diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_SSH.xml b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_SSH.xml new file mode 100644 index 00000000000..e5ba2d44b15 --- /dev/null +++ b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_SSH.xml @@ -0,0 +1,46 @@ + + + 2021-03-01T23:00:00Z + 2021-03-02T10:22:58Z + Phase angle clock + 001 + http://entsoe.eu/CIM/SteadyStateHypothesis/1/1 + powsybl.org + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_SV.xml b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_SV.xml new file mode 100644 index 00000000000..b806a5c0be8 --- /dev/null +++ b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_SV.xml @@ -0,0 +1,35 @@ + + + 2021-03-01T23:00:00Z + 2021-03-02T10:22:58Z + Phase angle clock + 001 + http://entsoe.eu/CIM/StateVariables/4/1 + powsybl.org + + + -0.006085666 + 114.258179 + + + + 0 + 10 + + + + -0.02838281 + 380.740021 + + + + -0.028382808 + 114.222008 + + + + -0.02838281 + 28.5555 + + + diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_TP.xml b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_TP.xml new file mode 100644 index 00000000000..e7769d89d42 --- /dev/null +++ b/cgmes/cgmes-conversion/src/test/resources/issues/transformers/PhaseAngleClock_TP.xml @@ -0,0 +1,71 @@ + + + 2021-03-01T23:00:00Z + 2021-03-02T10:22:58Z + Phase angle clock + 001 + http://entsoe.eu/CIM/Topology/4/1 + powsybl.org + + + Topological node 1 + + + + + Topological node 2 + + + + + Topological node 3 + + + + + Topological node 4 + + + + + Topological node 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +