From 837b824bc0c7a3309b78189085928dd245f43ccd Mon Sep 17 00:00:00 2001
From: Le Courtois Florent <florent.lecourtois@rte-france.com>
Date: Wed, 8 Dec 2021 10:10:52 +0100
Subject: [PATCH] #216 Update dyd

---
 sources/Outputs/include/Dyd.h                    |  2 ++
 sources/Outputs/src/Dyd.cpp                      | 14 ++++++++++++--
 .../reference/TestDydShunts/TestDydShunts.dyd    | 16 ++++++++++++----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/sources/Outputs/include/Dyd.h b/sources/Outputs/include/Dyd.h
index 54c6271f8..69f0819ce 100644
--- a/sources/Outputs/include/Dyd.h
+++ b/sources/Outputs/include/Dyd.h
@@ -198,6 +198,8 @@ class Dyd {
    */
   static boost::shared_ptr<dynamicdata::BlackBoxModel> writeShuntRegulation(const inputs::Shunt::BusId& busId, const std::string& basename);
 
+  static boost::shared_ptr<dynamicdata::BlackBoxModel> writeShuntBSections(const inputs::Shunt& shunt, const std::string& basename);
+
   /**
    * @brief Create constant models
    *
diff --git a/sources/Outputs/src/Dyd.cpp b/sources/Outputs/src/Dyd.cpp
index 09a54b6aa..323942fa8 100644
--- a/sources/Outputs/src/Dyd.cpp
+++ b/sources/Outputs/src/Dyd.cpp
@@ -154,9 +154,10 @@ Dyd::write() const {
     auto modelId = constants::computeShuntRegulationId(shuntPair.first);
     dynamicModelsToConnect->addConnect(modelId, "UMonitoredPu_value", constants::networkModelName, shuntPair.first + "_U_value");
     for (auto it = shuntPair.second.begin(); it != shuntPair.second.end(); ++it) {
+      dynamicModelsToConnect->addModel(writeShuntBSections(*it, def_.basename));
       unsigned int i = static_cast<unsigned int>(it - shuntPair.second.begin());
-      dynamicModelsToConnect->addConnect(modelId, "section_" + std::to_string(i) + "_value", constants::networkModelName,
-                                         it->get().id + "_currentSection_value");
+      dynamicModelsToConnect->addConnect(it->get().id, "shunt_section_value", constants::networkModelName, it->get().id + "_currentSection_value");
+      dynamicModelsToConnect->addConnect(modelId, "section_" + std::to_string(i) + "_value", it->get().id, "shunt_section_value");
     }
   }
 
@@ -288,6 +289,15 @@ Dyd::writeShuntRegulation(const inputs::Shunt::BusId& busId, const std::string&
   return model;
 }
 
+boost::shared_ptr<dynamicdata::BlackBoxModel>
+Dyd::writeShuntBSections(const inputs::Shunt& shunt, const std::string& basename) {
+  auto model = dynamicdata::BlackBoxModelFactory::newModel(shunt.id);
+  model->setLib("ShuntBWithSections");
+  model->setParFile(basename + ".par");
+  model->setParId(shunt.id);
+  return model;
+}
+
 boost::shared_ptr<dynamicdata::BlackBoxModel>
 Dyd::writeLoad(const algo::LoadDefinition& load, const std::string& basename) {
   auto model = dynamicdata::BlackBoxModelFactory::newModel(load.id);
diff --git a/tests/outputs/reference/TestDydShunts/TestDydShunts.dyd b/tests/outputs/reference/TestDydShunts/TestDydShunts.dyd
index 48eedce55..95be8bdba 100644
--- a/tests/outputs/reference/TestDydShunts/TestDydShunts.dyd
+++ b/tests/outputs/reference/TestDydShunts/TestDydShunts.dyd
@@ -33,14 +33,22 @@
     <dyn:staticRef var="SVarC_modeHandling_mode_value" staticVar="regulatingMode"/>
     <dyn:staticRef var="SVarC_state" staticVar="state"/>
   </dyn:macroStaticReference>
+  <dyn:blackBoxModel id="1.1" lib="ShuntBWithSections" parFile="TestDydShunts.par" parId="1.1"/>
+  <dyn:blackBoxModel id="1.2" lib="ShuntBWithSections" parFile="TestDydShunts.par" parId="1.2"/>
+  <dyn:blackBoxModel id="3.1" lib="ShuntBWithSections" parFile="TestDydShunts.par" parId="3.1"/>
+  <dyn:blackBoxModel id="3.2" lib="ShuntBWithSections" parFile="TestDydShunts.par" parId="3.2"/>
   <dyn:blackBoxModel id="Model_Signal_N" lib="SignalN"/>
   <dyn:blackBoxModel id="ShuntRegulation_1" lib="DYNModelCentralizedShuntsSectionControl" parFile="TestDydShunts.par" parId="ShuntRegulation_1"/>
   <dyn:blackBoxModel id="ShuntRegulation_3" lib="DYNModelCentralizedShuntsSectionControl" parFile="TestDydShunts.par" parId="ShuntRegulation_3"/>
   <dyn:connect id1="ShuntRegulation_1" var1="UMonitoredPu_value" id2="NETWORK" var2="1_U_value"/>
-  <dyn:connect id1="ShuntRegulation_1" var1="section_0_value" id2="NETWORK" var2="1.2_currentSection_value"/>
-  <dyn:connect id1="ShuntRegulation_1" var1="section_1_value" id2="NETWORK" var2="1.1_currentSection_value"/>
+  <dyn:connect id1="1.2" var1="shunt_section_value" id2="NETWORK" var2="1.2_currentSection_value"/>
+  <dyn:connect id1="ShuntRegulation_1" var1="section_0_value" id2="1.2" var2="shunt_section_value"/>
+  <dyn:connect id1="1.1" var1="shunt_section_value" id2="NETWORK" var2="1.1_currentSection_value"/>
+  <dyn:connect id1="ShuntRegulation_1" var1="section_1_value" id2="1.1" var2="shunt_section_value"/>
   <dyn:connect id1="ShuntRegulation_3" var1="UMonitoredPu_value" id2="NETWORK" var2="3_U_value"/>
-  <dyn:connect id1="ShuntRegulation_3" var1="section_0_value" id2="NETWORK" var2="3.2_currentSection_value"/>
-  <dyn:connect id1="ShuntRegulation_3" var1="section_1_value" id2="NETWORK" var2="3.1_currentSection_value"/>
+  <dyn:connect id1="3.2" var1="shunt_section_value" id2="NETWORK" var2="3.2_currentSection_value"/>
+  <dyn:connect id1="ShuntRegulation_3" var1="section_0_value" id2="3.2" var2="shunt_section_value"/>
+  <dyn:connect id1="3.1" var1="shunt_section_value" id2="NETWORK" var2="3.1_currentSection_value"/>
+  <dyn:connect id1="ShuntRegulation_3" var1="section_1_value" id2="3.1" var2="shunt_section_value"/>
   <dyn:connect id1="Model_Signal_N" var1="signalN_thetaRef" id2="NETWORK" var2="Slack_phi"/>
 </dyn:dynamicModelsArchitecture>