update more parameter retrieval to use constexpr evaluation.

phlptp · phlptp · commit b3e462350a81 · 2026-06-16T17:50:40.000-07:00
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -21,10 +21,10 @@ jobs:
     name: ASan
     runs-on: ubuntu-latest
     container:
-      image: helics/buildenv:sanitizers-22
+      image: "helics/buildenv:sanitizers-22"
     env:
-      ASAN_OPTIONS: detect_leaks=0
-      LSAN_OPTIONS: verbosity=1:log_threads=1
+      ASAN_OPTIONS: "detect_leaks=0"
+      LSAN_OPTIONS: "verbosity=1:log_threads=1"
 
     steps:
       - uses: actions/checkout@v6
diff --git a/ThirdParty/Minizip/CMakeLists.txt b/ThirdParty/Minizip/CMakeLists.txt
@@ -50,7 +50,7 @@ if(NOT CPACK_INCLUDED)
     include(CPack)
 endif(NOT CPACK_INCLUDED)
 
-if(NOT DEFINED ZLIB_BUILD_MINIZIP)
+if(NOT DEFINED ZLIB_BUILD_MINIZIP AND NOT GRIDDYN_MINIZIP_USE_EXISTING_ZLIB_TARGETS)
     if(MINIZIP_BUILD_SHARED)
         list(APPEND REQUIRED_COMPONENTS "shared")
     endif(MINIZIP_BUILD_SHARED)
@@ -60,7 +60,7 @@ if(NOT DEFINED ZLIB_BUILD_MINIZIP)
     endif(MINIZIP_BUILD_STATIC)
 
     find_package(ZLIB REQUIRED COMPONENTS ${REQUIRED_COMPONENTS} CONFIG)
-endif(NOT DEFINED ZLIB_BUILD_MINIZIP)
+endif(NOT DEFINED ZLIB_BUILD_MINIZIP AND NOT GRIDDYN_MINIZIP_USE_EXISTING_ZLIB_TARGETS)
 
 if(MINIZIP_ENABLE_BZIP2)
     find_package(BZip2 REQUIRED)
@@ -279,4 +279,3 @@ if(MINIZIP_INSTALL)
         COMPONENT Development
         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 endif(MINIZIP_INSTALL)
-
diff --git a/src/core/CoreObjectTemplates.hpp b/src/core/CoreObjectTemplates.hpp
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "CoreObject.h"
+#include <span>
 #include <type_traits>
 namespace griddyn {
 /**
@@ -55,9 +56,9 @@ A* cloneBase(const A* originalObject, CoreObject* obj)
 template<class A, class B>
 void getParamString(const A* cobj,
                     stringVec& pstr,
-                    const stringVec& numStr,
-                    const stringVec& strStr,
-                    const stringVec& flagStr,
+                    std::span<const std::string_view> numStr,
+                    std::span<const std::string_view> strStr,
+                    std::span<const std::string_view> flagStr,
                     ParamStringType pstype)
 {
     static_assert(std::is_base_of<B, A>::value,
@@ -77,13 +78,13 @@ void getParamString(const A* cobj,
             cobj->B::getParameterStrings(pstr, ParamStringType::STR);
             break;
         case ParamStringType::LOCAL_NUM:
-            pstr = numStr;
+            pstr.assign(numStr.begin(), numStr.end());
             break;
         case ParamStringType::LOCAL_STR:
-            pstr = strStr;
+            pstr.assign(strStr.begin(), strStr.end());
             break;
         case ParamStringType::LOCAL_FLAGS:
-            pstr = flagStr;
+            pstr.assign(flagStr.begin(), flagStr.end());
             break;
         case ParamStringType::NUMERIC:
             pstr.reserve(pstr.size() + numStr.size());
diff --git a/src/griddyn/GridComponent.cpp b/src/griddyn/GridComponent.cpp
@@ -12,6 +12,7 @@
 #include "gmlc/utilities/stringOps.h"
 #include "gmlc/utilities/vectorOps.hpp"
 #include "utilities/MatrixData.hpp"
+#include <array>
 #include <algorithm>
 #include <cassert>
 #include <format>
@@ -573,22 +574,18 @@ void GridComponent::disconnect()
 {
     opFlags.set(DISCONNECTED);
 }
-static const stringVec& localNumericStrings()
-{
-    static const stringVec strings{"status", "basefrequency", "basepower"};
-    return strings;
-}
+static constexpr auto localNumericStrings =
+    std::array<std::string_view, 3>{"status", "basefrequency", "basepower"};
 
-static const stringVec& localStringStrings()
-{
-    static const stringVec strings{"status"};
-    return strings;
-}
+static constexpr auto localStringStrings =
+    std::array<std::string_view, 1>{"status"};
+
+static constexpr std::array<std::string_view, 0> localFlagStrings{};
 
 void GridComponent::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
     getParamString<GridComponent, CoreObject>(
-        this, pstr, localNumericStrings(), localStringStrings(), {}, pstype);
+        this, pstr, localNumericStrings, localStringStrings, localFlagStrings, pstype);
 }
 
 void GridComponent::set(std::string_view param, std::string_view val)
diff --git a/src/griddyn/links/AcLine.cpp b/src/griddyn/links/AcLine.cpp
@@ -17,6 +17,7 @@
 #include "gmlc/utilities/stringOps.h"
 #include "gmlc/utilities/vectorOps.hpp"
 #include "utilities/MatrixDataCompact.hpp"
+#include <array>
 #include <cmath>
 #include <complex>
 #include <cstring>
@@ -155,23 +156,24 @@ void AcLine::timestep(const CoreTime time, const IOdata& /*inputs*/, const Solve
 
 void AcLine::checkMerge() {}
 
-static const stringVec LOC_NUM_STRINGS{"r",
-                                       "x",
-                                       "link",
-                                       "b",
-                                       "g",
-                                       "tap",
-                                       "tapangle",
-                                       "switch1",
-                                       "switch2",
-                                       "fault",
-                                       "p"};
-static const stringVec LOC_STR_STRINGS{"from", "to"};
-static const stringVec FLAG_STRINGS{};
+static constexpr auto locNumStrings = std::array<std::string_view, 11>{"r",
+                                                                        "x",
+                                                                        "link",
+                                                                        "b",
+                                                                        "g",
+                                                                        "tap",
+                                                                        "tapangle",
+                                                                        "switch1",
+                                                                        "switch2",
+                                                                        "fault",
+                                                                        "p"};
+static constexpr auto locStrStrings =
+    std::array<std::string_view, 2>{"from", "to"};
+static constexpr std::array<std::string_view, 0> flagStrings{};
 void AcLine::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
     getParamString<AcLine, GridComponent>(
-        this, pstr, LOC_NUM_STRINGS, LOC_STR_STRINGS, FLAG_STRINGS, pstype);
+        this, pstr, locNumStrings, locStrStrings, flagStrings, pstype);
 }
 
 // set properties
diff --git a/src/griddyn/links/AdjustableTransformer.cpp b/src/griddyn/links/AdjustableTransformer.cpp
@@ -16,6 +16,7 @@
 #include "griddyn/griddyn-config.h"
 #include "utilities/MatrixData.hpp"
 #include "utilities/MatrixDataTranslate.hpp"
+#include <array>
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -82,30 +83,32 @@ CoreObject* AdjustableTransformer::clone(CoreObject* obj) const
     return lnk;
 }
 
-static const stringVec LOC_NUM_STRINGS{"vmin",
-                                       "vmax",
-                                       "vtarget",
-                                       "pmin",
-                                       "pmax",
-                                       "ptarget",
-                                       "qmin",
-                                       "qmax",
-                                       "qtarget",
-                                       "direction",
-                                       "mintap",
-                                       "maxtap",
-                                       "mintapangle",
-                                       "maxtapangle",
-                                       "stepsize",
-                                       "nsteps",
-                                       "dtapdt",
-                                       "dtapadt"};
-static const stringVec LOC_STR_STRINGS{"controlmode", "changemode", "centermode"};
-static const stringVec FLAG_STRINGS{"no_pflow_adjustments"};
+static constexpr auto locNumStrings = std::array<std::string_view, 18>{"vmin",
+                                                                        "vmax",
+                                                                        "vtarget",
+                                                                        "pmin",
+                                                                        "pmax",
+                                                                        "ptarget",
+                                                                        "qmin",
+                                                                        "qmax",
+                                                                        "qtarget",
+                                                                        "direction",
+                                                                        "mintap",
+                                                                        "maxtap",
+                                                                        "mintapangle",
+                                                                        "maxtapangle",
+                                                                        "stepsize",
+                                                                        "nsteps",
+                                                                        "dtapdt",
+                                                                        "dtapadt"};
+static constexpr auto locStrStrings =
+    std::array<std::string_view, 3>{"controlmode", "changemode", "centermode"};
+static constexpr auto flagStrings =
+    std::array<std::string_view, 1>{"no_pflow_adjustments"};
 void AdjustableTransformer::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
     getParamString<AdjustableTransformer, AcLine>(
-        this, pstr, LOC_NUM_STRINGS, LOC_STR_STRINGS, FLAG_STRINGS, pstype);
+        this, pstr, locNumStrings, locStrStrings, flagStrings, pstype);
 }
 
 // set properties
diff --git a/src/griddyn/links/Link.cpp b/src/griddyn/links/Link.cpp
@@ -19,6 +19,7 @@
 #include "gmlc/utilities/stringOps.h"
 #include "gmlc/utilities/vectorOps.hpp"
 #include "utilities/MatrixDataCompact.hpp"
+#include <array>
 #include <algorithm>
 #include <cmath>
 #include <complex>
@@ -177,13 +178,15 @@ void Link::timestep(const CoreTime time, const IOdata& /*inputs*/, const SolverM
     }*/
 }
 
-static const stringVec LOC_NUM_STRINGS{"loss", "switch1", "switch2", "p"};
-static const stringVec LOC_STR_STRINGS{"from", "to"};
-static const stringVec FLAG_STRINGS{};
+static constexpr auto locNumStrings =
+    std::array<std::string_view, 4>{"loss", "switch1", "switch2", "p"};
+static constexpr auto locStrStrings =
+    std::array<std::string_view, 2>{"from", "to"};
+static constexpr std::array<std::string_view, 0> flagStrings{};
 void Link::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
     getParamString<Link, GridPrimary>(
-        this, pstr, LOC_NUM_STRINGS, LOC_STR_STRINGS, FLAG_STRINGS, pstype);
+        this, pstr, locNumStrings, locStrStrings, flagStrings, pstype);
 }
 
 // set properties
diff --git a/src/griddyn/loads/FrequencySensitiveLoad.cpp b/src/griddyn/loads/FrequencySensitiveLoad.cpp
@@ -11,6 +11,7 @@
 #include "core/CoreObjectTemplates.hpp"
 #include "core/ObjectFactoryTemplates.hpp"
 #include "utilities/MatrixData.hpp"
+#include <array>
 #include <cmath>
 #include <complex>
 #include <iostream>
@@ -64,11 +65,12 @@ void FrequencySensitiveLoad::updateOutputs(double frequency)
     Qout += Qout * (frequency - 1.0) * M;
 }
 
-static const stringVec locNumStrings{"h", "m"};
+static constexpr auto locNumStrings =
+    std::array<std::string_view, 2>{"h", "m"};
 
-static const stringVec locStrStrings{};
+static constexpr std::array<std::string_view, 0> locStrStrings{};
 
-static const stringVec flagStrings{};
+static constexpr std::array<std::string_view, 0> flagStrings{};
 
 void FrequencySensitiveLoad::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
diff --git a/src/griddyn/loads/Load.cpp b/src/griddyn/loads/Load.cpp
@@ -11,6 +11,7 @@
 #include "core/CoreExceptions.h"
 #include "core/CoreObjectTemplates.hpp"
 #include "utilities/MatrixData.hpp"
+#include <array>
 #include <cmath>
 #include <complex>
 #include <iostream>
@@ -63,18 +64,18 @@ void GridLoad::setLoad(double plevel, double qlevel, unit unitType)
     setQ(convert(qlevel, unitType, puMW, systemBasePower));
 }
 
-static const stringVec LOC_NUM_STRINGS{"p", "q", "pf"};
+static constexpr auto locNumStrings =
+    std::array<std::string_view, 3>{"p", "q", "pf"};
 
-static const stringVec LOC_STR_STRINGS{
+static constexpr std::array<std::string_view, 0> locStrStrings{};
 
-};
-
-static const stringVec FLAG_STRINGS{"usepowerfactor"};
+static constexpr auto flagStrings =
+    std::array<std::string_view, 1>{"usepowerfactor"};
 
 void GridLoad::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
     getParamString<GridLoad, GridComponent>(
-        this, pstr, LOC_NUM_STRINGS, LOC_STR_STRINGS, FLAG_STRINGS, pstype);
+        this, pstr, locNumStrings, locStrStrings, flagStrings, pstype);
 }
 
 void GridLoad::setFlag(std::string_view flag, bool val)
diff --git a/src/griddyn/loads/ThreePhaseLoad.cpp b/src/griddyn/loads/ThreePhaseLoad.cpp
@@ -10,6 +10,7 @@
 #include "core/CoreObjectTemplates.hpp"
 #include "utilities/MatrixData.hpp"
 #include "utilities/ThreePhaseFunctions.h"
+#include <array>
 #include <cmath>
 #include <complex>
 #include <iostream>
@@ -72,19 +73,18 @@ void ThreePhaseLoad::setLoad(double plevel, double qlevel, unit unitType)
     Qa = Qb = Qc = getQ() / 3.0;
 }
 
-static const stringVec LOC_NUM_STRINGS{"pa", "pb", "pc", "qa", "qb", "qc"};
+static constexpr auto locNumStrings =
+    std::array<std::string_view, 6>{"pa", "pb", "pc", "qa", "qb", "qc"};
 
-static const stringVec LOC_STR_STRINGS{};
+static constexpr std::array<std::string_view, 0> locStrStrings{};
 
-static const stringVec FLAG_STRINGS{"use_abs_angle",
-                                    "ignore_phase",
-                                    "three_phase_inputs",
-                                    "three_phase_outputs"};
+static constexpr auto flagStrings = std::array<std::string_view, 4>{
+    "use_abs_angle", "ignore_phase", "three_phase_inputs", "three_phase_outputs"};
 
 void ThreePhaseLoad::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
     getParamString<ThreePhaseLoad, GridLoad>(
-        this, pstr, LOC_NUM_STRINGS, LOC_STR_STRINGS, FLAG_STRINGS, pstype);
+        this, pstr, locNumStrings, locStrStrings, flagStrings, pstype);
 }
 
 void ThreePhaseLoad::setFlag(std::string_view flag, bool val)
diff --git a/src/griddyn/loads/ZipLoad.cpp b/src/griddyn/loads/ZipLoad.cpp
@@ -18,6 +18,7 @@
 #include "core/CoreObjectTemplates.hpp"
 #include "core/ObjectFactoryTemplates.hpp"
 #include "utilities/MatrixData.hpp"
+#include <array>
 #include <cmath>
 #include <complex>
 #include <iostream>
@@ -142,14 +143,13 @@ void ZipLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*
 #endif
 }
 
-static const stringVec
-    locNumStrings{"yp", "yq", "ip", "iq", "x", "r", "h", "m", "vpqmin", "vpqmax"};
+static constexpr auto locNumStrings = std::array<std::string_view, 10>{
+    "yp", "yq", "ip", "iq", "x", "r", "h", "m", "vpqmin", "vpqmax"};
 
-static const stringVec locStrStrings{
+static constexpr std::array<std::string_view, 0> locStrStrings{};
 
-};
-
-static const stringVec flagStrings{"converttoimpedance", "no_pqvoltage_limit"};
+static constexpr auto flagStrings =
+    std::array<std::string_view, 2>{"converttoimpedance", "no_pqvoltage_limit"};
 
 void ZipLoad::getParameterStrings(stringVec& pstr, ParamStringType pstype) const
 {
diff --git a/src/griddyn/primary/AcBus.cpp b/src/griddyn/primary/AcBus.cpp
diff --git a/src/griddyn/primary/GridArea.cpp b/src/griddyn/primary/GridArea.cpp
diff --git a/src/griddyn/primary/GridBus.cpp b/src/griddyn/primary/GridBus.cpp
diff --git a/src/griddyn/relays/DifferentialRelay.cpp b/src/griddyn/relays/DifferentialRelay.cpp
diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt
