#798 Update following DYN-2455

Signed-off-by: Dimitri Baron <[email protected]>
dynawo · Oct 24, 2024 · 5ed90db · 5ed90db
1 parent f4a1215
commit 5ed90db
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/sources/Inputs/include/NetworkManager.h b/sources/Inputs/include/NetworkManager.h
@@ -137,7 +137,7 @@ class NetworkManager {
    * @brief Update the network conditioning status based on a component conditioning status
    * @param componentInterface the data interface to use
    */
-  void updateConditioningStatus(const boost::shared_ptr<DYN::ComponentInterface> &componentInterface);
+  void updateConditioningStatus(const std::shared_ptr<DYN::ComponentInterface> &componentInterface);
 
  private:
   boost::shared_ptr<DYN::DataInterface> interface_;           ///< data interface

diff --git a/sources/Inputs/src/NetworkManager.cpp b/sources/Inputs/src/NetworkManager.cpp
@@ -37,7 +37,7 @@
 #include <DYNTwoWTransformerInterface.h>
 #include <DYNVoltageLevelInterface.h>
 #include <DYNVscConverterInterface.h>
-#include <boost/make_shared.hpp>
+
 
 namespace dfl {
 namespace inputs {
@@ -61,7 +61,7 @@ void NetworkManager::updateMapRegulatingBuses(BusMapRegulating &map, const std::
   }
 }
 
-void NetworkManager::updateConditioningStatus(const boost::shared_ptr<DYN::ComponentInterface> &componentInterface) {
+void NetworkManager::updateConditioningStatus(const std::shared_ptr<DYN::ComponentInterface> &componentInterface) {
   if (componentInterface->hasInitialConditions()) {
     isPartiallyConditioned_ = true;
   } else {
@@ -293,7 +293,7 @@ void NetworkManager::buildTree() {
     HvdcLine::ConverterType converterType;
     if (converterDyn1->getConverterType() == DYN::ConverterInterface::ConverterType_t::VSC_CONVERTER) {
       converterType = HvdcLine::ConverterType::VSC;
-      auto vscConverterDyn1 = boost::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn1);
+      auto vscConverterDyn1 = std::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn1);
       updateConditioningStatus(vscConverterDyn1);
       bool voltageRegulationOn = vscConverterDyn1->getVoltageRegulatorOn();
       converter1 = std::make_shared<VSCConverter>(converterDyn1->getID(), converterDyn1->getBusInterface()->getID(), nullptr, voltageRegulationOn,
@@ -302,7 +302,7 @@ void NetworkManager::buildTree() {
       if (voltageRegulationOn) {
         updateMapRegulatingBuses(mapBusIdToNumberOfRegulation_, nodes_[converterDyn1->getBusInterface()->getID()]);
       }
-      auto vscConverterDyn2 = boost::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn2);
+      auto vscConverterDyn2 = std::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn2);
       updateConditioningStatus(vscConverterDyn2);
       voltageRegulationOn = vscConverterDyn2->getVoltageRegulatorOn();
       converter2 = std::make_shared<VSCConverter>(converterDyn2->getID(), converterDyn2->getBusInterface()->getID(), nullptr, voltageRegulationOn,
@@ -313,12 +313,12 @@ void NetworkManager::buildTree() {
       }
     } else {
       converterType = HvdcLine::ConverterType::LCC;
-      auto lccConverterDyn1 = boost::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn1);
+      auto lccConverterDyn1 = std::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn1);
       updateConditioningStatus(lccConverterDyn1);
       converter1 =
           std::make_shared<LCCConverter>(converterDyn1->getID(), converterDyn1->getBusInterface()->getID(), nullptr, lccConverterDyn1->getPowerFactor());
 
-      auto lccConverterDyn2 = boost::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn2);
+      auto lccConverterDyn2 = std::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn2);
       updateConditioningStatus(lccConverterDyn2);
       converter2 =
           std::make_shared<LCCConverter>(converterDyn2->getID(), converterDyn2->getBusInterface()->getID(), nullptr, lccConverterDyn2->getPowerFactor());

diff --git a/tests/algo/TestAlgoDynModel.cpp b/tests/algo/TestAlgoDynModel.cpp
@@ -65,7 +65,7 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
   /**
    * @copydoc DYN::ServiceManagerInterface::getRegulatedBus
    */
-  boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return boost::shared_ptr<DYN::BusInterface>(); }
+  std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return std::shared_ptr<DYN::BusInterface>(); }
 
  private:
   std::unordered_set<std::string> disconnectedNodes_;

diff --git a/tests/algo/TestGeneratorsAlgo.cpp b/tests/algo/TestGeneratorsAlgo.cpp
@@ -83,7 +83,7 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
   /**
    * @copydoc DYN::ServiceManagerInterface::getRegulatedBus
    */
-  boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return boost::shared_ptr<DYN::BusInterface>(); }
+  std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return std::shared_ptr<DYN::BusInterface>(); }
 
  private:
   void updateSet(std::set<std::string> &set, const std::string &str, const std::string &vlid) const {

diff --git a/tests/algo/TestHvdcLineAlgo.cpp b/tests/algo/TestHvdcLineAlgo.cpp
@@ -77,7 +77,7 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
   /**
    * @copydoc DYN::ServiceManagerInterface::getRegulatedBus
    */
-  boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return boost::shared_ptr<DYN::BusInterface>(); }
+  std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return std::shared_ptr<DYN::BusInterface>(); }
 
  private:
   void updateSet(std::set<std::string> &set, const std::string &str, const std::string &vlid) const {

diff --git a/tests/algo/TestSlackNodeAlgo.cpp b/tests/algo/TestSlackNodeAlgo.cpp
@@ -70,8 +70,8 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
   /**
    * @copydoc DYN::ServiceManagerInterface::getRegulatedBus
    */
-  boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string& regulatingComponent) const final {
-    return boost::shared_ptr<DYN::BusInterface>();
+  std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string& regulatingComponent) const final {
+    return std::shared_ptr<DYN::BusInterface>();
   }
 
  private: