diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-01-16 09:38:08 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 09:38:08 -0200 |
| commit | 9c7c255d7dc957241364aca0e5322da926e33fc7 (patch) | |
| tree | 16dda6fad8398941c3c8e4db6d48ef98602ec06f /Project/ElectricCalculation.cpp | |
| parent | af070d92462ac5586aa6a0a80c51a8fa72710600 (diff) | |
| parent | db3fadbcc9f396ca22c4578101bbcd0a7e81609e (diff) | |
| download | PSP.git-9c7c255d7dc957241364aca0e5322da926e33fc7.tar.gz PSP.git-9c7c255d7dc957241364aca0e5322da926e33fc7.tar.xz PSP.git-9c7c255d7dc957241364aca0e5322da926e33fc7.zip | |
Merge pull request #46 from Thales1330/wip/induction-motor
Wip/induction motor
Diffstat (limited to 'Project/ElectricCalculation.cpp')
| -rw-r--r-- | Project/ElectricCalculation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Project/ElectricCalculation.cpp b/Project/ElectricCalculation.cpp index 36e7a9a..af3173b 100644 --- a/Project/ElectricCalculation.cpp +++ b/Project/ElectricCalculation.cpp @@ -74,7 +74,8 @@ bool ElectricCalculation::GetYBus(std::vector<std::vector<std::complex<double> > double systemPowerBase, YBusSequence sequence, bool includeSyncMachines, - bool allLoadsAsImpedances) + bool allLoadsAsImpedances, + bool usePowerFlowVoltagesOnImpedances) { if(m_busList.size() == 0) return false; @@ -106,7 +107,7 @@ bool ElectricCalculation::GetYBus(std::vector<std::vector<std::complex<double> > LoadElectricalData data = load->GetPUElectricalData(systemPowerBase); if(data.loadType == CONST_IMPEDANCE || allLoadsAsImpedances) { std::complex<double> yLoad = std::complex<double>(data.activePower, -data.reactivePower); - if(allLoadsAsImpedances) { + if(allLoadsAsImpedances && usePowerFlowVoltagesOnImpedances) { std::complex<double> v = static_cast<Bus*>(load->GetParentList()[0])->GetElectricalData().voltage; yLoad /= (std::abs(v) * std::abs(v)); } |