Commit 31947684 authored by Markus Mirz's avatar Markus Mirz
Browse files

remove attribute double declarations

parent 6bca4a5a
......@@ -43,8 +43,7 @@ namespace DPsim {
CPS::Attribute<Matrix>::Ptr leftVector;
};
String mName;
Real mTimeStep;
///
Real mSystemFrequency;
/// System list
CPS::SystemTopology mSystem;
......
......@@ -20,8 +20,6 @@ namespace DPsim {
/// Solver class using the nonlinear powerflow (PF) formulation.
class PFSolver: public Solver {
protected:
/// System time step is constant for PF solver
Real mTimeStep;
/// Number of PQ nodes
UInt mNumPQBuses = 0;
/// Number of PV nodes
......
......@@ -15,7 +15,7 @@ namespace Base {
namespace Ph1 {
class Transformer {
protected:
/// Transformer ratio
/// Complex transformer ratio
Complex mRatio;
/// Resistance [Ohm]
Real mResistance;
......
......@@ -30,16 +30,6 @@ namespace Ph3 {
public SharedFactory<SynchronGeneratorVBR> {
protected:
/// Exciter Model
//Signal::Exciter mExciter;
/// Determine if Exciter is activated
bool mHasExciter = false;
/// Governor Model
//Signal::TurbineGovernor mTurbineGovernor;
/// Determine if Turbine and Governor are activated
bool mHasTurbineGovernor = false;
/// d dynamic inductance
Real mDLmd;
/// q dynamic inductance
......
......@@ -30,16 +30,6 @@ namespace Ph3 {
public SharedFactory<SynchronGeneratorVBRStandalone> {
protected:
/// Exciter Model
//Signal::Exciter mExciter;
/// Determine if Exciter is activated
bool mHasExciter = false;
/// Governor Model
//Signal::TurbineGovernor mTurbineGovernor;
/// Determine if Turbine and Governor are activated
bool mHasTurbineGovernor = false;
/// d dynamic inductance
Real mDLmd;
/// q dynamic inductance
......
......@@ -29,11 +29,6 @@ namespace Ph3 {
public Base::SynchronGenerator,
public SharedFactory<SynchronGeneratorVBRSmpl> {
protected:
/// Exciter Model
//Signal::Exciter mExciter;
bool mHasExciter = false;
/// d dynamic inductance
Real mDLmd;
/// q dynamic inductance
......
......@@ -31,16 +31,6 @@ namespace Ph3 {
public Base::SynchronGenerator,
public SharedFactory<SynchronGeneratorVBRStandalone> {
protected:
/// Exciter Model
//Signal::Exciter mExciter;
/// Determine if Exciter is activated
bool mHasExciter = false;
/// Governor Model
//Signal::TurbineGovernor mTurbineGovernor;
/// Determine if Turbine and Governor are activated
bool mHasTurbineGovernor = false;
/// d dynamic inductance
Real mDLmd;
/// q dynamic inductance
......
......@@ -25,10 +25,6 @@ namespace Ph1 {
public Base::Ph1::PiLine,
public MNAInterface{
protected:
///resistance in [ohms]
Real mSeriesRes;
///Conductance of the line in [S]
Real mSeriesCond;
///Capacitance of the line in [F]
Real mCapacitance;
///Inductance of the line in [H]
......
......@@ -25,8 +25,8 @@
#include <cps/Base/Base_Ph1_Transformer.h>
namespace CPS {
namespace SP { namespace Ph1 {
namespace SP {
namespace Ph1 {
/// Transformer that includes an inductance and resistance
class Transformer :
public SimPowerComp<Complex>,
......@@ -45,8 +45,6 @@ namespace SP { namespace Ph1 {
/// Rated Apparent Power [VA]
Real mRatedPower = 0;
/// Transformer ratio complex
Complex mRatio;
/// Transformer ratio magnitude
Real mRatioAbs = 1;
/// Transformer ratio pase [deg]
......
......@@ -23,8 +23,6 @@ namespace CPS {
public MNATearInterface,
public SimPowerComp<Complex>,
public SharedFactory<Resistor> {
private:
Matrix mConductance;
public:
/// Defines UID, name and logging level
......
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