misc formatting changes per reviewers

Author: lukelowry

GridKit/Model/PhasorDynamics/Controller/REPCA/RepcaImpl.hpp

@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <array>
 #include <atomic>
+#include <format>
 #include <stdexcept>
 #include <string>
 #include <utility>
@@ -927,7 +928,7 @@ namespace GridKit
         {
           if (value < ZERO<RealT>)
           {
-            throw std::invalid_argument(std::string("Repca: ") + name + " must be non-negative");
+            throw std::invalid_argument(std::format("Repca: {} must be non-negative", name));
           }
         }
 

GridKit/Model/PhasorDynamics/Exciter/IEEET1/Ieeet1.hpp

@@ -154,6 +154,10 @@ namespace GridKit
         void initModelParams(const ModelDataT& data);
         void setDerivedParameters();
 
+        /// Refresh one signal input and its global variable index.
+        template <Ieeet1SignalInputs input, Ieeet1ExternalVariables variable>
+        void readSignal(const ScalarT& fallback);
+
         /// Associate variable getter functions with enum values
         void initializeMonitor();
       };

GridKit/Model/PhasorDynamics/Exciter/IEEET1/Ieeet1Impl.hpp

@@ -411,54 +411,38 @@ namespace GridKit
         return 0;
       }
 
+      template <typename scalar_type, typename index_type>
+      template <Ieeet1SignalInputs input, Ieeet1ExternalVariables variable>
+      void Ieeet1<scalar_type, index_type>::readSignal(const ScalarT& fallback)
+      {
+        constexpr auto index = static_cast<size_t>(variable);
+        const auto&    port  = ports_.in.template port<input>();
+
+        ws_.getData()[index] = port.readOrDefault(fallback);
+        ws_indices_[index]   = port ? port.signalVariableIndex()
+                                    : INVALID_INDEX<IdxT>;
+      }
+
       /**
        * @brief Residual evaluation
        *
        */
       template <typename scalar_type, typename index_type>
       int Ieeet1<scalar_type, index_type>::evaluateResidual()
       {
-        const auto OMEGA = static_cast<size_t>(Ieeet1ExternalVariables::OMEGA);
-        const auto VREF  = static_cast<size_t>(Ieeet1ExternalVariables::VREF);
-        const auto VS    = static_cast<size_t>(Ieeet1ExternalVariables::VS);
-        const auto VUEL  = static_cast<size_t>(Ieeet1ExternalVariables::VUEL);
-        const auto VOEL  = static_cast<size_t>(Ieeet1ExternalVariables::VOEL);
+        using Input    = Ieeet1SignalInputs;
+        using Variable = Ieeet1ExternalVariables;
 
         auto* ws = ws_.getData();
 
         // Attached signals are read live; unattached ones keep the latched value.
-        ws[OMEGA] = omega_set_;
-        ws[VREF]  = vref_set_;
-        ws[VS]    = vs_set_;
-        ws[VUEL]  = vuel_set_;
-        ws[VOEL]  = voel_set_;
         std::fill(ws_indices_.begin(), ws_indices_.end(), INVALID_INDEX<IdxT>);
 
-        if (auto port = ports_.in.template port<Ieeet1SignalInputs::speed>())
-        {
-          ws[OMEGA]          = port.readSignal();
-          ws_indices_[OMEGA] = port.signalVariableIndex();
-        }
-        if (auto port = ports_.in.template port<Ieeet1SignalInputs::vref>())
-        {
-          ws[VREF]          = port.readSignal();
-          ws_indices_[VREF] = port.signalVariableIndex();
-        }
-        if (auto port = ports_.in.template port<Ieeet1SignalInputs::vs>())
-        {
-          ws[VS]          = port.readSignal();
-          ws_indices_[VS] = port.signalVariableIndex();
-        }
-        if (auto port = ports_.in.template port<Ieeet1SignalInputs::vuel>())
-        {
-          ws[VUEL]          = port.readSignal();
-          ws_indices_[VUEL] = port.signalVariableIndex();
-        }
-        if (auto port = ports_.in.template port<Ieeet1SignalInputs::voel>())
-        {
-          ws[VOEL]          = port.readSignal();
-          ws_indices_[VOEL] = port.signalVariableIndex();
-        }
+        readSignal<Input::speed, Variable::OMEGA>(omega_set_);
+        readSignal<Input::vref, Variable::VREF>(vref_set_);
+        readSignal<Input::vs, Variable::VS>(vs_set_);
+        readSignal<Input::vuel, Variable::VUEL>(vuel_set_);
+        readSignal<Input::voel, Variable::VOEL>(voel_set_);
 
         // Bus voltages
         auto* wb = wb_.getData();

GridKit/Model/PhasorDynamics/SystemModelImpl.hpp

@@ -1,4 +1,5 @@
 #include <cassert>
+#include <format>
 #include <iostream>
 #include <string>
 
@@ -520,7 +521,7 @@ namespace GridKit
         const auto component_checks = component->verify();
         for (const auto& error : component_checks.errors())
         {
-          checks.fail("component " + std::to_string(component->getGridKitComponentID()) + ": " + error);
+          checks.fail(std::format("component {}: {}", component->getGridKitComponentID(), error));
         }
       }