diff --git a/dpsim/examples/cxx/CMakeLists.txt b/dpsim/examples/cxx/CMakeLists.txt index d471ec126c..bef4e39f7b 100644 --- a/dpsim/examples/cxx/CMakeLists.txt +++ b/dpsim/examples/cxx/CMakeLists.txt @@ -35,7 +35,6 @@ set(CIRCUIT_SOURCES Circuits/EMT_PiLine.cpp Circuits/EMT_Ph3_LinearSampleCircuit.cpp Circuits/EMT_Ph3_LinearSampleCircuitSSN.cpp - Circuits/EMT_Ph1_Switch_R1.cpp # EMT examples with PF initialization Circuits/EMT_Slack_PiLine_PQLoad_with_PF_Init.cpp diff --git a/dpsim/src/pybind/EMTComponents.cpp b/dpsim/src/pybind/EMTComponents.cpp index 2e7447f842..61b03935e2 100644 --- a/dpsim/src/pybind/EMTComponents.cpp +++ b/dpsim/src/pybind/EMTComponents.cpp @@ -102,21 +102,13 @@ void addEMTPh1Components(py::module_ mEMTPh1) { .def("connect", &CPS::EMT::Ph1::Inductor::connect) .def_property("L", createAttributeGetter("L"), createAttributeSetter("L")); - py::class_, CPS::SimPowerComp>(mEMTPh1, "Full_Serial_RLC", py::multiple_inheritance()) - .def(py::init()) - .def(py::init()) - .def("set_parameters", &CPS::EMT::Ph1::SSN::Full_Serial_RLC::setParameters, "R"_a, "L"_a, "C"_a) - .def("connect", &CPS::EMT::Ph1::SSN::Full_Serial_RLC::connect) - .def_property("R", createAttributeGetter("R"), createAttributeSetter("R")) - .def_property("L", createAttributeGetter("L"), createAttributeSetter("L")) - .def_property("C", createAttributeGetter("C"), createAttributeSetter("C")); - py::class_, CPS::SimPowerComp, CPS::Base::Ph1::Switch>(mEMTPh1, "Switch", py::multiple_inheritance()) - .def(py::init(), "name"_a, "loglevel"_a = CPS::Logger::Level::off) - .def("set_parameters", &CPS::EMT::Ph1::Switch::setParameters, "open_resistance"_a, "closed_resistance"_a, "closed"_a = false) // cppcheck-suppress assignBoolToPointer - .def("open", &CPS::EMT::Ph1::Switch::open) - .def("close", &CPS::EMT::Ph1::Switch::close) - .def("connect", &CPS::EMT::Ph1::Switch::connect); + py::class_, CPS::SimPowerComp, CPS::Base::Ph1::Switch>(mEMTPh1, "Switch", py::multiple_inheritance()) + .def(py::init(), "name"_a, "loglevel"_a = CPS::Logger::Level::off) + .def("set_parameters", &CPS::EMT::Ph1::Switch::setParameters, "open_resistance"_a, "closed_resistance"_a, "closed"_a = false) // cppcheck-suppress assignBoolToPointer + .def("open", &CPS::EMT::Ph1::Switch::open) + .def("close", &CPS::EMT::Ph1::Switch::close) + .def("connect", &CPS::EMT::Ph1::Switch::connect); } void addEMTPh3Components(py::module_ mEMTPh3) {