diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-07-18 09:22:27 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 09:22:27 -0300 |
| commit | 8357c081eb75147bb8f94d8b6e367d88ea3898ed (patch) | |
| tree | 9d9726fdcefb917475d6b33344d2b832d4e78ef8 /Project/SyncGenerator.h | |
| parent | 295b775ad53eb1e128b705e6028f9690dc6fa640 (diff) | |
| parent | 7f46d390b8cc1d5f37560f52b222198dbc5e1225 (diff) | |
| download | PSP.git-8357c081eb75147bb8f94d8b6e367d88ea3898ed.tar.gz PSP.git-8357c081eb75147bb8f94d8b6e367d88ea3898ed.tar.xz PSP.git-8357c081eb75147bb8f94d8b6e367d88ea3898ed.zip | |
Merge pull request #50 from Thales1330/wip/induction-motor
Wip/induction motor
Diffstat (limited to 'Project/SyncGenerator.h')
| -rw-r--r-- | Project/SyncGenerator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Project/SyncGenerator.h b/Project/SyncGenerator.h index 4866f8b..1a25a0e 100644 --- a/Project/SyncGenerator.h +++ b/Project/SyncGenerator.h @@ -65,6 +65,7 @@ struct SyncGeneratorElectricalData { double armResistance = 0.0; double potierReactance = 0.0; double satFactor = 0.0; + double ocFrequency = 60.0; double syncXd = 0.0; double syncXq = 0.0; @@ -79,7 +80,7 @@ struct SyncGeneratorElectricalData { // Machine state variables std::complex<double> terminalVoltage; - std::vector<std::complex<double> > terminalVoltageVector; + std::vector<double> terminalVoltageVector; std::complex<double> electricalPower; std::vector<std::complex<double> > electricalPowerVector; double pm; @@ -154,7 +155,8 @@ class SyncGenerator : public Machines virtual SyncGeneratorElectricalData GetPUElectricalData(double systemPowerBase); virtual void SetElectricalData(SyncGeneratorElectricalData electricalData) { m_electricalData = electricalData; } virtual void SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit); - virtual bool GetPlotData(ElementPlotData& plotData); + virtual void SavePlotData(); + virtual bool GetPlotData(ElementPlotData& plotData, PlotStudy study = STABILITY); virtual rapidxml::xml_node<>* SaveElement(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* elementListNode); virtual bool OpenElement(rapidxml::xml_node<>* elementNode, std::vector<Element*> parentList); |