summaryrefslogtreecommitdiffstats
path: root/Project/SyncGenerator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Project/SyncGenerator.cpp')
-rw-r--r--Project/SyncGenerator.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/Project/SyncGenerator.cpp b/Project/SyncGenerator.cpp
index 49571ac..7038bb2 100644
--- a/Project/SyncGenerator.cpp
+++ b/Project/SyncGenerator.cpp
@@ -91,40 +91,40 @@ SyncGeneratorElectricalData SyncGenerator::GetPUElectricalData(double systemPowe
// Active power
double activePower = GetValueFromUnit(data.activePower, data.activePowerUnit);
if(!m_online) activePower = 0.0;
- if(data.activePowerUnit == UNIT_PU) {
+ if(data.activePowerUnit == ElectricalUnit::UNIT_PU) {
if(data.useMachineBase) data.activePower = (activePower * machineBasePower) / systemPowerBase;
} else {
data.activePower = activePower / systemPowerBase;
}
- data.activePowerUnit = UNIT_PU;
+ data.activePowerUnit = ElectricalUnit::UNIT_PU;
// Reactive power
double reactivePower = GetValueFromUnit(data.reactivePower, data.reactivePowerUnit);
if(!m_online) reactivePower = 0.0;
- if(data.reactivePowerUnit == UNIT_PU) {
+ if(data.reactivePowerUnit == ElectricalUnit::UNIT_PU) {
if(data.useMachineBase) data.reactivePower = (reactivePower * machineBasePower) / systemPowerBase;
} else {
data.reactivePower = reactivePower / systemPowerBase;
}
- data.reactivePowerUnit = UNIT_PU;
+ data.reactivePowerUnit = ElectricalUnit::UNIT_PU;
// Max reactive power
double maxReactive = GetValueFromUnit(data.maxReactive, data.maxReactiveUnit);
- if(data.maxReactiveUnit == UNIT_PU) {
+ if(data.maxReactiveUnit == ElectricalUnit::UNIT_PU) {
if(data.useMachineBase) data.maxReactive = (maxReactive * machineBasePower) / systemPowerBase;
} else {
data.maxReactive = maxReactive / systemPowerBase;
}
- data.maxReactiveUnit = UNIT_PU;
+ data.maxReactiveUnit = ElectricalUnit::UNIT_PU;
// Min reactive power
double minReactive = GetValueFromUnit(data.minReactive, data.minReactiveUnit);
- if(data.minReactiveUnit == UNIT_PU) {
+ if(data.minReactiveUnit == ElectricalUnit::UNIT_PU) {
if(data.useMachineBase) data.minReactive = (minReactive * machineBasePower) / systemPowerBase;
} else {
data.minReactive = minReactive / systemPowerBase;
}
- data.minReactiveUnit = UNIT_PU;
+ data.minReactiveUnit = ElectricalUnit::UNIT_PU;
double baseVoltage = GetValueFromUnit(data.nominalVoltage, data.nominalVoltageUnit);
double systemBaseImpedance = (baseVoltage * baseVoltage) / systemPowerBase;
@@ -196,16 +196,16 @@ wxString SyncGenerator::GetTipText() const
if(!m_online) activePower = 0.0;
tipText += _("\nP = ") + wxString::FromDouble(activePower, 5);
switch(m_electricalData.activePowerUnit) {
- case UNIT_PU: {
+ case ElectricalUnit::UNIT_PU: {
tipText += _(" p.u.");
} break;
- case UNIT_W: {
+ case ElectricalUnit::UNIT_W: {
tipText += _(" W");
} break;
- case UNIT_kW: {
+ case ElectricalUnit::UNIT_kW: {
tipText += _(" kW");
} break;
- case UNIT_MW: {
+ case ElectricalUnit::UNIT_MW: {
tipText += _(" MW");
} break;
default:
@@ -215,16 +215,16 @@ wxString SyncGenerator::GetTipText() const
if(!m_online) reactivePower = 0.0;
tipText += _("\nQ = ") + wxString::FromDouble(reactivePower, 5);
switch(m_electricalData.reactivePowerUnit) {
- case UNIT_PU: {
+ case ElectricalUnit::UNIT_PU: {
tipText += _(" p.u.");
} break;
- case UNIT_VAr: {
+ case ElectricalUnit::UNIT_var: {
tipText += _(" VAr");
} break;
- case UNIT_kVAr: {
+ case ElectricalUnit::UNIT_kvar: {
tipText += _(" kVAr");
} break;
- case UNIT_MVAr: {
+ case ElectricalUnit::UNIT_Mvar: {
tipText += _(" MVAr");
} break;
default:
@@ -238,7 +238,7 @@ bool SyncGenerator::GetPlotData(ElementPlotData& plotData, PlotStudy study)
{
if(!m_electricalData.plotSyncMachine) return false;
plotData.SetName(m_electricalData.name);
- plotData.SetCurveType(ElementPlotData::CT_SYNC_GENERATOR);
+ plotData.SetCurveType(ElementPlotData::CurveType::CT_SYNC_GENERATOR);
std::vector<double> absTerminalVoltage, activePower, reactivePower;
for(unsigned int i = 0; i < m_electricalData.terminalVoltageVector.size(); ++i) {
@@ -268,26 +268,26 @@ rapidxml::xml_node<>* SyncGenerator::SaveElement(rapidxml::xml_document<>& doc,
XMLParser::SetNodeValue(doc, name, m_electricalData.name);
auto nominalPower = XMLParser::AppendNode(doc, electricalProp, "NominalPower");
XMLParser::SetNodeValue(doc, nominalPower, m_electricalData.nominalPower);
- XMLParser::SetNodeAttribute(doc, nominalPower, "UnitID", m_electricalData.nominalPowerUnit);
+ XMLParser::SetNodeAttribute(doc, nominalPower, "UnitID", static_cast<int>(m_electricalData.nominalPowerUnit));
auto nominalVoltage = XMLParser::AppendNode(doc, electricalProp, "NominalVoltage");
XMLParser::SetNodeValue(doc, nominalVoltage, m_electricalData.nominalVoltage);
- XMLParser::SetNodeAttribute(doc, nominalVoltage, "UnitID", m_electricalData.nominalVoltageUnit);
+ XMLParser::SetNodeAttribute(doc, nominalVoltage, "UnitID", static_cast<int>(m_electricalData.nominalVoltageUnit));
auto activePower = XMLParser::AppendNode(doc, electricalProp, "ActivePower");
XMLParser::SetNodeValue(doc, activePower, m_electricalData.activePower);
- XMLParser::SetNodeAttribute(doc, activePower, "UnitID", m_electricalData.activePowerUnit);
+ XMLParser::SetNodeAttribute(doc, activePower, "UnitID", static_cast<int>(m_electricalData.activePowerUnit));
auto reactivePower = XMLParser::AppendNode(doc, electricalProp, "ReactivePower");
XMLParser::SetNodeValue(doc, reactivePower, m_electricalData.reactivePower);
- XMLParser::SetNodeAttribute(doc, reactivePower, "UnitID", m_electricalData.reactivePowerUnit);
+ XMLParser::SetNodeAttribute(doc, reactivePower, "UnitID", static_cast<int>(m_electricalData.reactivePowerUnit));
auto haveMaxReactive = XMLParser::AppendNode(doc, electricalProp, "HaveMaxReactive");
XMLParser::SetNodeValue(doc, haveMaxReactive, m_electricalData.haveMaxReactive);
auto maxReactive = XMLParser::AppendNode(doc, electricalProp, "MaxReactive");
XMLParser::SetNodeValue(doc, maxReactive, m_electricalData.maxReactive);
- XMLParser::SetNodeAttribute(doc, maxReactive, "UnitID", m_electricalData.maxReactiveUnit);
+ XMLParser::SetNodeAttribute(doc, maxReactive, "UnitID", static_cast<int>(m_electricalData.maxReactiveUnit));
auto haveMinReactive = XMLParser::AppendNode(doc, electricalProp, "HaveMinReactive");
XMLParser::SetNodeValue(doc, haveMinReactive, m_electricalData.haveMinReactive);
auto minReactive = XMLParser::AppendNode(doc, electricalProp, "MinReactive");
XMLParser::SetNodeValue(doc, minReactive, m_electricalData.minReactive);
- XMLParser::SetNodeAttribute(doc, minReactive, "UnitID", m_electricalData.minReactiveUnit);
+ XMLParser::SetNodeAttribute(doc, minReactive, "UnitID", static_cast<int>(m_electricalData.minReactiveUnit));
auto useMachineBase = XMLParser::AppendNode(doc, electricalProp, "UseMachineBase");
XMLParser::SetNodeValue(doc, useMachineBase, m_electricalData.useMachineBase);
generated by cgit (git 2.34.1) at 2025-09-26 20:48:09 +0000