summaryrefslogtreecommitdiffstats
path: root/Project/SyncGenerator.h
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2016-11-02 23:11:44 -0200
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2016-11-02 23:11:44 -0200
commit004257e2abebbf448ba8d1fba32daae216b2c88e (patch)
tree592ff32b18911e32ece4a7008d119627e856bd68 /Project/SyncGenerator.h
parentb306118b2683cf6f264b5f1617c3e0e62a6c9042 (diff)
downloadPSP.git-004257e2abebbf448ba8d1fba32daae216b2c88e.tar.gz
PSP.git-004257e2abebbf448ba8d1fba32daae216b2c88e.tar.xz
PSP.git-004257e2abebbf448ba8d1fba32daae216b2c88e.zip
Gauss-Seidel implemented
Diffstat (limited to 'Project/SyncGenerator.h')
-rw-r--r--Project/SyncGenerator.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/Project/SyncGenerator.h b/Project/SyncGenerator.h
index cf1fda9..98c0ce1 100644
--- a/Project/SyncGenerator.h
+++ b/Project/SyncGenerator.h
@@ -12,15 +12,15 @@ struct SyncGeneratorElectricalData
double nominalPower = 100.0;
ElectricalUnit nominalPowerUnit = UNIT_MVA;
double activePower = 100.0;
- ElectricalUnit activePowerUnit = UNIT_MVA;
+ ElectricalUnit activePowerUnit = UNIT_MW;
double reactivePower = 0.0;
- ElectricalUnit reactivePowerUnit = UNIT_MVA;
+ ElectricalUnit reactivePowerUnit = UNIT_MVAr;
bool haveMaxReactive = false;
double maxReactive = 9999.0;
- ElectricalUnit maxReactiveUnit = UNIT_MVA;
+ ElectricalUnit maxReactiveUnit = UNIT_MVAr;
bool haveMinReactive = false;
double minReactive = -9999.0;
- ElectricalUnit minReactiveUnit = UNIT_MVA;
+ ElectricalUnit minReactiveUnit = UNIT_MVAr;
bool useMachineBase = false;
// Fault
@@ -69,6 +69,7 @@ class SyncGenerator : public Machines
virtual bool GetContextMenu(wxMenu& menu);
virtual bool ShowForm(wxWindow* parent, Element* element);
virtual SyncGeneratorElectricalData GetElectricalData() { return m_electricalData; }
+ virtual SyncGeneratorElectricalData GetPUElectricalData(double systemPowerBase);
virtual void SetElectricalData(SyncGeneratorElectricalData electricalData) { m_electricalData = electricalData; }
protected:
std::vector<wxPoint2DDouble> m_sinePts;