diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-01-11 10:21:10 -0200 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-01-11 10:21:10 -0200 |
| commit | f2fe2a96dbc2db59accf71e7ef5e6b5e4a9b7d2e (patch) | |
| tree | 337ce62e492569e37f652788d0c19f2ea01ca80d /Project/Electromechanical.cpp | |
| parent | fc820e8a03cd670835ac7fc7434226fad1c8e444 (diff) | |
| parent | aad89bf4d16d45c0790bd2fc010d9ec06cc35430 (diff) | |
| download | PSP.git-f2fe2a96dbc2db59accf71e7ef5e6b5e4a9b7d2e.tar.gz PSP.git-f2fe2a96dbc2db59accf71e7ef5e6b5e4a9b7d2e.tar.xz PSP.git-f2fe2a96dbc2db59accf71e7ef5e6b5e4a9b7d2e.zip | |
Merge branch 'wip/induction-motor' of https://github.com/Thales1330/PSP into wip/induction-motor
Diffstat (limited to 'Project/Electromechanical.cpp')
| -rw-r--r-- | Project/Electromechanical.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Project/Electromechanical.cpp b/Project/Electromechanical.cpp index 0504bab..de30184 100644 --- a/Project/Electromechanical.cpp +++ b/Project/Electromechanical.cpp @@ -235,7 +235,11 @@ void Electromechanical::SetEvent(double currentTime) Bus* parentBus = static_cast<Bus*>(load->GetParentList()[0]); int n = parentBus->GetElectricalData().number; std::complex<double> v = parentBus->GetElectricalData().voltage; +<<<<<<< HEAD m_yBus[n][n] -= std::complex<double>(data.activePower, -data.reactivePower) / (abs(v) * abs(v)); +======= + m_yBus[n][n] -= std::complex<double>(data.activePower, -data.reactivePower) / (std::abs(v) * std::abs(v)); +>>>>>>> aad89bf4d16d45c0790bd2fc010d9ec06cc35430 } // Insert load (only disconnected load) @@ -245,7 +249,11 @@ void Electromechanical::SetEvent(double currentTime) Bus* parentBus = static_cast<Bus*>(load->GetParentList()[0]); int n = parentBus->GetElectricalData().number; std::complex<double> v = parentBus->GetElectricalData().voltage; +<<<<<<< HEAD m_yBus[n][n] += std::complex<double>(data.activePower, -data.reactivePower) / (abs(v) * abs(v)); +======= + m_yBus[n][n] += std::complex<double>(data.activePower, -data.reactivePower) / (std::abs(v) * std::abs(v)); +>>>>>>> aad89bf4d16d45c0790bd2fc010d9ec06cc35430 } } } |