Add load data structure.

Author: pelesh

src/Model/PhasorDynamics/Branch/Branch.cpp

@@ -36,8 +36,8 @@ namespace GridKit
         X_(0.01),
         G_(0.0),
         B_(0.0),
-        bus1ID_(0),
-        bus2ID_(0)
+        bus1_id_(0),
+        bus2_id_(0)
     {
       size_ = 0;
     }
@@ -67,8 +67,8 @@ namespace GridKit
         X_(X),
         G_(G),
         B_(B),
-        bus1ID_(0),
-        bus2ID_(0)
+        bus1_id_(0),
+        bus2_id_(0)
     {
     }
 
@@ -80,8 +80,8 @@ namespace GridKit
         X_(data.X),
         G_(data.G),
         B_(data.B),
-        bus1ID_(data.fbus),
-        bus2ID_(data.tbus)
+        bus1_id_(data.bus1_id),
+        bus2_id_(data.bus2_id)
     {
       size_ = 0;
     }

src/Model/PhasorDynamics/Branch/Branch.hpp

@@ -11,21 +11,15 @@
 #include <Model/PhasorDynamics/Component.hpp>
 
 // Forward declarations.
-namespace GridKit
-{
-  namespace PhasorDynamics
-  {
-    template <typename RealT, typename IdxT>
-    struct BranchData;
-  }
-} // namespace GridKit
-
 namespace GridKit
 {
   namespace PhasorDynamics
   {
     template <class ScalarT, typename IdxT>
     class BusBase;
+
+    template <typename RealT, typename IdxT>
+    struct BranchData;
   }
 } // namespace GridKit
 
@@ -154,8 +148,8 @@ namespace GridKit
       real_type  X_;
       real_type  G_;
       real_type  B_;
-      const IdxT bus1ID_;
-      const IdxT bus2ID_;
+      const IdxT bus1_id_;
+      const IdxT bus2_id_;
     };
 
   } // namespace PhasorDynamics

src/Model/PhasorDynamics/Branch/BranchData.hpp

@@ -29,8 +29,8 @@ namespace GridKit
       RealT G{0.0}; ///< line shunt conductance
       RealT B{0.0}; ///< line shunt charging 
 
-      IdxT fbus{0}; ///< Unique ID of bus 1
-      IdxT tbus{0}; ///< Unique ID of bus 2
+      IdxT bus1_id{0}; ///< Unique ID of bus 1
+      IdxT bus2_id{0}; ///< Unique ID of bus 2
     };
   }
 }

src/Model/PhasorDynamics/Bus/BusData.hpp

@@ -1,7 +1,7 @@
 /**
  * @file BusData.hpp
  * @author Slaven Peles (peless@ornl.gov)
- * @brief Modeling data for branches (transmission lines)
+ * @brief Modeling data for buses (nodes)
  * 
  */
 #pragma once

src/Model/PhasorDynamics/Load/Load.cpp

@@ -5,6 +5,7 @@
 #include <iostream>
 
 #include <Model/PhasorDynamics/Bus/Bus.hpp>
+#include <Model/PhasorDynamics/Load/LoadData.hpp>
 
 namespace GridKit
 {
@@ -34,14 +35,12 @@ namespace GridKit
       : bus_(bus),
         R_(R),
         X_(X)
-
     {
     }
 
     template <class ScalarT, typename IdxT>
     Load<ScalarT, IdxT>::Load(bus_type* bus, IdxT component_id)
       : bus_(bus)
-
     {
       size_         = 0;
       component_id_ = component_id;

src/Model/PhasorDynamics/Load/Load.hpp

@@ -11,7 +11,10 @@ namespace GridKit
   {
     template <class ScalarT, typename IdxT>
     class BusBase;
-  }
+
+    template <typename RealT, typename IdxT>
+    struct LoadData;
+  } // namespace PhasorDynamics
 } // namespace GridKit
 
 namespace GridKit
@@ -33,16 +36,17 @@ namespace GridKit
       using Component<ScalarT, IdxT>::yp_;
       using Component<ScalarT, IdxT>::tag_;
       using Component<ScalarT, IdxT>::f_;
-      using Component<ScalarT, IdxT>::g_;
-      using Component<ScalarT, IdxT>::yB_;
-      using Component<ScalarT, IdxT>::ypB_;
-      using Component<ScalarT, IdxT>::fB_;
-      using Component<ScalarT, IdxT>::gB_;
-      using Component<ScalarT, IdxT>::param_;
+      // using Component<ScalarT, IdxT>::g_;
+      // using Component<ScalarT, IdxT>::yB_;
+      // using Component<ScalarT, IdxT>::ypB_;
+      // using Component<ScalarT, IdxT>::fB_;
+      // using Component<ScalarT, IdxT>::gB_;
+      // using Component<ScalarT, IdxT>::param_;
       using Component<ScalarT, IdxT>::component_id_;
 
-      using bus_type  = BusBase<ScalarT, IdxT>;
-      using real_type = typename Component<ScalarT, IdxT>::real_type;
+      using real_type       = typename Component<ScalarT, IdxT>::real_type;
+      using bus_type        = BusBase<ScalarT, IdxT>;
+      using model_data_type = LoadData<real_type, IdxT>;
 
     public:
       Load(bus_type* bus);

src/Model/PhasorDynamics/Load/LoadData.hpp

@@ -0,0 +1,33 @@
+/**
+ * @file LoadData.hpp
+ * @author Slaven Peles (peless@ornl.gov)
+ * @brief Modeling data for loads
+ * 
+ */
+#pragma once
+
+
+namespace GridKit
+{
+  namespace PhasorDynamics
+  {
+    /**
+     * @brief Contains modeling data for a Load
+     * 
+     * @tparam RealT Real parameter data type
+     * @tparam IdxT  Integer parameter data type
+     * 
+     * Integer parameters are of the same type as matrix and vector indices.
+     * 
+     * @todo Decide on naming scheme for model parameters.
+     */
+    template <typename RealT, typename IdxT>
+    struct LoadData
+    {
+      RealT R{0.0}; ///< load resistance
+      RealT X{0.0}; ///< load reactance
+
+      IdxT bus_id{0}; ///< Unique ID of bus 1
+    };
+  }
+}