Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CGMES import: make substations property bags distinct when their region is defined twice (in BD and IGM) #2507

Merged
merged 6 commits into from
Mar 21, 2023
Merged

CGMES import: make substations property bags distinct when their region is defined twice (in BD and IGM) #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
456d610
CGMES import: make substations property bags distinct when their regi…
miovd Mar 20, 2023
7d62327
Add tests
miovd Mar 20, 2023
db5fa8c
Revert "CGMES import: make substations property bags distinct when th…
miovd Mar 21, 2023
fd408e0
Following Luma's proposition on SPARQL request
miovd Mar 21, 2023
60ef06a
Merge branch 'main' into fix_distinct_cgmes_substations
miovd Mar 21, 2023
a82052f
Merge branch 'main' into fix_distinct_cgmes_substations
zamarrenolm Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...onformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@ public final class CgmesConformity1ModifiedCatalog {
private CgmesConformity1ModifiedCatalog() {
}

public static GridModelReferenceResources microGridBaseCaseDuplicateRegion() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_BE_v2_duplicate_region/";
return new GridModelReferenceResources(
"MicroGrid-BaseCase-BE-duplicate-region",
null,
new ResourceSet(base, MICRO_GRID_BD_EQ),
new ResourceSet(MICRO_GRID_BE_BASE,
MICRO_GRID_BE_EQ,
MICRO_GRID_BE_TP,
MICRO_GRID_BE_SSH,
MICRO_GRID_BE_SV),
new ResourceSet(MICRO_GRID_BD_BASE,
MICRO_GRID_BD_TP));
}

public static GridModelReferenceResources microGridBaseCaseBEUnmergedXnode() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_BE_v2_unmerged_xnode/";
Expand Down
222 changes: 222 additions & 0 deletions ...a-4.0.3/MicroGrid/BaseCase/BC_BE_v2_duplicate_region/MicroGridTestConfiguration_EQ_BD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF xmlns:cim="http://iec.ch/TC57/2013/CIM-schema-cim16#" xmlns:entsoe="http://entsoe.eu/CIM/SchemaExtension/3/1#" xmlns:md="http://iec.ch/TC57/61970-552/ModelDescription/1#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<!-- Exported from CIMSpy EE/CIMdesk on Sat May 30 07:14:51.783. -->
<md:FullModel rdf:about="urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66">
<md:Model.created>2014-06-01T11:20:39</md:Model.created>
<md:Model.scenarioTime>2014-06-01T10:30:00</md:Model.scenarioTime>
<md:Model.version>1</md:Model.version>
<md:Model.description>CGMES Conformity Assessment: &apos;MicroGridTestConfiguration (Boundary MAS)...&apos; 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.</md:Model.description>
<md:Model.modelingAuthoritySet>http://entsoe.eu/Boundary/CGMES/2.4.15</md:Model.modelingAuthoritySet>
<md:Model.profile>http://entsoe.eu/CIM/EquipmentBoundary/3/1</md:Model.profile>
<md:Model.profile>http://entsoe.eu/CIM/EquipmentBoundaryOperation/3/1</md:Model.profile>
</md:FullModel>
<cim:BaseVoltage rdf:ID="_7891a026ba2c42098556665efd13ba94">
<cim:IdentifiedObject.description>Base Voltage 220 kV</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>220 kV</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>220</entsoe:IdentifiedObject.shortName>
<cim:BaseVoltage.nominalVoltage>220</cim:BaseVoltage.nominalVoltage>
</cim:BaseVoltage>
<cim:BaseVoltage rdf:ID="_63893f24-5b4e-407c-9a1e-4ff71121f33c">
<cim:IdentifiedObject.description>Base Voltage 225 kV</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>225 kV</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>225</entsoe:IdentifiedObject.shortName>
<cim:BaseVoltage.nominalVoltage>225</cim:BaseVoltage.nominalVoltage>
</cim:BaseVoltage>
<cim:BaseVoltage rdf:ID="_35cf638d-9a9d-4ae5-ae90-2f01ef898cb6">
<cim:IdentifiedObject.description>Base Voltage 380 kV</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>380 kV</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>380</entsoe:IdentifiedObject.shortName>
<cim:BaseVoltage.nominalVoltage>380</cim:BaseVoltage.nominalVoltage>
</cim:BaseVoltage>
<cim:BaseVoltage rdf:ID="_65dd04e792584b3b912374e35dec032e">
<cim:IdentifiedObject.description>Base Voltage 400 kV</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>400 kV</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>400</entsoe:IdentifiedObject.shortName>
<cim:BaseVoltage.nominalVoltage>400</cim:BaseVoltage.nominalVoltage>
</cim:BaseVoltage>
<cim:ConnectivityNode rdf:ID="_b675a570-cb6e-11e1-bcee-406c8f32ef58">
<cim:IdentifiedObject.description>RG CE; 400 kV; OHL (2)</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>Border_AL11</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>XCA_AL11</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-ES-PT-10004U</entsoe:IdentifiedObject.energyIdentCodeEic>
<entsoe:ConnectivityNode.fromEndIsoCode>ES</entsoe:ConnectivityNode.fromEndIsoCode>
<entsoe:ConnectivityNode.fromEndName>Cartelle</entsoe:ConnectivityNode.fromEndName>
<entsoe:ConnectivityNode.fromEndNameTso>REE</entsoe:ConnectivityNode.fromEndNameTso>
<entsoe:ConnectivityNode.toEndIsoCode>PT</entsoe:ConnectivityNode.toEndIsoCode>
<entsoe:ConnectivityNode.toEndName>Alto Lindoso</entsoe:ConnectivityNode.toEndName>
<entsoe:ConnectivityNode.toEndNameTso>REN</entsoe:ConnectivityNode.toEndNameTso>
<entsoe:ConnectivityNode.boundaryPoint>true</entsoe:ConnectivityNode.boundaryPoint>
<cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource="#_d4affe50316740bdbbf4ae9c7cbf3cfd_X"/>
</cim:ConnectivityNode>
<cim:ConnectivityNode rdf:ID="_b67c8340-cb6e-11e1-bcee-406c8f32ef58">
<cim:IdentifiedObject.description>RG CE; 400 kV; OHL</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>Border_GY11</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>XWI_GY11</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-AT-HU-00002U</entsoe:IdentifiedObject.energyIdentCodeEic>
<entsoe:ConnectivityNode.fromEndIsoCode>AT</entsoe:ConnectivityNode.fromEndIsoCode>
<entsoe:ConnectivityNode.fromEndName>Wien</entsoe:ConnectivityNode.fromEndName>
<entsoe:ConnectivityNode.fromEndNameTso>APG</entsoe:ConnectivityNode.fromEndNameTso>
<entsoe:ConnectivityNode.toEndIsoCode>HU</entsoe:ConnectivityNode.toEndIsoCode>
<entsoe:ConnectivityNode.toEndName>Győr</entsoe:ConnectivityNode.toEndName>
<entsoe:ConnectivityNode.toEndNameTso>MAVIR</entsoe:ConnectivityNode.toEndNameTso>
<entsoe:ConnectivityNode.boundaryPoint>true</entsoe:ConnectivityNode.boundaryPoint>
<cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource="#_f03d65b2a51049ffa533e433721145c1_X"/>
</cim:ConnectivityNode>
<cim:ConnectivityNode rdf:ID="_1c4a9e9c-ef00-42c9-9845-f64f9ca1e57a">
<cim:IdentifiedObject.description>HVDC-AC; 220 kV; OHL</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>Border_HVDC-AC</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>HVDC-AC-1</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-DC-NL-00082X</entsoe:IdentifiedObject.energyIdentCodeEic>
<entsoe:ConnectivityNode.fromEndIsoCode>NL</entsoe:ConnectivityNode.fromEndIsoCode>
<entsoe:ConnectivityNode.fromEndName>HVDC/NL</entsoe:ConnectivityNode.fromEndName>
<entsoe:ConnectivityNode.fromEndNameTso>NL</entsoe:ConnectivityNode.fromEndNameTso>
<entsoe:ConnectivityNode.toEndIsoCode>BE</entsoe:ConnectivityNode.toEndIsoCode>
<entsoe:ConnectivityNode.toEndName>NL_AC-1</entsoe:ConnectivityNode.toEndName>
<entsoe:ConnectivityNode.toEndNameTso>NL-HVDC-1</entsoe:ConnectivityNode.toEndNameTso>
<entsoe:ConnectivityNode.boundaryPoint>true</entsoe:ConnectivityNode.boundaryPoint>
<cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource="#_8FE2EC11-3357-4506-BF11-80302102B3F2"/>
</cim:ConnectivityNode>
<cim:ConnectivityNode rdf:ID="_b67cf870-cb6e-11e1-bcee-406c8f32ef58">
<cim:IdentifiedObject.description>RG CE; 400 kV; OHL (2)</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>Border_MA11</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>XKA_MA11</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-AT-SI-00001T</entsoe:IdentifiedObject.energyIdentCodeEic>
<entsoe:ConnectivityNode.fromEndIsoCode>AT</entsoe:ConnectivityNode.fromEndIsoCode>
<entsoe:ConnectivityNode.fromEndName>Kainachtal</entsoe:ConnectivityNode.fromEndName>
<entsoe:ConnectivityNode.fromEndNameTso>APG</entsoe:ConnectivityNode.fromEndNameTso>
<entsoe:ConnectivityNode.toEndIsoCode>SI</entsoe:ConnectivityNode.toEndIsoCode>
<entsoe:ConnectivityNode.toEndName>Maribor</entsoe:ConnectivityNode.toEndName>
<entsoe:ConnectivityNode.toEndNameTso>ELES</entsoe:ConnectivityNode.toEndNameTso>
<entsoe:ConnectivityNode.boundaryPoint>true</entsoe:ConnectivityNode.boundaryPoint>
<cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource="#_9d25a1f9e5d14d47b6dcde99c4380b40_X"/>
</cim:ConnectivityNode>
<cim:ConnectivityNode rdf:ID="_b66f15c0-cb6e-11e1-bcee-406c8f32ef58">
<cim:IdentifiedObject.description>RG CE; 220 kV; OHL</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>Border_ST23</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>XZE_ST23</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-AT-DE-00016Z</entsoe:IdentifiedObject.energyIdentCodeEic>
<entsoe:ConnectivityNode.fromEndIsoCode>AT</entsoe:ConnectivityNode.fromEndIsoCode>
<entsoe:ConnectivityNode.fromEndName>Zell/Ziller</entsoe:ConnectivityNode.fromEndName>
<entsoe:ConnectivityNode.fromEndNameTso>APG</entsoe:ConnectivityNode.fromEndNameTso>
<entsoe:ConnectivityNode.toEndIsoCode>DE</entsoe:ConnectivityNode.toEndIsoCode>
<entsoe:ConnectivityNode.toEndName>Strass</entsoe:ConnectivityNode.toEndName>
<entsoe:ConnectivityNode.toEndNameTso>TIWAG-Netz</entsoe:ConnectivityNode.toEndNameTso>
<entsoe:ConnectivityNode.boundaryPoint>true</entsoe:ConnectivityNode.boundaryPoint>
<cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource="#_8d7bad8bcc634e0796e362390d9040b6_X"/>
</cim:ConnectivityNode>
<cim:ConnectivityNode rdf:ID="_b6978550-cb6e-11e1-bcee-406c8f32ef58">
<cim:IdentifiedObject.description>RG CE; 220 kV; OHL</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>Border_ST24</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>XZE_ST24</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-AT-DE-00017X</entsoe:IdentifiedObject.energyIdentCodeEic>
<entsoe:ConnectivityNode.fromEndIsoCode>AT</entsoe:ConnectivityNode.fromEndIsoCode>
<entsoe:ConnectivityNode.fromEndName>Zell/Ziller</entsoe:ConnectivityNode.fromEndName>
<entsoe:ConnectivityNode.fromEndNameTso>APG</entsoe:ConnectivityNode.fromEndNameTso>
<entsoe:ConnectivityNode.toEndIsoCode>DE</entsoe:ConnectivityNode.toEndIsoCode>
<entsoe:ConnectivityNode.toEndName>Strass</entsoe:ConnectivityNode.toEndName>
<entsoe:ConnectivityNode.toEndNameTso>TIWAG-Netz</entsoe:ConnectivityNode.toEndNameTso>
<entsoe:ConnectivityNode.boundaryPoint>true</entsoe:ConnectivityNode.boundaryPoint>
<cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource="#_1fa19c281c8f4e1eaad9e1cab70f923e_X"/>
</cim:ConnectivityNode>
<cim:GeographicalRegion rdf:ID="_7e6dab445e92469892d1dcc3421cce1a">
<cim:IdentifiedObject.description>Economic and political union of member states located primarily in Europe</cim:IdentifiedObject.description>
<cim:IdentifiedObject.name>EU</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-EU-EU-000001</entsoe:IdentifiedObject.energyIdentCodeEic>
<entsoe:IdentifiedObject.shortName>EU</entsoe:IdentifiedObject.shortName>
</cim:GeographicalRegion>
<cim:Junction rdf:ID="_5249A78F-6642-4fc5-968F-06E2ED18FAB7">
<cim:IdentifiedObject.name>Junction_XJ1</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>Junction at XJ1</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>XJ1</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-BE-NL-70314J</entsoe:IdentifiedObject.energyIdentCodeEic>
<cim:Equipment.EquipmentContainer rdf:resource="#_f03d65b2a51049ffa533e433721145c1_X"/>
</cim:Junction>
<cim:Line rdf:ID="_8FE2EC11-3357-4506-BF11-80302102B3F2">
<cim:IdentifiedObject.name>TieLine_HVDC-NL</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>HVDC TieLine at NL</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>HVDC_NL</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-BE-NL-10344U</entsoe:IdentifiedObject.energyIdentCodeEic>
<cim:Line.Region rdf:resource="#_d81ceddefca04ab8960433e4a8839325"/>
</cim:Line>
<cim:Line rdf:ID="_d4affe50316740bdbbf4ae9c7cbf3cfd_X">
<cim:IdentifiedObject.name>TieLine_XCA_AL11</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>TieLine at XCA_AL11</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>XCA_AL11</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-BE-NL-10314U</entsoe:IdentifiedObject.energyIdentCodeEic>
<cim:Line.Region rdf:resource="#_d81ceddefca04ab8960433e4a8839325"/>
</cim:Line>
<cim:Line rdf:ID="_9d25a1f9e5d14d47b6dcde99c4380b40_X">
<cim:IdentifiedObject.name>TieLine_XKA_MA11</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>TieLine at XKA_MA11</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>XKA_MA11</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-BE-NL-10114U</entsoe:IdentifiedObject.energyIdentCodeEic>
<cim:Line.Region rdf:resource="#_d81ceddefca04ab8960433e4a8839325"/>
</cim:Line>
<cim:Line rdf:ID="_f03d65b2a51049ffa533e433721145c1_X">
<cim:IdentifiedObject.name>TieLine_XWI_GY11</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>TieLine at XWI_GY11</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>XWI_GY11</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-BE-NL-10014U</entsoe:IdentifiedObject.energyIdentCodeEic>
<cim:Line.Region rdf:resource="#_d81ceddefca04ab8960433e4a8839325"/>
</cim:Line>
<cim:Line rdf:ID="_8d7bad8bcc634e0796e362390d9040b6_X">
<cim:IdentifiedObject.name>TieLine_XZE_ST23</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>TieLine at XZE_ST23</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>XZE_ST23</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-BE-NL-10234U</entsoe:IdentifiedObject.energyIdentCodeEic>
<cim:Line.Region rdf:resource="#_d81ceddefca04ab8960433e4a8839325"/>
</cim:Line>
<cim:Line rdf:ID="_1fa19c281c8f4e1eaad9e1cab70f923e_X">
<cim:IdentifiedObject.name>TieLine_XZE_ST24</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>TieLine at XZE_ST24</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>XZE_ST24</entsoe:IdentifiedObject.shortName>
<entsoe:IdentifiedObject.energyIdentCodeEic>10T-BE-NL-10274U</entsoe:IdentifiedObject.energyIdentCodeEic>
<cim:Line.Region rdf:resource="#_d81ceddefca04ab8960433e4a8839325"/>
</cim:Line>
<cim:SubGeographicalRegion rdf:ID="_d81ceddefca04ab8960433e4a8839325">
<cim:IdentifiedObject.name>ENTSO-E</cim:IdentifiedObject.name>
<cim:SubGeographicalRegion.Region rdf:resource="#_7e6dab445e92469892d1dcc3421cce1a"/>
<cim:IdentifiedObject.description>ENTSO-E region</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>ENTSO-E</entsoe:IdentifiedObject.shortName>
</cim:SubGeographicalRegion>
<cim:Terminal rdf:ID="_b9376bea-c55d-40f3-93ca-6a81fa1186a0">
<cim:Terminal.ConductingEquipment rdf:resource="#_5249A78F-6642-4fc5-968F-06E2ED18FAB7"/>
</cim:Terminal>
<entsoe:EnergySchedulingType rdf:ID="_24C12434-E42B-497f-928F-119C6AE92079">
<cim:IdentifiedObject.name>Biomass</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>Generation type Biomass</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>EST-Biomass</entsoe:IdentifiedObject.shortName>
</entsoe:EnergySchedulingType>
<entsoe:EnergySchedulingType rdf:ID="_FB6F43D6-E71E-423a-8CEB-084BC504FD1A">
<cim:IdentifiedObject.name>Co-generation</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>Generation type Co-generation</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>CoGen</entsoe:IdentifiedObject.shortName>
</entsoe:EnergySchedulingType>
<entsoe:EnergySchedulingType rdf:ID="_1CDFB476-4E01-4488-B5A2-FDDEA0488C59">
<cim:IdentifiedObject.name>Geothermal</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>Generation type Geothermal</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>Geotherm</entsoe:IdentifiedObject.shortName>
</entsoe:EnergySchedulingType>
<entsoe:EnergySchedulingType rdf:ID="_2C897906-9B7F-4508-B132-74EA3EE1D3B0">
<cim:IdentifiedObject.name>Marine</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>Generation type Marine</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>ES-Marine</entsoe:IdentifiedObject.shortName>
</entsoe:EnergySchedulingType>
<entsoe:EnergySchedulingType rdf:ID="_A43C7A90-B4C7-460c-A607-942EFA3EFB79">
<cim:IdentifiedObject.name>Other renewable</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>Generation type Other renewable</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>OtherRenew</entsoe:IdentifiedObject.shortName>
</entsoe:EnergySchedulingType>
<entsoe:EnergySchedulingType rdf:ID="_1C405140-0F45-4534-9C90-F38F4905362C">
<cim:IdentifiedObject.name>Waste</cim:IdentifiedObject.name>
<cim:IdentifiedObject.description>Generation type Waste</cim:IdentifiedObject.description>
<entsoe:IdentifiedObject.shortName>EST-Waste</entsoe:IdentifiedObject.shortName>
</entsoe:EnergySchedulingType>
<cim:SubGeographicalRegion rdf:ID="_c1d5c0378f8011e08e4d00247eb1f55e">
<cim:IdentifiedObject.name>ELIA-Anvers</cim:IdentifiedObject.name>
<cim:SubGeographicalRegion.Region rdf:resource="#_regionTest"/>
</cim:SubGeographicalRegion>
<cim:GeographicalRegion rdf:ID="_regionTest">
<cim:IdentifiedObject.name>test</cim:IdentifiedObject.name>
</cim:GeographicalRegion>
</rdf:RDF>
7 changes: 7 additions & 0 deletions ...ybl/cgmes/conversion/test/conformity/modified/CgmesConformity1ModifiedConversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ void microBEExplicitBase() {
assertNotNull(network);
}

@Test
void microBEDuplicateRegion() {
Network network = new CgmesImport()
.importData(CgmesConformity1ModifiedCatalog.microGridBaseCaseDuplicateRegion().dataSource(), NetworkFactory.findDefault(), null);
assertNotNull(network);
}

@Test
void microBERatioPhaseTabularTest() {
Network network = new CgmesImport()
Expand Down
40 changes: 29 additions & 11 deletions cgmes/cgmes-model/src/main/resources/CIM16.sparql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,37 @@ SELECT *
}}

# query: substations
SELECT ?Substation ?name ?SubRegion ?subRegionName ?Region ?regionName
{ GRAPH ?graph {
SELECT *
WHERE {
?Substation
a cim:Substation ;
cim:IdentifiedObject.name ?name ;
cim:Substation.Region ?SubRegion .
} GRAPH ?graph2 {
?SubRegion
cim:SubGeographicalRegion.Region ?Region ;
cim:IdentifiedObject.name ?subRegionName .
} GRAPH ?graph3 {
?Region cim:IdentifiedObject.name ?regionName .
}}
cim:IdentifiedObject.name ?name .
# Optional is required to keep the ?Substation variable already bounded in the sub-queries ...
OPTIONAL {
{
SELECT ?SubRegion
WHERE {
?Substation cim:Substation.Region ?SubRegion .
?SubRegion a cim:SubGeographicalRegion .
}
LIMIT 1
}
?SubRegion cim:IdentifiedObject.name ?subRegionName .
OPTIONAL {
{
SELECT ?Region
WHERE {
?SubRegion cim:SubGeographicalRegion.Region ?Region .
?Region a cim:GeographicalRegion .
}
LIMIT 1
}
?Region cim:IdentifiedObject.name ?regionName .
}
}
# ... But we do not want results where the regions are missing
FILTER (bound(?SubRegion) && bound(?Region))
}

# query: voltageLevels
SELECT *
Expand Down