Cgmes import update. Import EQ and SSH separately. SvInjections

cgmes/cgmes-completion/src/test/java/com/powsybl/cgmes/completion/CgmesCompletionTest.java

@@ -10,16 +10,13 @@
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
 import com.powsybl.cgmes.conversion.CgmesImport;
-import com.powsybl.cgmes.conversion.CgmesModelExtension;
-import com.powsybl.cgmes.model.CgmesModel;
 import com.powsybl.commons.config.InMemoryPlatformConfig;
 import com.powsybl.commons.datasource.ReadOnlyDataSource;
 import com.powsybl.commons.datasource.ResourceDataSource;
 import com.powsybl.commons.datasource.ResourceSet;
 import com.powsybl.computation.ComputationManager;
 import com.powsybl.computation.local.LocalComputationManager;
-import com.powsybl.iidm.network.Importers;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.*;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -74,10 +71,11 @@ void miniGridNodeBreakerMissingVoltageLevel() throws IOException {
         }
         assertNotNull(network);
 
-        // Check that a specific terminal has a voltage level, navigating the CGMES model
-        CgmesModel cgmes = network.getExtension(CgmesModelExtension.class).getCgmesModel();
+        // Check that a specific terminal has a voltage level, by using the alias to get the busBarSection
         String terminalId = "T_BBS";
-        String voltageLevelId = cgmes.voltageLevel(cgmes.terminal(terminalId), cgmes.isNodeBreaker());
+        Connectable<?> connectable = network.getConnectable(terminalId);
+        BusbarSection busBarSection = (BusbarSection) connectable;
+        String voltageLevelId = busBarSection.getTerminal().getVoltageLevel().getId();
         if (voltageLevelId == null || voltageLevelId.isEmpty()) {
             fail("Missing voltage level for terminal " + terminalId);
         }

cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_BE_v2_hidden_tc/MicroGridTestConfiguration_BC_BE_SSH_V2.xml

@@ -178,15 +178,15 @@
     <cim:TapChanger.controlEnabled>true</cim:TapChanger.controlEnabled>
   </cim:PhaseTapChangerAsymmetrical>
   <cim:PhaseTapChangerSymmetrical rdf:about="#_6ebbef67-3061-4236-a6fd-6ccc4595f6c3-x">
-    <cim:TapChanger.step>3</cim:TapChanger.step>
+    <cim:TapChanger.step>9</cim:TapChanger.step>
     <cim:TapChanger.controlEnabled>false</cim:TapChanger.controlEnabled>
   </cim:PhaseTapChangerSymmetrical>
   <cim:RatioTapChanger rdf:about="#_955d9cd0-4a10-4031-b008-60c0dc340a07">
     <cim:TapChanger.step>10</cim:TapChanger.step>
     <cim:TapChanger.controlEnabled>false</cim:TapChanger.controlEnabled>
   </cim:RatioTapChanger>
   <cim:RatioTapChanger rdf:about="#_955d9cd0-4a10-4031-b008-60c0dc340a07-x">
-    <cim:TapChanger.step>5</cim:TapChanger.step>
+    <cim:TapChanger.step>12</cim:TapChanger.step>
     <cim:TapChanger.controlEnabled>false</cim:TapChanger.controlEnabled>
   </cim:RatioTapChanger>
   <cim:RatioTapChanger rdf:about="#_83cc66dd-8d93-4a2c-8103-f1f5a9cf7e2e">

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/CgmesBoundary.java

@@ -10,7 +10,6 @@
 
 import com.powsybl.cgmes.conversion.BoundaryEquipment.BoundaryEquipmentType;
 import com.powsybl.cgmes.model.CgmesModel;
-import com.powsybl.cgmes.model.PowerFlow;
 import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 import org.slf4j.Logger;
@@ -31,7 +30,6 @@ public CgmesBoundary(CgmesModel cgmes) {
         PropertyBags bns = cgmes.boundaryNodes();
         nodesName = new HashMap<>();
         topologicalNodes = new HashMap<>();
-        connectivityNodes = new HashMap<>();
         lineAtNodes = new HashMap<>();
         hvdcNodes = new HashSet<>();
         if (bns != null) {
@@ -52,7 +50,6 @@ public CgmesBoundary(CgmesModel cgmes) {
                 String tnName = node.get("topologicalNodeName");
                 nodesName.put(tn, tnName);
                 topologicalNodes.put(tnName, tn);
-                connectivityNodes.put(tnName, cn);
                 if (isDcNode(node)) {
                     hvdcNodes.add(cn);
                     hvdcNodes.add(tn);
@@ -70,8 +67,6 @@ public CgmesBoundary(CgmesModel cgmes) {
         }
         nodesEquipment = new HashMap<>();
         nodesEquivalentInjections = new HashMap<>();
-        nodesPowerFlow = new HashMap<>();
-        nodesVoltage = new HashMap<>();
     }
 
     public static boolean isDcNode(PropertyBag node) {
@@ -88,14 +83,6 @@ public boolean containsNode(String id) {
         return nodes.contains(id);
     }
 
-    public boolean hasPowerFlow(String node) {
-        return nodesPowerFlow.containsKey(node);
-    }
-
-    public PowerFlow powerFlowAtNode(String node) {
-        return nodesPowerFlow.get(node);
-    }
-
     public void addAcLineSegmentAtNode(PropertyBag line, String node) {
         List<BoundaryEquipment> equipment;
         equipment = nodesEquipment.computeIfAbsent(node, ls -> new ArrayList<>(2));
@@ -124,30 +111,7 @@ public void addEquivalentInjectionAtNode(PropertyBag equivalentInjection, String
         nodesEquivalentInjections.computeIfAbsent(node, ls -> new ArrayList<>(2)).add(equivalentInjection);
     }
 
-    public void addPowerFlowAtNode(String node, PowerFlow f) {
-        nodesPowerFlow.compute(node, (n, f0) -> f0 == null ? f : f0.sum(f));
-    }
-
-    public void addVoltageAtBoundary(String node, double v, double angle) {
-        Voltage voltage = new Voltage();
-        voltage.v = v;
-        voltage.angle = angle;
-        nodesVoltage.put(node, voltage);
-    }
-
-    public boolean hasVoltage(String node) {
-        return nodesVoltage.containsKey(node);
-    }
-
-    public double vAtBoundary(String node) {
-        return nodesVoltage.containsKey(node) ? nodesVoltage.get(node).v : Double.NaN;
-    }
-
-    public double angleAtBoundary(String node) {
-        return nodesVoltage.containsKey(node) ? nodesVoltage.get(node).angle : Double.NaN;
-    }
-
-    public List<BoundaryEquipment> boundaryEquipmentAtNode(String node) {
+    List<BoundaryEquipment> boundaryEquipmentAtNode(String node) {
         return nodesEquipment.getOrDefault(node, Collections.emptyList());
     }
 
@@ -171,27 +135,11 @@ public Collection<String> xnodesNames() {
         return topologicalNodes.keySet();
     }
 
-    public String topologicalNodeAtBoundary(String xnodeName) {
-        return topologicalNodes.get(xnodeName);
-    }
-
-    public String connectivityNodeAtBoundary(String xnodeName) {
-        return connectivityNodes.get(xnodeName);
-    }
-
-    private static final class Voltage {
-        double v;
-        double angle;
-    }
-
     private final Set<String> nodes;
     private final Map<String, List<BoundaryEquipment>> nodesEquipment;
     private final Map<String, List<PropertyBag>> nodesEquivalentInjections;
-    private final Map<String, PowerFlow> nodesPowerFlow;
-    private final Map<String, Voltage> nodesVoltage;
     private final Map<String, String> nodesName;
     private final Map<String, String> topologicalNodes;
-    private final Map<String, String> connectivityNodes;
     private final Map<String, String> lineAtNodes;
     private final Set<String> hvdcNodes;
 

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/CgmesImport.java

@@ -176,6 +176,21 @@ private Network importData1(ReadOnlyDataSource ds, NetworkFactory networkFactory
         return new Conversion(cgmes, config(p), activatedPreProcessors(p), activatedPostProcessors(p), networkFactory).convert(conversionReportNode);
     }
 
+    @Override
+    public void update(Network network, ReadOnlyDataSource ds, Properties p, ReportNode reportNode) {
+        TripleStoreOptions tripleStoreOptions = new TripleStoreOptions();
+        tripleStoreOptions.setQueryCatalog("-update");
+        ReadOnlyDataSource alternativeDataSourceForBoundary = null;
+        CgmesModel cgmes = CgmesModelFactory.create(
+                ds,
+                alternativeDataSourceForBoundary,
+                TripleStoreFactory.DEFAULT_IMPLEMENTATION,
+                reportNode,
+                tripleStoreOptions);
+        Conversion conversion = new Conversion(cgmes, config(p));
+        conversion.update(network, reportNode);
+    }
+
     static class FilteredReadOnlyDataSource implements ReadOnlyDataSource {
         private final ReadOnlyDataSource ds;
         private final Predicate<String> filter;

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/CgmesReports.java

@@ -17,6 +17,9 @@
  */
 public final class CgmesReports {
 
+    private static final String EQUIPMENT_ID = "equipmentId";
+    private static final String ELEMENT_TYPE = "elementType";
+
     private CgmesReports() {
     }
 
@@ -46,7 +49,23 @@ public static ReportNode buildingMappingsReport(ReportNode reportNode) {
     public static ReportNode convertingElementTypeReport(ReportNode reportNode, String elementType) {
         return reportNode.newReportNode()
                 .withMessageTemplate("convertingElementType", "Converting ${elementType}.")
-                .withUntypedValue("elementType", elementType)
+                .withUntypedValue(ELEMENT_TYPE, elementType)
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .add();
+    }
+
+    public static ReportNode convertingDuringUpdateElementTypeReport(ReportNode reportNode, String elementType) {
+        return reportNode.newReportNode()
+                .withMessageTemplate("convertingDuringUpdateElementType", "Converting during update ${elementType}.")
+                .withUntypedValue(ELEMENT_TYPE, elementType)
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .add();
+    }
+
+    public static ReportNode updatingElementTypeReport(ReportNode reportNode, String elementType) {
+        return reportNode.newReportNode()
+                .withMessageTemplate("updatingElementType", "Updating ${elementType}.")
+                .withUntypedValue(ELEMENT_TYPE, elementType)
                 .withSeverity(TypedValue.INFO_SEVERITY)
                 .add();
     }
@@ -84,38 +103,37 @@ public static void importedCgmesNetworkReport(ReportNode reportNode, String netw
     public static void badVoltageTargetValueRegulatingControlReport(ReportNode reportNode, String eqId, double targetValue) {
         reportNode.newReportNode()
                 .withMessageTemplate("badVoltageTargetValueRegulatingControl", "Equipment ${equipmentId} has a regulating control with bad target value for voltage: ${targetValue}.")
-                .withUntypedValue("equipmentId", eqId)
+                .withUntypedValue(EQUIPMENT_ID, eqId)
                 .withTypedValue("targetValue", targetValue, TypedValue.VOLTAGE)
                 .withSeverity(TypedValue.WARN_SEVERITY)
                 .add();
     }
 
-    public static void badTargetDeadbandRegulatingControlReport(ReportNode reportNode, String eqId, double targetDeadband) {
+    public static void badTargetValueRegulatingControlReport(ReportNode reportNode, String eqId, double targetValue) {
         reportNode.newReportNode()
-                .withMessageTemplate("badTargetDeadbandRegulatingControl", "Equipment ${equipmentId} has a regulating control with bad target deadband: ${targetDeadband}.")
-                .withUntypedValue("equipmentId", eqId)
-                .withTypedValue("targetDeadband", targetDeadband, TypedValue.VOLTAGE)
+                .withMessageTemplate("badTargetValueRegulatingControl", "Equipment ${equipmentId} has a regulating control with bad target value: ${targetValue}.")
+                .withUntypedValue(EQUIPMENT_ID, eqId)
+                .withUntypedValue("targetValue", targetValue)
                 .withSeverity(TypedValue.WARN_SEVERITY)
                 .add();
     }
 
-    public static void invalidAngleVoltageBusReport(ReportNode reportNode, Bus bus, String nodeId, double v, double angle) {
+    public static void badTargetDeadbandRegulatingControlReport(ReportNode reportNode, String eqId, double targetDeadband) {
         reportNode.newReportNode()
-                .withMessageTemplate("invalidAngleVoltageBus", "Node ${nodeId} in substation ${substation}, voltageLevel ${voltageLevel}, bus ${bus} has invalid value for voltage and/or angle. Voltage magnitude is ${voltage}, angle is ${angle}.")
-                .withUntypedValue("substation", bus.getVoltageLevel().getSubstation().map(Substation::getNameOrId).orElse("unknown"))
-                .withUntypedValue("voltageLevel", bus.getVoltageLevel().getNameOrId())
-                .withUntypedValue("bus", bus.getId())
-                .withUntypedValue("nodeId", nodeId)
-                .withTypedValue("voltage", v, TypedValue.VOLTAGE)
-                .withTypedValue("angle", angle, TypedValue.ANGLE)
+                .withMessageTemplate("badTargetDeadbandRegulatingControl", "Equipment ${equipmentId} has a regulating control with bad target deadband: ${targetDeadband}.")
+                .withUntypedValue(EQUIPMENT_ID, eqId)
+                .withUntypedValue("targetDeadband", targetDeadband)
                 .withSeverity(TypedValue.WARN_SEVERITY)
                 .add();
     }
 
-    public static void invalidAngleVoltageNodeReport(ReportNode reportNode, String nodeId, double v, double angle) {
+    public static void invalidAngleVoltageReport(ReportNode reportNode, Bus bus, String topologicalNode, double v, double angle) {
         reportNode.newReportNode()
-                .withMessageTemplate("invalidAngleVoltageNode", "Node ${nodeId} has invalid value for voltage and/or angle. Voltage magnitude is ${voltage}, angle is ${angle}.")
-                .withUntypedValue("nodeId", nodeId)
+                .withMessageTemplate("invalidAngleVoltageBus", "Bus ${bus} in substation ${substation}, voltageLevel ${voltageLevel}, has invalid value for voltage and/or angle. Voltage magnitude is ${voltage}, angle is ${angle}.")
+                .withUntypedValue("substation", bus.getVoltageLevel().getSubstation().map(Substation::getNameOrId).orElse("unknown"))
+                .withUntypedValue("voltageLevel", bus.getVoltageLevel().getNameOrId())
+                .withUntypedValue("bus", bus.getId())
+                .withUntypedValue("topologicalNode", topologicalNode)
                 .withTypedValue("voltage", v, TypedValue.VOLTAGE)
                 .withTypedValue("angle", angle, TypedValue.ANGLE)
                 .withSeverity(TypedValue.WARN_SEVERITY)

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Context.java

@@ -18,6 +18,7 @@
 import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.Terminal;
+import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +57,7 @@ public Context(CgmesModel cgmes, Config config, Network network, ReportNode repo
         dcMapping = new DcMapping(this);
         loadingLimitsMapping = new LoadingLimitsMapping(this);
         regulatingControlMapping = new RegulatingControlMapping(this);
-        nodeMapping = new NodeMapping(this);
+        nodeMapping = new NodeMapping();
 
         cachedGroupedTransformerEnds = new HashMap<>();
         cachedGroupedRatioTapChangers = new HashMap<>();
@@ -67,6 +68,16 @@ public Context(CgmesModel cgmes, Config config, Network network, ReportNode repo
         cachedGroupedReactiveCapabilityCurveData = new HashMap<>();
 
         buildCaches();
+
+        cgmesTerminals = new HashMap<>();
+        ratioTapChangers = new HashMap<>();
+        phaseTapChangers = new HashMap<>();
+        regulatingControls = new HashMap<>();
+        operationalLimits = new HashMap<>();
+        generatingUnits = new HashMap<>();
+        equivalentInjections = new HashMap<>();
+        svVoltages = new HashMap<>();
+        switches = new HashMap<>();
     }
 
     public CgmesModel cgmes() {
@@ -103,6 +114,11 @@ public void convertedTerminal(String terminalId, Terminal t, int n, PowerFlow f)
         }
     }
 
+    public void convertedTerminalWithOnlyEq(String terminalId, Terminal t, int n) {
+        // Record the mapping between CGMES and IIDM terminals
+        terminalMapping().add(terminalId, t, n);
+    }
+
     private boolean setPQAllowed(Terminal t) {
         return t.getConnectable().getType() != IdentifiableType.BUSBAR_SECTION;
     }
@@ -186,6 +202,61 @@ public PropertyBags reactiveCapabilityCurveData(String curveId) {
         return cachedGroupedReactiveCapabilityCurveData.getOrDefault(curveId, new PropertyBags());
     }
 
+    public void buildUpdateCache() {
+        buildUpdateCache(cgmesTerminals, cgmes.terminals(), CgmesNames.TERMINAL);
+        buildUpdateCache(ratioTapChangers, cgmes.ratioTapChangers(), CgmesNames.RATIO_TAP_CHANGER);
+        buildUpdateCache(phaseTapChangers, cgmes.phaseTapChangers(), CgmesNames.PHASE_TAP_CHANGER);
+        buildUpdateCache(regulatingControls, cgmes.regulatingControls(), CgmesNames.REGULATING_CONTROL);
+        buildUpdateCache(operationalLimits, cgmes.operationalLimits(), CgmesNames.OPERATIONAL_LIMIT);
+        buildUpdateCache(generatingUnits, cgmes.generatingUnits(), CgmesNames.GENERATING_UNIT);
+        buildUpdateCache(equivalentInjections, cgmes.equivalentInjections(), CgmesNames.EQUIVALENT_INJECTION);
+        buildUpdateCache(svVoltages, cgmes.svVoltages(), CgmesNames.TOPOLOGICAL_NODE);
+        buildUpdateCache(switches, cgmes.switches(), CgmesNames.SWITCH);
+    }
+
+    private static void buildUpdateCache(Map<String, PropertyBag> cache, PropertyBags cgmesPropertyBags, String tagId) {
+        cgmesPropertyBags.forEach(p -> {
+            String id = p.getId(tagId);
+            cache.put(id, p);
+        });
+    }
+
+    public PropertyBag cgmesTerminal(String id) {
+        return cgmesTerminals.get(id);
+    }
+
+    public PropertyBag ratioTapChanger(String id) {
+        return ratioTapChangers.get(id);
+    }
+
+    public PropertyBag phaseTapChanger(String id) {
+        return phaseTapChangers.get(id);
+    }
+
+    public PropertyBag regulatingControl(String id) {
+        return regulatingControls.get(id);
+    }
+
+    public PropertyBag operationalLimit(String id) {
+        return operationalLimits.get(id);
+    }
+
+    public PropertyBag generatingUnit(String id) {
+        return generatingUnits.get(id);
+    }
+
+    public PropertyBag equivalentInjection(String id) {
+        return equivalentInjections.get(id);
+    }
+
+    public PropertyBag svVoltage(String id) {
+        return svVoltages.get(id);
+    }
+
+    public PropertyBag cgmesSwitch(String id) {
+        return switches.get(id);
+    }
+
     // Handling issues found during conversion
 
     public ReportNode getReportNode() {
@@ -302,5 +373,14 @@ private static void logIssue(ConversionIssueCategory category, String what, Supp
     private final Map<String, PropertyBags> cachedGroupedShuntCompensatorPoints;
     private final Map<String, PropertyBags> cachedGroupedReactiveCapabilityCurveData;
 
+    private final Map<String, PropertyBag> cgmesTerminals;
+    private final Map<String, PropertyBag> ratioTapChangers;
+    private final Map<String, PropertyBag> phaseTapChangers;
+    private final Map<String, PropertyBag> regulatingControls;
+    private final Map<String, PropertyBag> operationalLimits;
+    private final Map<String, PropertyBag> generatingUnits;
+    private final Map<String, PropertyBag> equivalentInjections;
+    private final Map<String, PropertyBag> svVoltages;
+    private final Map<String, PropertyBag> switches;
     private static final Logger LOG = LoggerFactory.getLogger(Context.class);
 }