diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-01-22 14:49:35 -0200 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-01-22 14:49:35 -0200 |
| commit | a1c362b8a5e989cf9e75be14383fe8f7d3625422 (patch) | |
| tree | 7b552fe5dcec9c4ef4575e897b63e3e6cddf2c89 | |
| parent | f2fe2a96dbc2db59accf71e7ef5e6b5e4a9b7d2e (diff) | |
| download | PSP.git-a1c362b8a5e989cf9e75be14383fe8f7d3625422.tar.gz PSP.git-a1c362b8a5e989cf9e75be14383fe8f7d3625422.tar.xz PSP.git-a1c362b8a5e989cf9e75be14383fe8f7d3625422.zip | |
Merge error removal
| -rw-r--r-- | Project/Electromechanical.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Project/Electromechanical.cpp b/Project/Electromechanical.cpp index de30184..66d5bb2 100644 --- a/Project/Electromechanical.cpp +++ b/Project/Electromechanical.cpp @@ -235,11 +235,7 @@ 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) @@ -249,11 +245,7 @@ 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 } } } |