Commit 454f17d9 authored by Markus Mirz's avatar Markus Mirz
Browse files

rename PowerComponent class

parent b3675b1f
......@@ -32,12 +32,12 @@ namespace CPS {
namespace DP {
namespace Ph1 {
/*
Average voltage source inverter
Average voltage source inverter
- modelled in dq
- with interface to DP grid
*/
class AvVoltageSourceInverterDQ :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public SharedFactory<AvVoltageSourceInverterDQ> {
protected:
......@@ -45,7 +45,7 @@ namespace Ph1 {
Complex mVoltNom;
/// in case variable time step simulation should be developed in the future
Real mTimeStep;
/// if SteadyStateInit is enabled, the system's sychronous frame will start from a certain angle
/// if SteadyStateInit is enabled, the system's sychronous frame will start from a certain angle
Real mThetaSInit = 0;
/// Inner voltage source that represents the AvVoltageSourceInverterDQ
std::shared_ptr<DP::Ph1::ControlledVoltageSource> mSubCtrledVoltageSource;
......@@ -151,7 +151,7 @@ namespace Ph1 {
AvVoltageSourceInverterDQ(String name,
Logger::Level logLevel = Logger::Level::off) :AvVoltageSourceInverterDQ(name, name, logLevel) {}
///
PowerComponent<Complex>::Ptr clone(String copySuffix);
SimPowerComp<Complex>::Ptr clone(String copySuffix);
/// add measurements for Vcabc and Ifabc
//void addMonitoredNodes( std::shared_ptr<Capacitor> cap);
///
......
......@@ -38,7 +38,7 @@ namespace Ph1 {
class Capacitor :
public Base::Ph1::Capacitor,
public MNAInterface,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<Capacitor> {
protected:
/// DC equivalent current source for harmonics [A]
......@@ -54,7 +54,7 @@ namespace Ph1 {
Capacitor(String name, Logger::Level logLevel = Logger::Level::off)
: Capacitor(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initializes component from power flow data
......
......@@ -26,7 +26,7 @@ namespace CPS {
namespace Ph1 {
class ControlledVoltageSource :
public MNAInterface,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<ControlledVoltageSource> {
protected:
void updateVoltage(Real time);
......@@ -40,7 +40,7 @@ namespace CPS {
void setParameters(MatrixComp voltageRefABC);
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
///
void initialize(Matrix frequencies);
......
......@@ -37,7 +37,7 @@ namespace Ph1 {
/// from zero is added on top of the system frequency.
class CurrentSource :
public MNAInterface,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<CurrentSource> {
protected:
Attribute<Complex>::Ptr mCurrentRef;
......@@ -53,7 +53,7 @@ namespace Ph1 {
void setParameters(Complex current);
PowerComponent<Complex>::Ptr clone(String copySuffix);
SimPowerComp<Complex>::Ptr clone(String copySuffix);
// #### General ####
/// Initializes component from power flow data
......
......@@ -38,7 +38,7 @@ namespace Ph1 {
class Inductor :
public Base::Ph1::Inductor,
public MNATearInterface,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<Inductor> {
protected:
/// DC equivalent current source for harmonics [A]
......@@ -58,7 +58,7 @@ namespace Ph1 {
// #### General ####
/// Return new instance with the same parameters
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
/// Initializes state variables considering the number of frequencies
void initialize(Matrix frequencies);
/// Initializes states from power flow data
......
......@@ -33,7 +33,7 @@ namespace Ph1 {
///
/// add more explanation here regarding bessel function model
class Inverter :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public SharedFactory<Inverter> {
protected:
......
......@@ -35,7 +35,7 @@ namespace Ph1 {
/// positve and for the equation of node k as negative. Moreover
/// a new equation ej - ek = V is added to the problem.
class NetworkInjection :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public DAEInterface,
public SharedFactory<NetworkInjection> {
......@@ -56,7 +56,7 @@ namespace Ph1 {
NetworkInjection(String name,
Complex voltage, Logger::Level logLevel = Logger::Level::off);
///
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initializes component from power flow data
......
......@@ -34,7 +34,7 @@ namespace Ph1 {
/// TODO: read from CSV files
/// \brief PQ-load represented by a current source
class PQLoadCS :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public SharedFactory<PQLoadCS> {
protected:
......@@ -63,7 +63,7 @@ namespace Ph1 {
Logger::Level logLevel = Logger::Level::off);
void setParameters(Real activePower, Real reactivePower, Real nomVolt);
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initializes component from power flow data
......
......@@ -36,7 +36,7 @@ namespace Ph1 {
/// This model consists sub components to represent the
/// RLC elements of a PI-line.
class PiLine :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNATearInterface,
public Base::Ph1::PiLine,
public SharedFactory<PiLine> {
......@@ -61,7 +61,7 @@ namespace Ph1 {
PiLine(String name, Logger::Level logLevel = Logger::Level::off)
: PiLine(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String copySuffix);
SimPowerComp<Complex>::Ptr clone(String copySuffix);
// #### General ####
///
......
......@@ -35,7 +35,7 @@ namespace Ph1 {
/// TODO: currently modelled as an impedance, which obviously doesn't have a constant power characteristic
/// Model as current source and read from CSV files
class RXLoad :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public SharedFactory<RXLoad> {
protected:
......@@ -79,7 +79,7 @@ namespace Ph1 {
Real activePower, Real reactivePower, Real volt,
Logger::Level logLevel = Logger::Level::off);
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
///
......
......@@ -30,7 +30,7 @@ namespace Ph1 {
/// \brief resistor inductor series element
class ResIndSeries :
public MNATearInterface,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<ResIndSeries> {
protected:
/// Inductance [H]
......@@ -59,7 +59,7 @@ namespace Ph1 {
mInductance = inductance;
}
/// Return new instance with the same parameters
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
/// Initializes state variables considering the number of frequencies
void initialize(Matrix frequencies);
/// Initializes states from power flow data
......
......@@ -34,7 +34,7 @@ namespace Ph1 {
public Base::Ph1::Resistor,
public MNATearInterface,
public DAEInterface,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<Resistor> {
public:
/// Defines UID, name and logging level
......@@ -43,7 +43,7 @@ namespace Ph1 {
Resistor(String name, Logger::Level logLevel = Logger::Level::off)
: Resistor(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initialize components with correct network frequencies
......
......@@ -32,7 +32,7 @@ namespace DP {
namespace Ph1 {
class RxLine :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public Base::Ph1::PiLine,
public SharedFactory<RxLine> {
......@@ -55,7 +55,7 @@ namespace Ph1 {
RxLine(String name, Logger::Level logLevel = Logger::Level::off)
: RxLine(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initializes component from power flow data
......
......@@ -36,7 +36,7 @@ namespace Ph1 {
/// Each state has a specific resistance value.
class Switch :
public Base::Ph1::Switch,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<Switch>,
public MNASwitchInterface {
protected:
......@@ -47,7 +47,7 @@ namespace Ph1 {
Switch(String name, Logger::Level logLevel = Logger::Level::off)
: Switch(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
///
......
......@@ -30,7 +30,7 @@ namespace DP {
namespace Ph1 {
/// Ideal voltage source representing a synchronous generator
class SynchronGeneratorIdeal :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public SharedFactory<SynchronGeneratorIdeal> {
private:
......@@ -46,7 +46,7 @@ namespace Ph1 {
SynchronGeneratorIdeal(String name,
Logger::Level logLevel = Logger::Level::off);
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
///
......
......@@ -36,7 +36,7 @@ namespace Ph1 {
class SynchronGeneratorTrStab :
public Base::SynchronGenerator,
public MNAInterface,
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public SharedFactory<SynchronGeneratorTrStab> {
protected:
// #### Model specific variables ####
......@@ -65,7 +65,7 @@ namespace Ph1 {
SynchronGeneratorTrStab(String name, Logger::Level logLevel = Logger::Level::off)
: SynchronGeneratorTrStab(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General Functions ####
///
......
......@@ -32,7 +32,7 @@ namespace DP {
namespace Ph1 {
/// Transformer that includes an inductance and resistance
class Transformer :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public SharedFactory<Transformer>,
public Base::Ph1::Transformer {
......@@ -50,7 +50,7 @@ namespace Ph1 {
Transformer(String name, Logger::Level logLevel = Logger::Level::off)
: Transformer(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Defines component parameters
......
......@@ -37,7 +37,7 @@ namespace Ph1 {
/// positve and for the equation of node k as negative. Moreover
/// a new equation ej - ek = V is added to the problem.
class VoltageSource :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public DAEInterface,
public SharedFactory<VoltageSource> {
......@@ -58,7 +58,7 @@ namespace Ph1 {
VoltageSource(String name,
Complex voltage, Logger::Level logLevel = Logger::Level::off);
///
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initializes component from power flow data
......
......@@ -34,7 +34,7 @@ namespace Ph1 {
/// which is transformed to a current source with
/// a parallel resistance using the Norton equivalent.
class VoltageSourceNorton :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public Base::Ph1::VoltageSource,
public MNAInterface,
public SharedFactory<VoltageSourceNorton> {
......@@ -57,7 +57,7 @@ namespace Ph1 {
VoltageSourceNorton(String name, Logger::Level logLevel = Logger::Level::off)
: VoltageSourceNorton(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initializes component from power flow data
......
......@@ -29,7 +29,7 @@ namespace CPS {
namespace DP {
namespace Ph1 {
class VoltageSourceRamp :
public PowerComponent<Complex>,
public SimPowerComp<Complex>,
public MNAInterface,
public SharedFactory<VoltageSourceRamp> {
protected:
......@@ -56,7 +56,7 @@ namespace Ph1 {
VoltageSourceRamp(String name, Logger::Level logLevel = Logger::Level::off)
: VoltageSourceRamp(name, name, logLevel) { }
PowerComponent<Complex>::Ptr clone(String name);
SimPowerComp<Complex>::Ptr clone(String name);
// #### General ####
/// Initializes component from power flow data
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment