summaryrefslogtreecommitdiffstats
path: root/Project/Bus.h
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2019-07-18 09:22:27 -0300
committerGitHub <noreply@github.com>2019-07-18 09:22:27 -0300
commit8357c081eb75147bb8f94d8b6e367d88ea3898ed (patch)
tree9d9726fdcefb917475d6b33344d2b832d4e78ef8 /Project/Bus.h
parent295b775ad53eb1e128b705e6028f9690dc6fa640 (diff)
parent7f46d390b8cc1d5f37560f52b222198dbc5e1225 (diff)
downloadPSP.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/Bus.h')
-rw-r--r--Project/Bus.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/Project/Bus.h b/Project/Bus.h
index 503299e..b01a315 100644
--- a/Project/Bus.h
+++ b/Project/Bus.h
@@ -57,6 +57,14 @@ struct BusElectricalData {
double stabFaultResistance = 0.0;
double stabFaultReactance = 0.0;
std::vector<std::complex<double> > stabVoltageVector;
+
+ // Power Quality
+ bool plotPQData = false;
+ std::vector<int> harmonicOrder;
+ std::vector< std::complex<double> > harmonicVoltage;
+ double thd = 0.0;
+
+ std::vector<double> absImpedanceVector;
};
/**
@@ -87,7 +95,7 @@ class Bus : public PowerElement
virtual BusElectricalData GetElectricalData() const { return m_electricalData; }
virtual void SetElectricalData(BusElectricalData electricalData) { m_electricalData = electricalData; }
virtual bool ShowForm(wxWindow* parent, Element* element);
- virtual bool GetPlotData(ElementPlotData& plotData);
+ 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);