IIDM v1.9.0: fix shunt P serialization

Signed-off-by: Frédéric Vallée <[email protected]>
powsybl · Nov 15, 2023 · 5a020cc · 5a020cc
1 parent 921bebc
commit 5a020cc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 project(powsybl-iidm4cpp)
 
 set(IIDM_VERSION_MAJOR 1)
-set(IIDM_VERSION_MINOR 8)
+set(IIDM_VERSION_MINOR 9)
 set(IIDM_VERSION_PATCH 0)
 set(IIDM_VERSION ${IIDM_VERSION_MAJOR}.${IIDM_VERSION_MINOR}.${IIDM_VERSION_PATCH})
 set(IIDM_SOVERSION ${IIDM_VERSION_MAJOR})

diff --git a/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp b/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp
@@ -38,6 +38,7 @@ MergedXnodeXmlSerializer::MergedXnodeXmlSerializer() :
             .put(converter::xml::IidmXmlVersion::V1_6(), {"1.0", "1.1"})
             .put(converter::xml::IidmXmlVersion::V1_7(), {"1.0", "1.1"})
             .put(converter::xml::IidmXmlVersion::V1_8(), {"1.0", "1.1"})
+            .put(converter::xml::IidmXmlVersion::V1_9(), {"1.0", "1.1"})
             .build(),
         stdcxx::MapBuilder<std::string, std::string>()
             .put("1.0", "http://www.itesla_project.eu/schema/iidm/ext/merged_xnode/1_0")

diff --git a/include/powsybl/iidm/converter/xml/IidmXmlVersion.hpp b/include/powsybl/iidm/converter/xml/IidmXmlVersion.hpp
@@ -72,6 +72,11 @@ class IidmXmlVersion {
      */
     static const IidmXmlVersion& V1_8();
 
+    /**
+     * IIDM V1.9 (http://www.powsybl.org)
+     */
+    static const IidmXmlVersion& V1_9();
+
 public:
     /**
      * Return the list of all supported XIIDM versions

diff --git a/src/iidm/converter/xml/IidmXmlVersion.cpp b/src/iidm/converter/xml/IidmXmlVersion.cpp
@@ -69,14 +69,15 @@ const IidmXmlVersions& IidmXmlVersion::all() {
         std::cref(IidmXmlVersion::V1_5()),
         std::cref(IidmXmlVersion::V1_6()),
         std::cref(IidmXmlVersion::V1_7()),
-        std::cref(IidmXmlVersion::V1_8())
+        std::cref(IidmXmlVersion::V1_8()),
+        std::cref(IidmXmlVersion::V1_9())
     }};
 
     return s_versions;
 }
 
 const IidmXmlVersion& IidmXmlVersion::CURRENT_IIDM_XML_VERSION() {
-    return V1_8();
+    return V1_9();
 }
 
 const IidmXmlVersion& IidmXmlVersion::fromNamespaceURI(const std::string& namespaceURI) {
@@ -169,6 +170,11 @@ const IidmXmlVersion& IidmXmlVersion::V1_8() {
     return V1_8;
 }
 
+const IidmXmlVersion& IidmXmlVersion::V1_9() {
+    static IidmXmlVersion V1_9("powsybl.org", {{1, 9}});
+    return V1_9;
+}
+
 }  // namespace xml
 
 }  // namespace converter

diff --git a/src/iidm/converter/xml/ShuntCompensatorXml.cpp b/src/iidm/converter/xml/ShuntCompensatorXml.cpp
@@ -170,7 +170,8 @@ void ShuntCompensatorXml::writeRootElementAttributes(const ShuntCompensator& shu
     IidmXmlUtil::writeDoubleAttributeFromMinimumVersion(SHUNT, TARGET_V, shuntCompensator.getTargetV(), ErrorMessage::NOT_DEFAULT_NOT_SUPPORTED, IidmXmlVersion::V1_2(), context);
     IidmXmlUtil::writeDoubleAttributeFromMinimumVersion(SHUNT, TARGET_DEADBAND, shuntCompensator.getTargetDeadband(), ErrorMessage::NOT_DEFAULT_NOT_SUPPORTED, IidmXmlVersion::V1_2(), context);
     writeNodeOrBus(shuntCompensator.getTerminal(), context);
-    writePQ(shuntCompensator.getTerminal(), context.getWriter());
+    IidmXmlUtil::runFromMinimumVersion(IidmXmlVersion::V1_9(), context.getVersion(), [&context, &shuntCompensator]() { context.getWriter().writeOptionalAttribute(P, shuntCompensator.getTerminal().getP()); });
+    context.getWriter().writeOptionalAttribute(Q, shuntCompensator.getTerminal().getQ());
 }
 
 void ShuntCompensatorXml::writeSubElements(const ShuntCompensator& sc, const VoltageLevel& /*voltageLevel*/, NetworkXmlWriterContext& context) const {

diff --git a/src/iidm/extensions/SlackTerminalXmlSerializer.cpp b/src/iidm/extensions/SlackTerminalXmlSerializer.cpp
@@ -36,6 +36,7 @@ SlackTerminalXmlSerializer::SlackTerminalXmlSerializer() :
               .put(converter::xml::IidmXmlVersion::V1_6(), {"1.2"})
               .put(converter::xml::IidmXmlVersion::V1_7(), {"1.2"})
               .put(converter::xml::IidmXmlVersion::V1_8(), {"1.2"})
+              .put(converter::xml::IidmXmlVersion::V1_9(), {"1.2"})
               .build(),
           stdcxx::MapBuilder<std::string, std::string>()
               .put("1.0", "http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_0")