add appropriate ports

Author: lukelowry

GridKit/Model/PhasorDynamics/Converter/REGCA/README.md

@@ -93,8 +93,8 @@ Name       | Port   | Init    | Description
 `bus`      | Bus    | Known   | Terminal bus voltage
 `ipcmd`    | Input  | Unknown | Active-current command input
 `iqcmd`    | Input  | Unknown | Reactive-current command input
-`ibranchr` | Output | Known   | Branch-current real-component output
-`ibranchi` | Output | Known   | Branch-current imaginary-component output
+`ir`       | Output | Known   | Terminal-current real-component output
+`ii`       | Output | Known   | Terminal-current imaginary-component output
 `pbranch`  | Output | Known   | Branch active-power output
 `qbranch`  | Output | Known   | Branch reactive-power output
 
@@ -265,8 +265,8 @@ All internal derivatives initialize to zero.
 
 Monitor | Units  | Description                 | Note
 --------|--------|-----------------------------|------
-`ir`   | [p.u.] | Real current injection      | System base; exported through `ibranchr` when assigned
-`ii`   | [p.u.] | Imaginary current injection | System base; exported through `ibranchi` when assigned
+`ir`   | [p.u.] | Real current injection      | System base; exported through `ir` when assigned
+`ii`   | [p.u.] | Imaginary current injection | System base; exported through `ii` when assigned
 `p`    | [p.u.] | Active-power output         | System base; exported through `pbranch` when assigned
 `q`    | [p.u.] | Reactive-power output       | System base; exported through `qbranch` when assigned
 

GridKit/Model/PhasorDynamics/Converter/REGCA/RegcaData.hpp

@@ -55,10 +55,10 @@ namespace GridKit
       /// Signal outputs for the REGCA converter model.
       enum class RegcaSignalOutputs : size_t
       {
-        ibranchr, ///< Optional branch-current real-component output signal ID
-        ibranchi, ///< Optional branch-current imaginary-component output signal ID
-        pbranch,  ///< Optional branch active-power output signal ID
-        qbranch,  ///< Optional branch reactive-power output signal ID
+        ir,      ///< Optional terminal-current real-component output signal ID
+        ii,      ///< Optional terminal-current imaginary-component output signal ID
+        pbranch, ///< Optional branch active-power output signal ID
+        qbranch, ///< Optional branch reactive-power output signal ID
       };
 
       /// Variables available through the monitor interface.

GridKit/Model/PhasorDynamics/Converter/REGCA/RegcaImpl.hpp

@@ -332,13 +332,13 @@ namespace GridKit
 
         auto* y = y_.getData();
 
-        if (auto port = ports_.out.template port<RegcaSignalOutputs::ibranchr>())
+        if (auto port = ports_.out.template port<RegcaSignalOutputs::ir>())
         {
           port.link(&y[static_cast<size_t>(RegcaInternalVariables::IR)],
                     &(this->getVariableIndex(static_cast<IdxT>(RegcaInternalVariables::IR))));
         }
 
-        if (auto port = ports_.out.template port<RegcaSignalOutputs::ibranchi>())
+        if (auto port = ports_.out.template port<RegcaSignalOutputs::ii>())
         {
           port.link(&y[static_cast<size_t>(RegcaInternalVariables::II)],
                     &(this->getVariableIndex(static_cast<IdxT>(RegcaInternalVariables::II))));

GridKit/Model/PhasorDynamics/Load/LoadZ/CMakeLists.txt

@@ -33,6 +33,13 @@ gridkit_add_library(
   SOURCES LoadZDependencyTracking.cpp
   LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core)
 
+target_link_libraries(
+  phasor_dynamics_loadz
+  PUBLIC GridKit::phasor_dynamics_signal)
+target_link_libraries(
+  phasor_dynamics_loadz_dependency_tracking
+  PUBLIC GridKit::phasor_dynamics_signal_dependency_tracking)
+
 # Link to interface target for all components
 target_link_libraries(
   phasor_dynamics_components

GridKit/Model/PhasorDynamics/Load/LoadZ/LoadZ.hpp

@@ -3,6 +3,7 @@
 #include <GridKit/Model/PhasorDynamics/BusBase.hpp>
 #include <GridKit/Model/PhasorDynamics/Component.hpp>
 #include <GridKit/Model/PhasorDynamics/Load/LoadZ/LoadZData.hpp>
+#include <GridKit/Model/PhasorDynamics/SignalPorts.hpp>
 #include <GridKit/Model/VariableMonitor.hpp>
 
 namespace GridKit
@@ -43,6 +44,8 @@ namespace GridKit
       using ModelDataT = LoadZData<RealT, IdxT>;
       using MonitorT   = Model::VariableMonitor<LoadZ, LoadZData>;
 
+      using SignalPortsT = SignalPorts<ScalarT, ModelDataT>;
+
       LoadZ(BusT* bus);
       LoadZ(BusT* bus, RealT R, RealT X);
       LoadZ(BusT* bus, const ModelDataT& data);
@@ -62,6 +65,11 @@ namespace GridKit
       }
 
     public:
+      SignalPortsT& getPorts()
+      {
+        return ports_;
+      }
+
       void setR(RealT R)
       {
         R_ = R;
@@ -107,6 +115,8 @@ namespace GridKit
           const ScalarT*, const ScalarT*, const ScalarT*, ScalarT*);
 
     private:
+      SignalPortsT ports_;
+
       BusT* bus_{nullptr};
       RealT R_{0.1};
       RealT X_{0.01};

GridKit/Model/PhasorDynamics/Load/LoadZ/LoadZData.hpp

@@ -33,6 +33,8 @@ namespace GridKit
     /// Signal outputs supported for a load
     enum class LoadZSignalOutputs : size_t
     {
+      ir, ///< Real terminal current
+      ii, ///< Imaginary terminal current
     };
 
     /// Variables able to be monitored for a load

GridKit/Model/PhasorDynamics/Load/LoadZ/LoadZImpl.hpp

@@ -105,6 +105,15 @@ namespace GridKit
       wb_.resize(2);
       h_.resize(2);
 
+      if (auto port = ports_.out.template port<LoadZSignalOutputs::ir>())
+      {
+        port.link(&y_.getData()[0], &(this->getVariableIndex(0)));
+      }
+      if (auto port = ports_.out.template port<LoadZSignalOutputs::ii>())
+      {
+        port.link(&y_.getData()[1], &(this->getVariableIndex(1)));
+      }
+
       allocated_ = true;
       return 0;
     }

GridKit/Model/PhasorDynamics/Load/LoadZIP/CMakeLists.txt

@@ -28,6 +28,13 @@ gridkit_add_library(
   SOURCES LoadZIPDependencyTracking.cpp
   LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core)
 
+target_link_libraries(
+  phasor_dynamics_loadzip
+  PUBLIC GridKit::phasor_dynamics_signal)
+target_link_libraries(
+  phasor_dynamics_loadzip_dependency_tracking
+  PUBLIC GridKit::phasor_dynamics_signal_dependency_tracking)
+
 # Link to interface target for all components
 target_link_libraries(
   phasor_dynamics_components

GridKit/Model/PhasorDynamics/Load/LoadZIP/LoadZIP.hpp

@@ -3,6 +3,7 @@
 #include <GridKit/Model/PhasorDynamics/BusBase.hpp>
 #include <GridKit/Model/PhasorDynamics/Component.hpp>
 #include <GridKit/Model/PhasorDynamics/Load/LoadZIP/LoadZIPData.hpp>
+#include <GridKit/Model/PhasorDynamics/SignalPorts.hpp>
 #include <GridKit/Model/VariableMonitor.hpp>
 
 namespace GridKit
@@ -43,6 +44,8 @@ namespace GridKit
       using ModelDataT = LoadZIPData<RealT, IdxT>;
       using MonitorT   = Model::VariableMonitor<LoadZIP, LoadZIPData>;
 
+      using SignalPortsT = SignalPorts<ScalarT, ModelDataT>;
+
       LoadZIP(BusT* bus);
       LoadZIP(BusT* bus, RealT Pnom, RealT Qnom, RealT alphaI, RealT alphaP);
       LoadZIP(BusT* bus, const ModelDataT& data);
@@ -62,6 +65,11 @@ namespace GridKit
       }
 
     public:
+      SignalPortsT& getPorts()
+      {
+        return ports_;
+      }
+
       void setPnom(RealT Pnom)
       {
         Pnom_ = Pnom;
@@ -120,6 +128,8 @@ namespace GridKit
           const ScalarT*, const ScalarT*, const ScalarT*, ScalarT*);
 
     private:
+      SignalPortsT ports_;
+
       BusT* bus_{nullptr};
       RealT Pnom_{0};
       RealT Qnom_{0};

GridKit/Model/PhasorDynamics/Load/LoadZIP/LoadZIPData.hpp

@@ -30,6 +30,8 @@ namespace GridKit
     /// Signal outputs supported for a loadZIP
     enum class LoadZIPSignalOutputs : size_t
     {
+      ir, ///< Real terminal current
+      ii, ///< Imaginary terminal current
     };
 
     /// Variables able to be monitored for a loadZIP