From 5610f5b506e0490b6fcc00a569781791732ec257 Mon Sep 17 00:00:00 2001 From: Ghassen Nakti Date: Tue, 5 Nov 2024 15:20:07 +0100 Subject: [PATCH] Post rebase fixes Signed-off-by: Ghassen Nakti --- ..._PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp | 2 +- .../cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp | 4 ++-- ...ack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp | 2 +- ..._PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp | 2 +- ..._PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp | 2 +- dpsim/examples/cxx/Examples.h | 4 ---- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp index 71a38092e4..af4bcd58bf 100644 --- a/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp +++ b/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp @@ -110,7 +110,7 @@ int main(int argc, char* argv[]) { SystemComponentList{loadDP, lineDP, pv}); // Initialization of dynamic topology - systemDP.initWithPowerflow(systemPF); + systemDP.initWithPowerflow(systemPF, Domain::DP); Complex initial1PhPowerVSI= Complex(linePF->attributeTyped("p_inj")->get(), linePF->attributeTyped("q_inj")->get()); pv->terminal(0)->setPower(initial1PhPowerVSI); diff --git a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp index ec8adfaa3e..fa8a54ba20 100644 --- a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp +++ b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp @@ -6,8 +6,8 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. *********************************************************************************/ -#include "../Examples.h" #include +#include "../Examples.h" using namespace DPsim; using namespace CPS; @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) { SystemComponentList{extnetEMT, lineEMT, pv}); // Initialization of dynamic topology - systemEMT.initWithPowerflow(systemPF, CPS::Domain::EMT); + systemEMT.initWithPowerflow(systemPF, Domain::EMT); // Logging auto loggerEMT = DataLogger::make(simName); diff --git a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp index 7ce33696ac..acd35189f3 100644 --- a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp +++ b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp @@ -133,7 +133,7 @@ int main(int argc, char* argv[]) { SystemComponentList{pv,lineEMT, load1SwitchEMT, load1EMT, load2SwitchEMT, load2EMT}); // Initialization of dynamic topology - systemEMT.initWithPowerflow(systemPF); + systemEMT.initWithPowerflow(systemPF, Domain::EMT); Complex initial3PhPowerVSI = Complex(linePF->attributeTyped("p_inj")->get(), linePF->attributeTyped("q_inj")->get()); diff --git a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp index 152761d6d0..c922dd941a 100644 --- a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp +++ b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp @@ -110,7 +110,7 @@ int main(int argc, char* argv[]) { SystemComponentList{loadEMT, lineEMT, pv}); // Initialization of dynamic topology - systemEMT.initWithPowerflow(systemPF); + systemEMT.initWithPowerflow(systemPF, Domain::EMT); Complex initial3PhPowerVSI= Complex(linePF->attributeTyped("p_inj")->get(), linePF->attributeTyped("q_inj")->get()); pv->terminal(0)->setPower(initial3PhPowerVSI); diff --git a/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp index 2c81c74daf..b025c36b64 100644 --- a/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp +++ b/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp @@ -117,7 +117,7 @@ int main(int argc, char* argv[]) { SystemComponentList{loadSP, lineSP, pv}); // Initialization of dynamic topology - systemSP.initWithPowerflow(systemPF); + systemSP.initWithPowerflow(systemPF, Domain::SP); Complex initial1PhPowerVSI= Complex(linePF->attributeTyped("p_inj")->get(), linePF->attributeTyped("q_inj")->get()); pv->terminal(0)->setPower(initial1PhPowerVSI); diff --git a/dpsim/examples/cxx/Examples.h b/dpsim/examples/cxx/Examples.h index 8a01717ea6..337858e43b 100644 --- a/dpsim/examples/cxx/Examples.h +++ b/dpsim/examples/cxx/Examples.h @@ -533,10 +533,6 @@ struct ScenarioConfig { Real systemOmega = 2 * PI * systemFrequency; }; } // namespace SGIB - // Further parameters - Real systemOmega = 2 * PI * systemFrequency; - }; -} namespace GridForming { struct ScenarioConfig1 {