summaryrefslogtreecommitdiffstats
path: root/Project/PropertiesData.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/PropertiesData.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/PropertiesData.h')
-rw-r--r--Project/PropertiesData.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/Project/PropertiesData.h b/Project/PropertiesData.h
index 127eb59..4a6e8d0 100644
--- a/Project/PropertiesData.h
+++ b/Project/PropertiesData.h
@@ -18,9 +18,9 @@
#ifndef PROPERTIESDATA_H
#define PROPERTIESDATA_H
-#include "wx/language.h"
#include "Element.h"
#include "PowerElement.h"
+#include "wx/language.h"
enum PowerFlowMethod { GAUSS_SEIDEL = 0, NEWTON_RAPHSON };
enum GUITheme { THEME_LIGHT = 0, THEME_DARK };
@@ -31,6 +31,7 @@ struct SimulationData {
ElectricalUnit basePowerUnit = UNIT_MVA;
bool faultAfterPowerFlow = false;
bool scPowerAfterPowerFlow = false;
+ bool harmDistortionAfterPowerFlow = false;
// Power flow
PowerFlowMethod powerFlowMethod = GAUSS_SEIDEL;
@@ -48,7 +49,7 @@ struct SimulationData {
int controlTimeStepRatio = 10;
double plotTime = 1e-2;
bool useCOI = true;
-
+
// ZIP load
bool useCompLoads = false;
double constImpedanceActive = 100.0;
@@ -66,6 +67,13 @@ struct GeneralData {
GUITheme theme = THEME_LIGHT;
};
+struct FreqResponseData {
+ double initFreq = 0.0;
+ double finalFreq = 1500.0;
+ double stepFreq = 1.0;
+ int injBusNumber = -1;
+};
+
/**
* @class PropertiesData
* @author Thales Lima Oliveira <thales@ufu.br>
@@ -83,9 +91,14 @@ class PropertiesData
void SetSimulationPropertiesData(SimulationData simulationData) { m_simulData = simulationData; }
GeneralData GetGeneralPropertiesData() const { return m_genData; }
void SetGeneralPropertiesData(GeneralData generalData) { m_genData = generalData; }
+
+ void SetFreqRespData(const FreqResponseData& freqRespData) { this->m_freqRespData = freqRespData; }
+ const FreqResponseData& GetFreqRespData() const { return m_freqRespData; }
+
protected:
SimulationData m_simulData;
GeneralData m_genData;
+ FreqResponseData m_freqRespData;
};
#endif // PROPERTIESDATA_H