Skip to content

Remove GridElement class #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelesh merged 5 commits into from
Jun 2, 2026
Merged

Remove GridElement class #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
679b27a
Remove BaseBusimpl.hpp
pelesh May 31, 2026
c9eebb3
Remove GridElement class
pelesh May 31, 2026
71ffae3
Apply pre-commmit fixes
pelesh May 31, 2026
1ac11dc
Do not install nonexistant BusBaseImpl.hpp
pelesh Jun 2, 2026
5d13d0b
Remove nonexistant header from gridkit_add_library
pelesh Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions GridKit/Model/PhasorDynamics/Bus/Bus.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace GridKit
class Bus : public BusBase<ScalarT, IdxT>
{
using BusBase<ScalarT, IdxT>::bus_id_;
using BusBase<ScalarT, IdxT>::monitor_;
using BusBase<ScalarT, IdxT>::size_;
using BusBase<ScalarT, IdxT>::y_;
using BusBase<ScalarT, IdxT>::yp_;
Expand All @@ -33,6 +34,7 @@ namespace GridKit

public:
using RealT = typename BusBase<ScalarT, IdxT>::RealT;
using MonitorT = typename BusBase<ScalarT, IdxT>::MonitorT;
using DataT = BusData<RealT, IdxT>;
using BusTypeT = typename BusData<RealT, IdxT>::BusType;

Expand Down
29 changes: 22 additions & 7 deletions GridKit/Model/PhasorDynamics/Bus/BusImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@

#include <GridKit/Model/PhasorDynamics/Bus/Bus.hpp>
#include <GridKit/Model/PhasorDynamics/Bus/BusData.hpp>
#include <GridKit/Model/PhasorDynamics/BusBaseImpl.hpp>
#include <GridKit/Model/VariableMonitorImpl.hpp>

namespace GridKit
{
namespace PhasorDynamics
{
template <typename ScalarT, typename IdxT>
BusBase<ScalarT, IdxT>::~BusBase() = default;

template <typename ScalarT, typename IdxT>
const Model::VariableMonitorBase* BusBase<ScalarT, IdxT>::getMonitor() const
{
return monitor_.get();
}

/*!
* @brief Constructor for a phasor dynamics bus.
Expand Down Expand Up @@ -56,14 +64,21 @@ namespace GridKit
*/
template <class ScalarT, typename IdxT>
Bus<ScalarT, IdxT>::Bus(const DataT& data)
: BusBase<ScalarT, IdxT>(data),
Vr0_(data.Vr0),
: Vr0_(data.Vr0),
Vi0_(data.Vi0)
{
// std::cout << "Create Bus..." << std::endl;
// std::cout << "Number of equations is " << size_ << std::endl;

size_ = 2;
bus_id_ = data.bus_id;
size_ = 2;
monitor_ = std::make_unique<MonitorT>("Bus_" + data.name, data.monitored_variables);
using Variable = typename DataT::MonitorableVariables;
monitor_->set(Variable::Vr, [this]
{ return Vr(); });
monitor_->set(Variable::Vi, [this]
{ return Vi(); });
monitor_->set(Variable::Vm, [this]
{ return std::sqrt(Vr() * Vr() + Vi() * Vi()); });
monitor_->set(Variable::Va, [this]
{ return std::atan2(Vi(), Vr()); });
}

template <class ScalarT, typename IdxT>
Expand Down
2 changes: 2 additions & 0 deletions GridKit/Model/PhasorDynamics/Bus/BusInfinite.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace GridKit
class BusInfinite : public BusBase<ScalarT, IdxT>
{
using BusBase<ScalarT, IdxT>::bus_id_;
using BusBase<ScalarT, IdxT>::monitor_;
using BusBase<ScalarT, IdxT>::size_;
using BusBase<ScalarT, IdxT>::y_;
using BusBase<ScalarT, IdxT>::yp_;
Expand All @@ -27,6 +28,7 @@ namespace GridKit

public:
using RealT = typename BusBase<ScalarT, IdxT>::RealT;
using MonitorT = typename BusBase<ScalarT, IdxT>::MonitorT;
using DataT = BusData<RealT, IdxT>;
using BusTypeT = typename BusData<RealT, IdxT>::BusType;

Expand Down
26 changes: 22 additions & 4 deletions GridKit/Model/PhasorDynamics/Bus/BusInfiniteImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@

#include <GridKit/Model/PhasorDynamics/Bus/BusData.hpp>
#include <GridKit/Model/PhasorDynamics/Bus/BusInfinite.hpp>
#include <GridKit/Model/PhasorDynamics/BusBaseImpl.hpp>
#include <GridKit/Model/VariableMonitorImpl.hpp>

namespace GridKit
{
namespace PhasorDynamics
{
template <typename ScalarT, typename IdxT>
BusBase<ScalarT, IdxT>::~BusBase() = default;

template <typename ScalarT, typename IdxT>
const Model::VariableMonitorBase* BusBase<ScalarT, IdxT>::getMonitor() const
{
return monitor_.get();
}

/*!
* @brief Constructor for an infinite (slack) bus.
Expand Down Expand Up @@ -55,11 +63,21 @@ namespace GridKit
*/
template <class ScalarT, typename IdxT>
BusInfinite<ScalarT, IdxT>::BusInfinite(const DataT& data)
: BusBase<ScalarT, IdxT>(data),
Vr_(data.Vr0),
: Vr_(data.Vr0),
Vi_(data.Vi0)
{
size_ = 0;
bus_id_ = data.bus_id;
size_ = 0;
monitor_ = std::make_unique<MonitorT>("Bus_" + data.name, data.monitored_variables);
using Variable = typename DataT::MonitorableVariables;
monitor_->set(Variable::Vr, [this]
{ return Vr(); });
monitor_->set(Variable::Vi, [this]
{ return Vi(); });
monitor_->set(Variable::Vm, [this]
{ return std::sqrt(Vr() * Vr() + Vi() * Vi()); });
monitor_->set(Variable::Va, [this]
{ return std::atan2(Vi(), Vr()); });
}

template <class ScalarT, typename IdxT>
Expand Down
Loading
Loading