Update WSCC_9bus_mult examples and implement splitting examples in DP and EMT

.github/workflows/build_test_linux_fedora.yaml

@@ -64,7 +64,7 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{ github.workspace }}/build
-      run: cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 $GITHUB_WORKSPACE 
+      run: cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 $GITHUB_WORKSPACE
 
     - name: Build every target
       shell: bash
@@ -194,12 +194,18 @@ jobs:
       run: |
         chmod -R +x ./build/dpsim/examples/cxx
 
-    - name: Run Binaries 1/2
+    - name: Run Binaries 1/4
       run: ./build/dpsim/examples/cxx/WSCC_9bus_mult_coupled
 
-    - name: Run Binaries 2/2
+    - name: Run Binaries 2/4
       run: ./build/dpsim/examples/cxx/WSCC_9bus_mult_decoupled
 
+    - name: Run Binaries 3/4
+      run: ./build/dpsim/examples/cxx/DP_WSCC_9bus_split_decoupled
+
+    - name: Run Binaries 4/4
+      run: ./build/dpsim/examples/cxx/EMT_WSCC_9bus_split_decoupled
+
   cpp-check:
     name: Scan Sourcecode with Cppcheck
     runs-on: ubuntu-latest

.github/workflows/build_test_linux_rocky_profiling.yaml

@@ -38,17 +38,33 @@ jobs:
 
 ## Tests ##
   test-examples-1:
-    name: Test Examples 1/2
+    name: Test Examples 1/4
     needs: [profiling]
     uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
     with:
       path: ./build/dpsim/examples/cxx/WSCC_9bus_mult_decoupled
       name: WSCC_9bus_mult_decoupled
 
   test-examples-2:
-    name: Test Examples 2/2
+    name: Test Examples 2/4
     needs: [profiling]
     uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
     with:
       path: ./build/dpsim/examples/cxx/WSCC_9bus_mult_coupled
       name: WSCC_9bus_mult_coupled
+
+  test-examples-3:
+    name: Test Examples 3/4
+    needs: [profiling]
+    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
+    with:
+      path: ./build/dpsim/examples/cxx/EMT_WSCC_9bus_split_decoupled
+      name: WSCC_9bus_split_decoupled
+
+  test-examples-4:
+    name: Test Examples 4/4
+    needs: [profiling]
+    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
+    with:
+      path: ./build/dpsim/examples/cxx/DP_WSCC_9bus_split_decoupled
+      name: WSCC_9bus_split_decoupled

dpsim-models/include/dpsim-models/DP/DP_Ph1_RXLoad.h

@@ -51,6 +51,8 @@ class RXLoad : public CompositePowerComp<Complex>,
   /// Defines name, component parameters and logging level
   RXLoad(String name, Logger::Level logLevel = Logger::Level::off);
 
+  SimPowerComp<Complex>::Ptr clone(String name) override;
+
   // #### General ####
   /// Initialize component from power flow data
   void initializeFromNodesAndTerminals(Real frequency) override;

dpsim-models/include/dpsim-models/SystemTopology.h

@@ -147,6 +147,10 @@ class SystemTopology {
   /// Copy the whole topology the given number of times and add the resulting components and nodes to the topology.
   void multiply(Int numberCopies);
 
+  /// @brief Remove system component
+  /// @param name name of the component
+  void removeComponent(const String &name);
+
   ///
   template <typename VarType>
   int checkTopologySubnets(

dpsim-models/src/DP/DP_Ph1_RXLoad.cpp

@@ -25,6 +25,12 @@ DP::Ph1::RXLoad::RXLoad(String uid, String name, Logger::Level logLevel)
 DP::Ph1::RXLoad::RXLoad(String name, Logger::Level logLevel)
     : RXLoad(name, name, logLevel) {}
 
+SimPowerComp<Complex>::Ptr DP::Ph1::RXLoad::clone(String name) {
+  auto copy = RXLoad::make(name, mLogLevel);
+  copy->setParameters(**mActivePower, **mReactivePower, **mNomVoltage);
+  return copy;
+}
+
 void DP::Ph1::RXLoad::initializeFromNodesAndTerminals(Real frequency) {
 
   if (!mParametersSet) {

dpsim-models/src/SystemTopology.cpp

@@ -243,6 +243,14 @@ void SystemTopology::reset() {
   // }
 }
 
+void SystemTopology::removeComponent(const String &name) {
+  for (auto it = mComponents.begin(); it != mComponents.end(); ++it) {
+    if ((*it)->name() == name) {
+      mComponents.erase(it);
+    }
+  }
+}
+
 template <typename VarType>
 void SystemTopology::splitSubnets(std::vector<SystemTopology> &splitSystems) {
   std::unordered_map<typename SimNode<VarType>::Ptr, int> subnet;

dpsim/examples/cxx/CIM/DP_WSCC_9bus_split_decoupled.cpp

@@ -0,0 +1,113 @@
+/* Copyright 2017-2021 Institute for Automation of Complex Power Systems,
+ *                     EONERC, RWTH Aachen University
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *********************************************************************************/
+
+#include <fstream>
+#include <iostream>
+#include <list>
+
+#include <DPsim.h>
+#include <dpsim/ThreadLevelScheduler.h>
+
+using namespace DPsim;
+using namespace CPS;
+
+String decoupleLine(SystemTopology &sys, const String &lineName, const String &node1, const String node2) {
+  auto origLine = sys.component<DP::Ph1::PiLine>(lineName);
+  Real Rline = origLine->attributeTyped<Real>("R_series")->get();
+  Real Lline = origLine->attributeTyped<Real>("L_series")->get();
+  Real Cline = origLine->attributeTyped<Real>("C_parallel")->get();
+
+  sys.removeComponent(lineName);
+
+  String dline_name = "dline_" + node1 + "_" + node2;
+
+  auto line = Signal::DecouplingLine::make(
+    "dline_" + node1 + "_" + node2, sys.node<DP::SimNode>(node1),
+    sys.node<DP::SimNode>(node2), Rline, Lline, Cline, Logger::Level::debug
+  );
+  sys.addComponent(line);
+  sys.addComponents(line->getLineComponents());
+
+  return dline_name;
+}
+
+void doSim(String &name, SystemTopology &sys, Int threads) {
+
+  // Logging
+  auto logger = DataLogger::make(name);
+  // logger->logAttribute("BUS5.v", sys.node<DP::SimNode>("BUS5")->attribute("v"));
+  // logger->logAttribute("BUS6.v", sys.node<DP::SimNode>("BUS6")->attribute("v"));
+  // logger->logAttribute("BUS8.v", sys.node<DP::SimNode>("BUS8")->attribute("v"));
+  for (Int bus  = 1; bus <= 9; bus++) {
+    String attrName = "v" + std::to_string(bus);
+    String nodeName = "BUS" + std::to_string(bus);
+    logger->logAttribute(attrName, sys.node<DP::SimNode>(nodeName)->attribute("v"));
+  }
+
+  Simulation sim(name, Logger::Level::debug);
+  sim.setSystem(sys);
+  sim.setTimeStep(0.0001);
+  sim.setFinalTime(0.5);
+  sim.setDomain(Domain::DP);
+  sim.doSplitSubnets(true);
+  sim.doInitFromNodesAndTerminals(true);
+  sim.addLogger(logger);
+  if (threads > 0)
+    sim.setScheduler(std::make_shared<OpenMPLevelScheduler>(threads));
+
+  //std::ofstream of1("topology_graph.svg");
+  //sys.topologyGraph().render(of1));
+
+  sim.run();
+  sim.logStepTimes(name + "_step_times");
+}
+
+int main(int argc, char *argv[]) {
+  CommandLineArgs args(argc, argv);
+
+  std::list<fs::path> filenames;
+  filenames = DPsim::Utils::findFiles(
+      {"WSCC-09_DI.xml", "WSCC-09_EQ.xml", "WSCC-09_SV.xml",
+       "WSCC-09_TP.xml"},
+      "build/_deps/cim-data-src/WSCC-09/WSCC-09", "CIMPATH");
+
+  Int numThreads = 0;
+  Int numSeq = 0;
+
+  if (args.options.find("threads") != args.options.end())
+    numThreads = args.getOptionInt("threads");
+  if (args.options.find("seq") != args.options.end())
+    numSeq = args.getOptionInt("seq");
+
+  std::cout << "Simulate with " << numThreads
+            << " threads, sequence number " << numSeq << std::endl;
+
+  // Monolithic Simulation
+  String simNameMonolithic = "WSCC-9bus_monolithic_DP";
+  Logger::setLogDir("logs/" + simNameMonolithic);
+  CIM::Reader readerMonolithic(simNameMonolithic, Logger::Level::debug, Logger::Level::debug);
+  SystemTopology systemMonolithic =
+      readerMonolithic.loadCIM(60, filenames, Domain::DP, PhaseType::Single,
+                     CPS::GeneratorType::IdealVoltageSource);
+
+  doSim(simNameMonolithic, systemMonolithic, 0);
+
+  // Decoupled Simulation
+  String simNameDecoupled = "WSCC_9bus_split_decoupled_DP_" + std::to_string(numThreads) + "_" + std::to_string(numSeq);
+  Logger::setLogDir("logs/" + simNameDecoupled);
+  CIM::Reader readerDecoupled(simNameDecoupled, Logger::Level::debug, Logger::Level::debug);
+  SystemTopology systemDecoupled = readerDecoupled.loadCIM(60, filenames, Domain::DP, PhaseType::Single,
+                                   CPS::GeneratorType::IdealVoltageSource);
+
+  String dline_75 = decoupleLine(systemDecoupled, "LINE75", "BUS5", "BUS7");
+  // decouple_line(system, "LINE78", "BUS7", "BUS8");
+  String dline_64 = decoupleLine(systemDecoupled, "LINE64", "BUS6", "BUS4");
+  String dline_89 = decoupleLine(systemDecoupled, "LINE89", "BUS8", "BUS9");
+
+  doSim(simNameDecoupled, systemDecoupled, numThreads);
+}

dpsim/examples/cxx/CIM/EMT_WSCC_9bus_split_decoupled.cpp

@@ -0,0 +1,121 @@
+/* Copyright 2017-2021 Institute for Automation of Complex Power Systems,
+ *                     EONERC, RWTH Aachen University
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *********************************************************************************/
+
+#include <fstream>
+#include <iostream>
+#include <list>
+
+#include <DPsim.h>
+#include <dpsim/ThreadLevelScheduler.h>
+
+using namespace DPsim;
+using namespace CPS;
+
+String decoupleLine(SystemTopology &sys, const String &lineName, const String &node1, const String node2) {
+  auto origLine = sys.component<EMT::Ph3::PiLine>(lineName);
+  Matrix Rline = origLine->attributeTyped<Matrix>("R_series")->get();
+  Matrix Lline = origLine->attributeTyped<Matrix>("L_series")->get();
+  Matrix Cline = origLine->attributeTyped<Matrix>("C_parallel")->get();
+
+  sys.removeComponent(lineName);
+
+  String dline_name = "dline_" + node1 + "_" + node2;
+
+  auto line = Signal::DecouplingLineEMT::make(
+    "dline_" + node1 + "_" + node2,
+    Logger::Level::debug
+  );
+
+  Real Rline_scalar = Rline(0,0);
+  Real Lline_scalar = Lline(0,0);
+  Real Cline_scalar = Cline(0,0);
+
+  line->setParameters(
+    sys.node<EMT::SimNode>(node1), sys.node<EMT::SimNode>(node2),
+    Rline_scalar, Lline_scalar, Cline_scalar);
+  sys.addComponent(line);
+  sys.addComponents(line->getLineComponents());
+
+  return dline_name;
+}
+
+void doSim(String &name, SystemTopology &sys, Int threads) {
+
+  // Logging
+  auto logger = DataLogger::make(name);
+  // logger->logAttribute("BUS5.v", sys.node<EMT::SimNode>("BUS5")->attribute("v"));
+  // logger->logAttribute("BUS6.v", sys.node<EMT::SimNode>("BUS6")->attribute("v"));
+  // logger->logAttribute("BUS8.v", sys.node<EMT::SimNode>("BUS8")->attribute("v"));
+  for (Int bus  = 1; bus <= 9; bus++) {
+    String attrName = "v" + std::to_string(bus);
+    String nodeName = "BUS" + std::to_string(bus);
+    logger->logAttribute(attrName, sys.node<EMT::SimNode>(nodeName)->attribute("v"));
+  }
+
+  Simulation sim(name, Logger::Level::debug);
+  sim.setSystem(sys);
+  sim.setTimeStep(0.0001);
+  sim.setFinalTime(0.5);
+  sim.setDomain(Domain::EMT);
+  sim.doSplitSubnets(true);
+  sim.doInitFromNodesAndTerminals(true);
+  sim.addLogger(logger);
+  if (threads > 0)
+    sim.setScheduler(std::make_shared<OpenMPLevelScheduler>(threads));
+
+  //std::ofstream of1("topology_graph.svg");
+  //sys.topologyGraph().render(of1));
+
+  sim.run();
+  sim.logStepTimes(name + "_step_times");
+}
+
+int main(int argc, char *argv[]) {
+  CommandLineArgs args(argc, argv);
+
+  std::list<fs::path> filenames;
+  filenames = DPsim::Utils::findFiles(
+      {"WSCC-09_DI.xml", "WSCC-09_EQ.xml", "WSCC-09_SV.xml",
+       "WSCC-09_TP.xml"},
+      "build/_deps/cim-data-src/WSCC-09/WSCC-09", "CIMPATH");
+
+  Int numThreads = 0;
+  Int numSeq = 0;
+
+  if (args.options.find("threads") != args.options.end())
+    numThreads = args.getOptionInt("threads");
+  if (args.options.find("seq") != args.options.end())
+    numSeq = args.getOptionInt("seq");
+
+  std::cout << "Simulate with " << numThreads
+            << " threads, sequence number " << numSeq << std::endl;
+
+  // Monolithic Simulation
+  String simNameMonolithic = "WSCC-9bus_monolithic_EMT";
+  Logger::setLogDir("logs/" + simNameMonolithic);
+  CIM::Reader readerMonolithic(simNameMonolithic, Logger::Level::debug, Logger::Level::debug);
+  SystemTopology systemMonolithic =
+      readerMonolithic.loadCIM(60, filenames, Domain::EMT, PhaseType::ABC,
+                     CPS::GeneratorType::IdealVoltageSource);
+
+  doSim(simNameMonolithic, systemMonolithic, 0);
+
+  // Decoupled Simulation
+  String simNameDecoupled = "WSCC_9bus_split_decoupled_EMT_" + std::to_string(numThreads) + "_" + std::to_string(numSeq);
+  Logger::setLogDir("logs/" + simNameDecoupled);
+  CIM::Reader readerDecoupled(simNameDecoupled, Logger::Level::debug, Logger::Level::debug);
+  SystemTopology systemDecoupled = readerDecoupled.loadCIM(60, filenames, Domain::EMT, PhaseType::ABC,
+                                   CPS::GeneratorType::IdealVoltageSource);
+
+  String dline_75 = decoupleLine(systemDecoupled, "LINE75", "BUS5", "BUS7");
+  // decouple_line(system, "LINE78", "BUS7", "BUS8");
+  String dline_64 = decoupleLine(systemDecoupled, "LINE64", "BUS6", "BUS4");
+  String dline_89 = decoupleLine(systemDecoupled, "LINE89", "BUS8", "BUS9");
+
+  doSim(simNameDecoupled, systemDecoupled, numThreads);
+}

dpsim/examples/cxx/CIM/WSCC-9bus_CIM.cpp

@@ -73,7 +73,7 @@ int main(int argc, char *argv[]) {
   SystemTopology sys =
       reader2.loadCIM(60, filenames, Domain::DP, PhaseType::Single,
                       CPS::GeneratorType::IdealVoltageSource);
-  sys.initWithPowerflow(systemPF, CPS::Domain::EMT);
+  sys.initWithPowerflow(systemPF, CPS::Domain::DP);
 
   // Logging
   auto logger = DataLogger::make(simName);

dpsim/examples/cxx/CIM/WSCC_9bus_mult_coupled.cpp

@@ -87,19 +87,19 @@ void simulateCoupled(std::list<fs::path> filenames, CommandLineArgs &args,
     sim.setScheduler(std::make_shared<OpenMPLevelScheduler>(threads));
 
   // Logging
-  //auto logger = DataLogger::make(simName);
-  //for (Int cop = 1; cop <= copies; cop++) {
-  //	for (Int bus  = 1; bus <= 9; bus++) {
-  //		String attrName = "v" + std::to_string(bus) + "_" + std::to_string(cop);
-  //		String nodeName = "BUS" + std::to_string(bus) + "_" + std::to_string(cop);
-  //		if (cop == 1) {
-  //			attrName = "v" + std::to_string(bus);
-  //			nodeName = "BUS" + std::to_string(bus);
-  //		}
-  //		logger->logAttribute(attrName, sys.node<DP::SimNode>(nodeName)->attribute("v"));
-  //	}
-  //}
-  //sim.addLogger(logger);
+  auto logger = DataLogger::make(simName);
+  for (Int cop = 1; cop <= copies; cop++) {
+  	for (Int bus  = 1; bus <= 9; bus++) {
+  		String attrName = "v" + std::to_string(bus) + "_" + std::to_string(cop);
+  		String nodeName = "BUS" + std::to_string(bus) + "_" + std::to_string(cop);
+  		if (cop == 1) {
+  			attrName = "v" + std::to_string(bus);
+  			nodeName = "BUS" + std::to_string(bus);
+  		}
+  		logger->logAttribute(attrName, sys.node<DP::SimNode>(nodeName)->attribute("v"));
+  	}
+  }
+  sim.addLogger(logger);
 
   sim.run();
   sim.logStepTimes(simName + "_step_times");