Signal Bus Implementation

examples/PhasorDynamics/Small/TenGen/Classical/CMakeLists.txt

@@ -4,6 +4,7 @@ target_link_libraries(TenGenClassical
 	GRIDKIT::phasor_dynamics_bus_fault 
 	GRIDKIT::phasor_dynamics_branch
 	GRIDKIT::phasor_dynamics_gen_classical
+	GRIDKIT::phasor_dynamics_governortgov1
 	GRIDKIT::phasor_dynamics_load
 	GRIDKIT::solvers_dyn)
 install(TARGETS TenGenClassical RUNTIME DESTINATION bin)

examples/PhasorDynamics/Small/TenGen/Genrou/CMakeLists.txt

@@ -5,6 +5,7 @@ target_link_libraries(TenGenGenrou
 	GRIDKIT::phasor_dynamics_branch
 	GRIDKIT::phasor_dynamics_genrou
 	GRIDKIT::phasor_dynamics_gen_classical
+	GRIDKIT::phasor_dynamics_governortgov1
 	GRIDKIT::phasor_dynamics_load
 	GRIDKIT::solvers_dyn)
 install(TARGETS TenGenGenrou RUNTIME DESTINATION bin)

examples/PhasorDynamics/Tiny/ThreeBus/Basic/CMakeLists.txt

@@ -4,6 +4,7 @@ target_link_libraries(ThreeBusBasic
 	GRIDKIT::phasor_dynamics_bus_fault 
 	GRIDKIT::phasor_dynamics_branch
 	GRIDKIT::phasor_dynamics_genrou
+	GRIDKIT::phasor_dynamics_governortgov1
 	GRIDKIT::phasor_dynamics_gen_classical
 	GRIDKIT::phasor_dynamics_load
 	GRIDKIT::solvers_dyn)

examples/PhasorDynamics/Tiny/ThreeBus/Classical/CMakeLists.txt

@@ -10,6 +10,7 @@ target_link_libraries(ThreeBusClassical
 	GRIDKIT::phasor_dynamics_branch
 	GRIDKIT::phasor_dynamics_genrou
 	GRIDKIT::phasor_dynamics_gen_classical
+	GRIDKIT::phasor_dynamics_governortgov1
 	GRIDKIT::phasor_dynamics_load
 	GRIDKIT::solvers_dyn)
 install(TARGETS ThreeBusClassical RUNTIME DESTINATION bin)

examples/PhasorDynamics/Tiny/TwoBus/Basic/CMakeLists.txt

@@ -4,6 +4,7 @@ target_link_libraries(TwoBusBasic
 	GRIDKIT::phasor_dynamics_bus_fault 
 	GRIDKIT::phasor_dynamics_branch
 	GRIDKIT::phasor_dynamics_genrou
+	GRIDKIT::phasor_dynamics_governortgov1
 	GRIDKIT::phasor_dynamics_gen_classical
 	GRIDKIT::phasor_dynamics_load
 	GRIDKIT::solvers_dyn)

examples/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.cpp

@@ -72,6 +72,7 @@ int main()
   // Set generator data
   data.genrou.resize(1);
 
+  data.genrou[0].ports[GenrouPorts::bus] = data.bus[0].bus_id;
   data.genrou[0].parameters[GenrouParameters::p0]    = 1.;
   data.genrou[0].parameters[GenrouParameters::q0]    = 0.05013;
   data.genrou[0].parameters[GenrouParameters::H]     = 3.;

examples/PhasorDynamics/Tiny/TwoBus/Tgov1/TwoBusTgov1.cpp

@@ -49,7 +49,7 @@ int main()
   SystemModelData<scalar_type, index_type> data;
 
   // Set bus data
-  data.bus.resize(2);
+  data.bus.resize(4);
 
   data.bus[0].bus_id   = 0;
   data.bus[0].bus_type = BusType::DEFAULT;
@@ -61,6 +61,14 @@ int main()
   data.bus[1].Vr0      = 1.0;
   data.bus[1].Vi0      = 0.0;
 
+  // Pmech Signal Bus
+  data.bus[2].bus_id   = 2;
+  data.bus[2].bus_type = BusType::SIGNAL;
+
+  // Speed Signal Bus
+  data.bus[3].bus_id   = 3;
+  data.bus[3].bus_type = BusType::SIGNAL;
+
   // Set branch data
   data.branch.resize(1);
 
@@ -78,15 +86,13 @@ int main()
   data.bus_fault[0].parameters[BusFaultParameters::X]      = 1e-3;
   data.bus_fault[0].parameters[BusFaultParameters::state0] = false;
 
-  //
-  // Instantiate system model
-  //
-
-  SystemModel<scalar_type, index_type> sys(data);
 
   // Set generator data
   data.genrou.resize(1);
 
+  data.genrou[0].ports[GenrouPorts::bus] = data.bus[0].bus_id;
+  data.genrou[0].ports[GenrouPorts::pmech_signal] = 2;
+  data.genrou[0].ports[GenrouPorts::speed_signal] = 3;
   data.genrou[0].parameters[GenrouParameters::p0]    = 1.;
   data.genrou[0].parameters[GenrouParameters::q0]    = 0.05013;
   data.genrou[0].parameters[GenrouParameters::H]     = 3.;
@@ -106,9 +112,11 @@ int main()
   data.genrou[0].parameters[GenrouParameters::S10]   = 0.;
   data.genrou[0].parameters[GenrouParameters::S12]   = 0.;
 
+  // Governor TODO use new data structure
   data.gov.resize(1);
 
-  // Set Gov data (Default PW values)
+  data.gov[0].signal_speed = 3;
+  data.gov[0].signal_pmech = 2; 
   data.gov[0].R     = 0.05;
   data.gov[0].Pvmin = 0;
   data.gov[0].Pvmax = 1.0;
@@ -117,27 +125,8 @@ int main()
   data.gov[0].T3    = 7.5;
   data.gov[0].Dt    = 0;
 
-  // Manual add gen & gov components
-  // This is a hack  since SignalBus not implemented
-
-  // Create Pointers first
-  Genrou<scalar_type, index_type>*          gen;
-  Governor::Tgov1<scalar_type, index_type>* gov;
-
-  // Instatiate Genrou & add to system model
-  gen = new Genrou<scalar_type, index_type>(
-      sys.getBus(0),
-      data.genrou[0]);
-
-  // Instatiate GovernorTgov1 & add to system model
-  gov = new Governor::Tgov1<scalar_type, index_type>(
-      gen,
-      data.gov[0]);
-  gen->setgovenor(gov);
-
-  // Add Generator and Governor to System
-  sys.addComponent(gen);
-  sys.addComponent(gov);
+  // Instantiate system model
+  SystemModel<scalar_type, index_type> sys(data);
 
   sys.allocate();
 
@@ -179,7 +168,8 @@ int main()
   {
     std::vector<scalar_type>& y_val = sys.y();
 
-    output.push_back(OutputData{t, y_val[0], y_val[1], y_val[3]});
+    // Note Omega of gen is at state index 5! (Each added signal shifted by 1)
+    output.push_back(OutputData{t, y_val[0], y_val[1], y_val[5]});
   };
 
   // Set up simulation

src/Model/PhasorDynamics/Bus/Bus.hpp

@@ -45,6 +45,22 @@ namespace GridKit
         return BusTypeT::DEFAULT;
       }
 
+      // TODO remove, uneeded
+      void initial_value(ScalarT) override
+      {
+      }
+
+      // TODO remove, uneeded
+      ScalarT& read() override
+      {
+        return y_[0];
+      }
+
+      // TODO remove, uneeded
+      void write(ScalarT&) override
+      {
+      }
+
       virtual ScalarT& Vr() override
       {
         return y_[0];

src/Model/PhasorDynamics/Bus/BusData.hpp

@@ -41,6 +41,7 @@ namespace GridKit
         INVALID,
         DEFAULT,
         SLACK,
+        SIGNAL
       };
 
       BusType bus_type{BusType::INVALID}; ///< The kind of bus this data is for

src/Model/PhasorDynamics/Bus/BusFactory.hpp

@@ -4,6 +4,7 @@
 #include <Model/PhasorDynamics/Bus/Bus.hpp>
 #include <Model/PhasorDynamics/Bus/BusData.hpp>
 #include <Model/PhasorDynamics/Bus/BusInfinite.hpp>
+#include <Model/PhasorDynamics/Bus/BusSignal.hpp>
 
 namespace GridKit
 {
@@ -31,6 +32,9 @@ namespace GridKit
         case BusTypeT::SLACK:
           bus = new BusInfinite<ScalarT, IdxT>(data);
           break;
+        case BusTypeT::SIGNAL:
+          bus = new BusSignal<ScalarT, IdxT>(data);
+          break;
         default:
           // Throw exception
           std::cout << "Bus type " << static_cast<int>(data.bus_type) << " unrecognized.\n";

src/Model/PhasorDynamics/Bus/BusInfinite.hpp

@@ -42,6 +42,22 @@ namespace GridKit
         return BusTypeT::SLACK;
       }
 
+      // TODO remove, uneeded
+      void initial_value(ScalarT) override
+      {
+      }
+
+      // TODO remove, uneeded
+      ScalarT& read() override
+      {
+        return y_[0];
+      }
+
+      // TODO remove, uneeded
+      void write(ScalarT&) override
+      {
+      }
+
       virtual ScalarT& Vr() override
       {
         return Vr_;

src/Model/PhasorDynamics/Bus/BusSignal.cpp

@@ -0,0 +1,80 @@
+
+#include "BusSignal.hpp"
+
+#include <cmath>
+#include <iostream>
+
+#include <Model/PhasorDynamics/Bus/BusData.hpp>
+
+namespace GridKit
+{
+  namespace PhasorDynamics
+  {
+
+    template <class ScalarT, typename IdxT>
+    BusSignal<ScalarT, IdxT>::BusSignal(const DataT& data)
+      : BusBase<ScalarT, IdxT>(data.bus_id)
+    {
+      size_ = 1;
+    }
+
+    template <class ScalarT, typename IdxT>
+    int BusSignal<ScalarT, IdxT>::allocate()
+    {
+      // Temporary while we use std::vector in the code
+      size_t size = static_cast<size_t>(size_);
+
+      // Resize component model data
+      f_.resize(size);
+      y_.resize(size);
+      yp_.resize(size);
+      tag_.resize(size);
+
+      fB_.resize(size);
+      yB_.resize(size);
+      ypB_.resize(size);
+
+      return 0;
+    }
+
+    template <class ScalarT, typename IdxT>
+    int BusSignal<ScalarT, IdxT>::tagDifferentiable()
+    {
+      tag_[0] = false;
+      return 0;
+    }
+
+    template <class ScalarT, typename IdxT>
+    int BusSignal<ScalarT, IdxT>::initialize()
+    {
+      /// Possible since not being used it causes issue?
+      y_[0]  = 0.0;
+      yp_[0] = 0.0;
+
+      return 0;
+    }
+
+    template <class ScalarT, typename IdxT>
+    int BusSignal<ScalarT, IdxT>::evaluateResidual()
+    {
+      // One side of equality of signal. Reference component
+      // must add to this residual after this function has been called.
+      f_[0] = -y_[0];
+
+      return 0;
+    }
+
+    template <class ScalarT, typename IdxT>
+    int BusSignal<ScalarT, IdxT>::evaluateJacobian()
+    {
+      return 0;
+    }
+
+    // Available template instantiations
+    template class BusSignal<double, long int>;
+    template class BusSignal<double, size_t>;
+    template class BusSignal<DependencyTracking::Variable, long int>;
+    template class BusSignal<DependencyTracking::Variable, size_t>;
+
+  } // namespace PhasorDynamics
+} // namespace GridKit