Skip to content

Commit 4c0a9d8

Browse files
committed
#798 Update following DYN-2455 (following Part. 2)
Signed-off-by: Dimitri Baron <[email protected]>
1 parent f4a1215 commit 4c0a9d8

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

sources/Inputs/include/NetworkManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class NetworkManager {
137137
* @brief Update the network conditioning status based on a component conditioning status
138138
* @param componentInterface the data interface to use
139139
*/
140-
void updateConditioningStatus(const boost::shared_ptr<DYN::ComponentInterface> &componentInterface);
140+
void updateConditioningStatus(const std::shared_ptr<DYN::ComponentInterface> &componentInterface);
141141

142142
private:
143143
boost::shared_ptr<DYN::DataInterface> interface_; ///< data interface

sources/Inputs/src/NetworkManager.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <DYNTwoWTransformerInterface.h>
3838
#include <DYNVoltageLevelInterface.h>
3939
#include <DYNVscConverterInterface.h>
40-
#include <boost/make_shared.hpp>
40+
4141

4242
namespace dfl {
4343
namespace inputs {
@@ -61,7 +61,7 @@ void NetworkManager::updateMapRegulatingBuses(BusMapRegulating &map, const std::
6161
}
6262
}
6363

64-
void NetworkManager::updateConditioningStatus(const boost::shared_ptr<DYN::ComponentInterface> &componentInterface) {
64+
void NetworkManager::updateConditioningStatus(const std::shared_ptr<DYN::ComponentInterface> &componentInterface) {
6565
if (componentInterface->hasInitialConditions()) {
6666
isPartiallyConditioned_ = true;
6767
} else {
@@ -293,7 +293,7 @@ void NetworkManager::buildTree() {
293293
HvdcLine::ConverterType converterType;
294294
if (converterDyn1->getConverterType() == DYN::ConverterInterface::ConverterType_t::VSC_CONVERTER) {
295295
converterType = HvdcLine::ConverterType::VSC;
296-
auto vscConverterDyn1 = boost::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn1);
296+
auto vscConverterDyn1 = std::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn1);
297297
updateConditioningStatus(vscConverterDyn1);
298298
bool voltageRegulationOn = vscConverterDyn1->getVoltageRegulatorOn();
299299
converter1 = std::make_shared<VSCConverter>(converterDyn1->getID(), converterDyn1->getBusInterface()->getID(), nullptr, voltageRegulationOn,
@@ -302,7 +302,7 @@ void NetworkManager::buildTree() {
302302
if (voltageRegulationOn) {
303303
updateMapRegulatingBuses(mapBusIdToNumberOfRegulation_, nodes_[converterDyn1->getBusInterface()->getID()]);
304304
}
305-
auto vscConverterDyn2 = boost::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn2);
305+
auto vscConverterDyn2 = std::dynamic_pointer_cast<DYN::VscConverterInterface>(converterDyn2);
306306
updateConditioningStatus(vscConverterDyn2);
307307
voltageRegulationOn = vscConverterDyn2->getVoltageRegulatorOn();
308308
converter2 = std::make_shared<VSCConverter>(converterDyn2->getID(), converterDyn2->getBusInterface()->getID(), nullptr, voltageRegulationOn,
@@ -313,12 +313,12 @@ void NetworkManager::buildTree() {
313313
}
314314
} else {
315315
converterType = HvdcLine::ConverterType::LCC;
316-
auto lccConverterDyn1 = boost::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn1);
316+
auto lccConverterDyn1 = std::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn1);
317317
updateConditioningStatus(lccConverterDyn1);
318318
converter1 =
319319
std::make_shared<LCCConverter>(converterDyn1->getID(), converterDyn1->getBusInterface()->getID(), nullptr, lccConverterDyn1->getPowerFactor());
320320

321-
auto lccConverterDyn2 = boost::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn2);
321+
auto lccConverterDyn2 = std::dynamic_pointer_cast<DYN::LccConverterInterface>(converterDyn2);
322322
updateConditioningStatus(lccConverterDyn2);
323323
converter2 =
324324
std::make_shared<LCCConverter>(converterDyn2->getID(), converterDyn2->getBusInterface()->getID(), nullptr, lccConverterDyn2->getPowerFactor());

tests/algo/TestAlgoDynModel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
6565
/**
6666
* @copydoc DYN::ServiceManagerInterface::getRegulatedBus
6767
*/
68-
boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return boost::shared_ptr<DYN::BusInterface>(); }
68+
std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return std::shared_ptr<DYN::BusInterface>(); }
6969

7070
private:
7171
std::unordered_set<std::string> disconnectedNodes_;

tests/algo/TestGeneratorsAlgo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
8383
/**
8484
* @copydoc DYN::ServiceManagerInterface::getRegulatedBus
8585
*/
86-
boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return boost::shared_ptr<DYN::BusInterface>(); }
86+
std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return std::shared_ptr<DYN::BusInterface>(); }
8787

8888
private:
8989
void updateSet(std::set<std::string> &set, const std::string &str, const std::string &vlid) const {

tests/algo/TestHvdcLineAlgo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
7777
/**
7878
* @copydoc DYN::ServiceManagerInterface::getRegulatedBus
7979
*/
80-
boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return boost::shared_ptr<DYN::BusInterface>(); }
80+
std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string &regulatingComponent) const final { return std::shared_ptr<DYN::BusInterface>(); }
8181

8282
private:
8383
void updateSet(std::set<std::string> &set, const std::string &str, const std::string &vlid) const {

tests/algo/TestSlackNodeAlgo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ class TestAlgoServiceManagerInterface : public DYN::ServiceManagerInterface {
7070
/**
7171
* @copydoc DYN::ServiceManagerInterface::getRegulatedBus
7272
*/
73-
boost::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string& regulatingComponent) const final {
74-
return boost::shared_ptr<DYN::BusInterface>();
73+
std::shared_ptr<DYN::BusInterface> getRegulatedBus(const std::string& regulatingComponent) const final {
74+
return std::shared_ptr<DYN::BusInterface>();
7575
}
7676

7777
private:

0 commit comments

Comments
 (0)