diff --git a/docgen/manuals/inputTables/gridDynGeneratorInputTable.tex b/docgen/manuals/inputTables/gridDynGeneratorInputTable.tex index 2fea74bee..5927c0177 100644 --- a/docgen/manuals/inputTables/gridDynGeneratorInputTable.tex +++ b/docgen/manuals/inputTables/gridDynGeneratorInputTable.tex @@ -35,6 +35,6 @@ agccapble & flag & 0 & \\ indirect\_voltage\_control & flag & 0 & \\ \hline -\caption{Set options for gridDynGenerator objects. See Table~\ref{table:gridSecondary} for additional settable options through gridSecondary} +\caption{Set options for gridDynGenerator objects. See Table~\ref{table:gridSecondary} for additional settable options through GridSecondary} \label{table:gridDynGenerator} \end{longtable} diff --git a/docgen/manuals/inputTables/gridLoadInputTable.tex b/docgen/manuals/inputTables/gridLoadInputTable.tex index 633e838e9..2e2ec125a 100644 --- a/docgen/manuals/inputTables/gridLoadInputTable.tex +++ b/docgen/manuals/inputTables/gridLoadInputTable.tex @@ -25,6 +25,6 @@ no\_pqvoltage\_limit & flag & 0 & \\ \hline \end{tabular} -\caption{Set options for gridLoad objects. See Table~\ref{table:gridSecondary} for additional settable options through gridSecondary} +\caption{Set options for gridLoad objects. See Table~\ref{table:gridSecondary} for additional settable options through GridSecondary} \label{table:gridLoad} \end{table} diff --git a/docgen/manuals/inputTables/gridSecondaryInputTable.tex b/docgen/manuals/inputTables/gridSecondaryInputTable.tex index 140f64491..9169c9bea 100644 --- a/docgen/manuals/inputTables/gridSecondaryInputTable.tex +++ b/docgen/manuals/inputTables/gridSecondaryInputTable.tex @@ -6,6 +6,6 @@ \hline \hline \end{tabular} -\caption{Set options for gridSecondary objects. See Table~\ref{table:gridObject} for additional settable options through gridObject} +\caption{Set options for GridSecondary objects. See Table~\ref{table:gridObject} for additional settable options through gridObject} \label{table:gridSecondary} \end{table} diff --git a/docgen/matlab/generateIOdocs.m b/docgen/matlab/generateIOdocs.m index 4e2a27cca..f56d6e9e4 100644 --- a/docgen/matlab/generateIOdocs.m +++ b/docgen/matlab/generateIOdocs.m @@ -73,6 +73,6 @@ cls(nn).used=0; end %% -%order={'gridCoreObject','gridObject','gridPrimary','gridSecondary','gridSubModel'}; +%order={'gridCoreObject','gridObject','gridPrimary','GridSecondary','gridSubModel'}; %saveDir='C:\Users\top1\Documents\codeProjects\transmission\docs\manuals\inputTables'; %generateLatexTables(cls,order,saveDir); diff --git a/docgen/matlab/getClassVariables.m b/docgen/matlab/getClassVariables.m index c14ea2ca4..2e078d8da 100644 --- a/docgen/matlab/getClassVariables.m +++ b/docgen/matlab/getClassVariables.m @@ -12,7 +12,7 @@ function vArray=getClassVariables(cblock) %function to extract the class variables from a code Block -vtypes={'double','coreTime','int','index_t','count_t','std::string'}; +vtypes={'double','CoreTime','int','index_t','count_t','std::string'}; vArray=cell(0,4); for vv=1:length(vtypes) %get variables with comments @@ -112,7 +112,7 @@ case {'kNullVal','kNullLocation','kInvalidLocation','kInvalidCount'} val=nan; otherwise - if (isequal(str(1:8),'coreTime')) + if (isequal(str(1:8),'CoreTime')) try val=eval(str(10:end-1)); catch diff --git a/docs/developer-guide/naming-inventory.md b/docs/developer-guide/naming-inventory.md index 1bffe5707..717ac7b8a 100644 --- a/docs/developer-guide/naming-inventory.md +++ b/docs/developer-guide/naming-inventory.md @@ -85,7 +85,7 @@ Total findings: **1239** | `src/gridDynServer/gridDynServer.h` | 64 | `gridDynServer` | class/struct name | | `src/griddyn/GridArea.h` | 25 | `listMaintainer` | class/struct name | | `src/griddyn/GridBus.h` | 28 | `busPowers` | class/struct name | -| `src/griddyn/GridComponent.h` | 18 | `matrixData` | class/struct name | +| `src/griddyn/GridComponent.h` | 18 | `MatrixData` | class/struct name | | `src/griddyn/GridComponentHelperClasses.h` | 275 | `stateSizes` | class/struct name | | `src/griddyn/GridComponentHelperClasses.h` | 319 | `solverOffsets` | class/struct name | | `src/griddyn/GridComponentHelperClasses.h` | 433 | `stateData` | class/struct name | @@ -95,7 +95,7 @@ Total findings: **1239** | `src/griddyn/GridSecondary.h` | 20 | `gridSecondary` | class/struct name | | `src/griddyn/Link.h` | 22 | `linkI` | class/struct name | | `src/griddyn/Link.h` | 33 | `linkF` | class/struct name | -| `src/griddyn/NumericEstimationFunctions.h` | 13 | `matrixData` | class/struct name | +| `src/griddyn/NumericEstimationFunctions.h` | 13 | `MatrixData` | class/struct name | | `src/griddyn/NumericEstimationFunctions.h` | 17 | `stateData` | class/struct name | | `src/griddyn/Relay.h` | 328 | `condCheckTime` | class/struct name | | `src/griddyn/Relay.h` | 350 | `mcondTrig` | class/struct name | @@ -114,7 +114,7 @@ Total findings: **1239** | `src/griddyn/links/ZBreaker.h` | 17 | `zBreaker` | class/struct name | | `src/griddyn/measurement/Collector.h` | 53 | `collectorPoint` | class/struct name | | `src/griddyn/measurement/Condition.h` | 179 | `compoundCondition` | class/struct name | -| `src/griddyn/measurement/GrabberSet.h` | 16 | `matrixData` | class/struct name | +| `src/griddyn/measurement/GrabberSet.h` | 16 | `MatrixData` | class/struct name | | `src/griddyn/measurement/GrabberSet.h` | 20 | `valuePredictor` | class/struct name | | `src/griddyn/measurement/GrabberSet.h` | 24 | `gridCore` | class/struct name | | `src/griddyn/measurement/GrabberSet.h` | 27 | `stateData` | class/struct name | @@ -122,7 +122,7 @@ Total findings: **1239** | `src/griddyn/primary/BusControls.h` | 14 | `gridSecondary` | class/struct name | | `src/griddyn/primary/DcBusControls.h` | 14 | `gridSecondary` | class/struct name | | `src/griddyn/primary/InfiniteBus.h` | 20 | `infiniteBus` | class/struct name | -| `src/griddyn/primary/ListMaintainer.h` | 14 | `matrixData` | class/struct name | +| `src/griddyn/primary/ListMaintainer.h` | 14 | `MatrixData` | class/struct name | | `src/griddyn/primary/ListMaintainer.h` | 17 | `gridPrimary` | class/struct name | | `src/griddyn/primary/ListMaintainer.h` | 18 | `stateData` | class/struct name | | `src/griddyn/primary/ListMaintainer.h` | 22 | `listMaintainer` | class/struct name | @@ -137,11 +137,11 @@ Total findings: **1239** | `src/griddyn/simulation/Contingency.h` | 74 | `extraContingencyInfo` | class/struct name | | `src/griddyn/simulation/Continuation.h` | 17 | `parameterSequence` | class/struct name | | `src/griddyn/simulation/Diagnostics.cpp` | 662 | `objectCountInfo` | class/struct name | -| `src/griddyn/simulation/Diagnostics.h` | 15 | `matrixData` | class/struct name | +| `src/griddyn/simulation/Diagnostics.h` | 15 | `MatrixData` | class/struct name | | `src/griddyn/simulation/DynamicInitialConditionRecovery.h` | 17 | `dynamicInitialConditionRecovery` | class/struct name | | `src/griddyn/simulation/FaultResetRecovery.h` | 20 | `faultResetRecovery` | class/struct name | | `src/griddyn/simulation/GridDynActions.h` | 17 | `gridDynAction` | class/struct name | -| `src/griddyn/simulation/GridDynSimulationFileOps.h` | 14 | `matrixData` | class/struct name | +| `src/griddyn/simulation/GridDynSimulationFileOps.h` | 14 | `MatrixData` | class/struct name | | `src/griddyn/simulation/GridDynSimulationFileOps.h` | 173 | `dataInfo` | class/struct name | | `src/griddyn/simulation/PowerFlowErrorRecovery.h` | 17 | `powerFlowErrorRecovery` | class/struct name | | `src/griddyn/sources/BlockSource.h` | 18 | `blockSource` | class/struct name | @@ -157,7 +157,7 @@ Total findings: **1239** | `src/griddyn_shared/internal/griddyn_export_internal.h` | 29 | `solverKeyInfo` | class/struct name | | `src/networking/zmqLibrary/zmqContextManager.h` | 25 | `context_t` | class/struct name | | `src/optimization/gridOptObjects.h` | 17 | `vectData` | class/struct name | -| `src/optimization/gridOptObjects.h` | 20 | `matrixData` | class/struct name | +| `src/optimization/gridOptObjects.h` | 20 | `MatrixData` | class/struct name | | `src/optimization/gridOptObjects.h` | 23 | `consData` | class/struct name | | `src/plugins/gridDynPluginApi.h` | 13 | `gridDynPlugInApi` | class/struct name | | `src/utilities/assert.h` | 17 | `assert_exception` | class/struct name | @@ -171,31 +171,31 @@ Total findings: **1239** | `src/utilities/gridRandom.h` | 125 | `randomDistributionObject1` | class/struct name | | `src/utilities/gridRandom.h` | 138 | `randomDistributionObject1` | class/struct name | | `src/utilities/logger.h` | 16 | `logger` | class/struct name | -| `src/utilities/matrixData.hpp` | 16 | `matrixElement` | class/struct name | -| `src/utilities/matrixData.hpp` | 52 | `matrixData` | class/struct name | -| `src/utilities/matrixDataBoost.hpp` | 16 | `matrixDataBoost` | class/struct name | -| `src/utilities/matrixDataBoost.hpp` | 61 | `matrixIteratorBoost` | class/struct name | -| `src/utilities/matrixDataCompact.hpp` | 17 | `matrixDataCompact` | class/struct name | -| `src/utilities/matrixDataCompact.hpp` | 74 | `matrixIteratorCompact` | class/struct name | -| `src/utilities/matrixDataContainer.hpp` | 17 | `matrixDataContainer` | class/struct name | -| `src/utilities/matrixDataCustomWriteOnly.hpp` | 18 | `matrixDataCustomWriteOnly` | class/struct name | -| `src/utilities/matrixDataFilter.hpp` | 19 | `matrixDataFilter` | class/struct name | -| `src/utilities/matrixDataOrdered.hpp` | 18 | `matrixDataOrdered` | class/struct name | -| `src/utilities/matrixDataOrdering.hpp` | 21 | `keyOrder` | class/struct name | -| `src/utilities/matrixDataOrdering.hpp` | 29 | `keyOrder` | class/struct name | -| `src/utilities/matrixDataScale.hpp` | 15 | `matrixDataScale` | class/struct name | -| `src/utilities/matrixDataSparse.hpp` | 23 | `matrixDataSparse` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 21 | `keyCompute` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 37 | `keyCompute` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 54 | `blockCompute` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 88 | `blockCompute` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 116 | `matrixDataSparseSMB` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 340 | `matrixIteratorSM` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 399 | `matrixDataSparseSMB` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 514 | `matrixIteratorSM` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 550 | `matrixDataSparseSMB` | class/struct name | -| `src/utilities/matrixDataSparseSM.hpp` | 716 | `matrixIteratorSM` | class/struct name | -| `src/utilities/matrixDataTranslate.hpp` | 21 | `matrixDataTranslate` | class/struct name | +| `src/utilities/MatrixData.hpp` | 16 | `MatrixElement` | class/struct name | +| `src/utilities/MatrixData.hpp` | 52 | `MatrixData` | class/struct name | +| `src/utilities/MatrixDataBoost.hpp` | 16 | `MatrixDataBoost` | class/struct name | +| `src/utilities/MatrixDataBoost.hpp` | 61 | `MatrixIteratorBoost` | class/struct name | +| `src/utilities/MatrixDataCompact.hpp` | 17 | `MatrixDataCompact` | class/struct name | +| `src/utilities/MatrixDataCompact.hpp` | 74 | `MatrixIteratorCompact` | class/struct name | +| `src/utilities/MatrixDataContainer.hpp` | 17 | `MatrixDataContainer` | class/struct name | +| `src/utilities/MatrixDataCustomWriteOnly.hpp` | 18 | `MatrixDataCustomWriteOnly` | class/struct name | +| `src/utilities/MatrixDataFilter.hpp` | 19 | `MatrixDataFilter` | class/struct name | +| `src/utilities/MatrixDataOrdered.hpp` | 18 | `MatrixDataOrdered` | class/struct name | +| `src/utilities/MatrixDataOrdering.hpp` | 21 | `KeyOrder` | class/struct name | +| `src/utilities/MatrixDataOrdering.hpp` | 29 | `KeyOrder` | class/struct name | +| `src/utilities/MatrixDataScale.hpp` | 15 | `MatrixDataScale` | class/struct name | +| `src/utilities/MatrixDataSparse.hpp` | 23 | `MatrixDataSparse` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 21 | `KeyCompute` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 37 | `KeyCompute` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 54 | `BlockCompute` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 88 | `BlockCompute` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 116 | `MatrixDataSparseSMB` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 340 | `MatrixIteratorSM` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 399 | `MatrixDataSparseSMB` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 514 | `MatrixIteratorSM` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 550 | `MatrixDataSparseSMB` | class/struct name | +| `src/utilities/MatrixDataSparseSM.hpp` | 716 | `MatrixIteratorSM` | class/struct name | +| `src/utilities/MatrixDataTranslate.hpp` | 21 | `MatrixDataTranslate` | class/struct name | | `src/utilities/saturation.h` | 16 | `saturation` | class/struct name | | `src/utilities/valuePredictor.hpp` | 14 | `valuePredictor` | class/struct name | | `src/utilities/vectData.hpp` | 20 | `vectData` | class/struct name | @@ -794,9 +794,9 @@ Total findings: **1239** | `src/utilities/gridRandom.cpp` | 22 | `lookupEntry` | file stem 'gridRandom' differs from declared type | | `src/utilities/gridRandom.h` | 19 | `distributionObject` | file stem 'gridRandom' differs from declared type | | `src/utilities/logger.h` | 24 | `Logger` | file stem 'logger' differs from declared type | -| `src/utilities/matrixData.hpp` | 16 | `matrixElement` | file stem 'matrixData' differs from declared type | -| `src/utilities/matrixDataOrdering.hpp` | 12 | `SparseOrdering` | file stem 'matrixDataOrdering' differs from declared type | -| `src/utilities/matrixDataSparseSM.hpp` | 21 | `keyCompute` | file stem 'matrixDataSparseSM' differs from declared type | +| `src/utilities/MatrixData.hpp` | 16 | `MatrixElement` | file stem 'MatrixData' differs from declared type | +| `src/utilities/MatrixDataOrdering.hpp` | 12 | `SparseOrdering` | file stem 'matrixDataOrdering' differs from declared type | +| `src/utilities/MatrixDataSparseSM.hpp` | 21 | `KeyCompute` | file stem 'matrixDataSparseSM' differs from declared type | | `src/utilities/zipUtilities.h` | 14 | `ZipMode` | file stem 'zipUtilities' differs from declared type | | `test/componentTests/simulationTests.cpp` | 16 | `SimulationTests` | file stem 'simulationTests' differs from declared type | | `test/componentTests/testAdjustableTX.cpp` | 21 | `AdjustableTransformerTests` | file stem 'testAdjustableTX' differs from declared type | @@ -1254,9 +1254,9 @@ Total findings: **1239** | `src/utilities/functionInterpreter.cpp` | 432 | `mult_sum` | function/method name | | `src/utilities/indexTypes.hpp` | 38 | `index_t` | function/method name | | `src/utilities/indexTypes.hpp` | 42 | `count_t` | function/method name | -| `src/utilities/matrixDataOrdered.hpp` | 158 | `ValueT` | function/method name | -| `src/utilities/matrixDataOrdered.hpp` | 161 | `ValueT` | function/method name | -| `src/utilities/matrixDataTranslate.hpp` | 55 | `ValueT` | function/method name | +| `src/utilities/MatrixDataOrdered.hpp` | 158 | `ValueT` | function/method name | +| `src/utilities/MatrixDataOrdered.hpp` | 161 | `ValueT` | function/method name | +| `src/utilities/MatrixDataTranslate.hpp` | 55 | `ValueT` | function/method name | | `test/gtestHelperFunctions.cpp` | 21 | `TearDown` | function/method name | | `test/libraryTests/testOperatingBounds.cpp` | 16 | `Bound` | function/method name | @@ -1304,6 +1304,6 @@ Total findings: **1239** | `src/optimization/models/gridGenOpt.h` | 39 | `m_forecast` | member-style variable | | `src/runner/gridDynRunner.h` | 122 | `m_gds` | member-style variable | | `src/utilities/assert.h` | 28 | `m_line` | member-style variable | -| `src/utilities/matrixDataScale.hpp` | 17 | `scalingFactor_` | member-style variable | -| `src/utilities/matrixDataSparse.hpp` | 220 | `data_` | member-style variable | +| `src/utilities/MatrixDataScale.hpp` | 17 | `scalingFactor_` | member-style variable | +| `src/utilities/MatrixDataSparse.hpp` | 220 | `data_` | member-style variable | | `test/systemTests/testGridDynRunner.cpp` | 35 | `m_currentGDTime` | member-style variable | diff --git a/docs/developer-guide/naming-migration-plan.md b/docs/developer-guide/naming-migration-plan.md index 43d866812..79b5f0bd6 100644 --- a/docs/developer-guide/naming-migration-plan.md +++ b/docs/developer-guide/naming-migration-plan.md @@ -572,6 +572,7 @@ Use this table to log each naming migration PR as it lands. | PR / Branch | Area | Phase | Summary | Compatibility Needed | Tests Run | Status | | ----------- | ----------------------------------------------------------------------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------- | -------------------------------------------------------- | -------- | +| merged | `src/griddyn/measurement` + `src/griddyn/primary` | Phase 9 | Final enforcement cleanup covering state-grabber lookup constant normalization, `AcBus`/`DcBus` factory and local naming fixes, header-definition parameter alignment, and the associated `clang-tidy` plus targeted `griddyn` rebuild follow-through | No | CI compile and `clang-tidy` run | Complete | | merged | `src/core` + `src/fileInput` + `src/griddyn` + `src/griddyn_shared` + `test/` | Phase 9 | Final enforcement cleanup removing the remaining core/file-input/simulation compatibility type aliases, deleting the obsolete relay-message alias layer, fixing export-side `GridDynSimulation` ambiguity, and following through with targeted `griddyn` and component-test rebuilds | No | Targeted `griddyn` and `OptionalComponentTests` rebuilds | Complete | | merged | `src/griddyn/controllers` + `src/griddyn/events` | Phase 9 | Final enforcement cleanup covering controller/event naming fallout in dispatcher, scheduler ramp/regulation, reversible-event helpers, member initialization, callback/signature alignment, and the associated `clang-tidy` plus targeted build follow-through | No | CI compile and `clang-tidy` run | Complete | | merged | `src/fileInput` + `src/fmi` + `src/griddyn` + `src/runner` | Phase 9 | Final enforcement cleanup covering PSAT reader local naming, FMI and griddyn factory-registration globals, comms/controller registration normalization, redundant static-initialization suppression removal, and the associated `clang-tidy` and build follow-through | No | CI compile and `clang-tidy` run | Complete | diff --git a/docs/developer-guide/style.md b/docs/developer-guide/style.md index 524d8fdaa..723aefbd4 100644 --- a/docs/developer-guide/style.md +++ b/docs/developer-guide/style.md @@ -30,7 +30,7 @@ Formatting conventions are primarily enforced through the repository 3. Class methods should be `camelCase` ```cpp - void setTime(coreTime newTime); + void setTime(CoreTime newTime); ``` Exception: methods that intentionally match standard library naming. diff --git a/src/core/CoreObject.cpp b/src/core/CoreObject.cpp index fa473a9c1..2844a99e3 100644 --- a/src/core/CoreObject.cpp +++ b/src/core/CoreObject.cpp @@ -357,11 +357,11 @@ CoreObject* CoreObject::findByUserID(std::string_view /*typeName*/, index_t sear return nullptr; } -void CoreObject::updateA(coreTime time) +void CoreObject::updateA(CoreTime time) { lastUpdateTime = time; } -coreTime CoreObject::updateB() +CoreTime CoreObject::updateB() { assert(nextUpdateTime > negTime / 2.0); // The assert is to check for spurious calls if (nextUpdateTime < maxTime) { diff --git a/src/core/CoreObject.h b/src/core/CoreObject.h index 1f8a73dfd..1c6fd87e2 100644 --- a/src/core/CoreObject.h +++ b/src/core/CoreObject.h @@ -69,11 +69,11 @@ class CoreObject { index_t id = 0; //!< a user defined id for the object CoreObject* parent = nullptr; //!< a pointer to the parent object protected: // variables that are used regularly by child class objects - coreTime prevTime = negTime; //!<[s]the last state time of the object - coreTime nextUpdateTime = maxTime; //!<[s] the next scheduled update - coreTime lastUpdateTime = negTime; //!<[s] the last update time - coreTime updatePeriod = maxTime; //!<[s]the update period - coreTime updateDelay = timeZero; //!<[s]the requested delay between updateA and + CoreTime prevTime = negTime; //!<[s]the last state time of the object + CoreTime nextUpdateTime = maxTime; //!<[s] the next scheduled update + CoreTime lastUpdateTime = negTime; //!<[s] the last update time + CoreTime updatePeriod = maxTime; //!<[s]the update period + CoreTime updateDelay = timeZero; //!<[s]the requested delay between updateA and //!< updateB--requested is key here not guaranteed private: // these shouldn't generate false sharing as one is static @@ -234,11 +234,11 @@ class CoreObject { a later time * @param[in] time the times to update the object to */ - virtual void updateA(coreTime time); + virtual void updateA(CoreTime time); /** * @brief the B update function for update calls with two parts */ - virtual coreTime updateB(); + virtual CoreTime updateB(); /** * @brief function to enable the object, most objects are enabled by default */ @@ -317,11 +317,11 @@ class CoreObject { virtual void setUpdateTime(double newUpdateTime); /** @brief get the next time the system should call the update functions */ - coreTime getNextUpdateTime() const noexcept { return nextUpdateTime; } + CoreTime getNextUpdateTime() const noexcept { return nextUpdateTime; } /**@brief return the last time the object had its state set or was updated */ - coreTime currentTime() const noexcept { return prevTime; } + CoreTime currentTime() const noexcept { return prevTime; } friend void removeReference(CoreObject* objToDelete); friend void removeReference(CoreObject* objToDelete, const CoreObject* parent); friend bool compareUpdates(const CoreObject* o1, const CoreObject* o2); diff --git a/src/core/coreDefinitions.hpp b/src/core/coreDefinitions.hpp index 4073ba8cd..82cf0cddb 100644 --- a/src/core/coreDefinitions.hpp +++ b/src/core/coreDefinitions.hpp @@ -93,23 +93,23 @@ enum class PrintLevel : int { using id_type_t = std::int64_t; constexpr auto invalid_id_value = std::numeric_limits::min(); -using coreTime = TimeRepresentation>; +using CoreTime = TimeRepresentation>; using stringVec = std::vector; /** commonly used time expressions*/ -constexpr coreTime maxTime = coreTime::maxVal(); -constexpr coreTime negTime = coreTime::minVal(); -constexpr coreTime timeZero = coreTime::zeroVal(); +constexpr CoreTime maxTime = CoreTime::maxVal(); +constexpr CoreTime negTime = CoreTime::minVal(); +constexpr CoreTime timeZero = CoreTime::zeroVal(); -constexpr coreTime timeOneSecond(1.0); +constexpr CoreTime timeOneSecond(1.0); -constexpr coreTime kDayLength(86400.0f); -constexpr coreTime kSmallTime(1e-7); -constexpr coreTime kShortTime(1e-6); +constexpr CoreTime kDayLength(86400.0f); +constexpr CoreTime kSmallTime(1e-7); +constexpr CoreTime kShortTime(1e-6); -constexpr coreTime operator""_t(long double val) +constexpr CoreTime operator""_t(long double val) { - return coreTime(val); + return CoreTime(val); } // create an inline check for valid indices diff --git a/src/extraModels/CMakeLists.txt b/src/extraModels/CMakeLists.txt index fb785559c..1782697f5 100644 --- a/src/extraModels/CMakeLists.txt +++ b/src/extraModels/CMakeLists.txt @@ -6,9 +6,9 @@ # SPDX-License-Identifier: BSD-3-Clause # # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -set(extra_sources extraModels.cpp txThermalModel.cpp txLifeSpan.cpp) +set(extra_sources extraModels.cpp TxThermalModel.cpp TxLifeSpan.cpp) -set(extra_headers extraModels.h txThermalModel.h txLifeSpan.h) +set(extra_headers extraModels.h TxThermalModel.h TxLifeSpan.h) add_library(extraModelLibrary STATIC ${extra_sources} ${extra_headers}) set_target_properties(extraModelLibrary PROPERTIES FOLDER libraries) diff --git a/src/extraModels/txLifeSpan.cpp b/src/extraModels/TxLifeSpan.cpp similarity index 86% rename from src/extraModels/txLifeSpan.cpp rename to src/extraModels/TxLifeSpan.cpp index 2ff516053..748832821 100644 --- a/src/extraModels/txLifeSpan.cpp +++ b/src/extraModels/TxLifeSpan.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include "txLifeSpan.h" +#include "TxLifeSpan.h" #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" @@ -20,7 +20,7 @@ #include namespace griddyn::extra { -txLifeSpan::txLifeSpan(const std::string& objName): Sensor(objName) +TxLifeSpan::TxLifeSpan(const std::string& objName): Sensor(objName) { opFlags.reset(CONTINUOUS_FLAG); // this is a not a continuous model everything is slow so // no need to make it continuous @@ -28,9 +28,9 @@ txLifeSpan::txLifeSpan(const std::string& objName): Sensor(objName) m_outputSize = 3; } -CoreObject* txLifeSpan::clone(CoreObject* obj) const +CoreObject* TxLifeSpan::clone(CoreObject* obj) const { - auto* nobj = cloneBase(this, obj); + auto* nobj = cloneBase(this, obj); if (nobj == nullptr) { return obj; } @@ -42,7 +42,7 @@ CoreObject* txLifeSpan::clone(CoreObject* obj) const return nobj; } -void txLifeSpan::setFlag(std::string_view flag, bool val) +void TxLifeSpan::setFlag(std::string_view flag, bool val) { if ((flag == "useiec") || (flag == "iec")) { opFlags.set(useIECmethod, val); @@ -55,7 +55,7 @@ void txLifeSpan::setFlag(std::string_view flag, bool val) } } -void txLifeSpan::set(std::string_view param, std::string_view val) +void TxLifeSpan::set(std::string_view param, std::string_view val) { if (param.empty() || param[0] == '#') { } else { @@ -63,7 +63,7 @@ void txLifeSpan::set(std::string_view param, std::string_view val) } } -void txLifeSpan::set(std::string_view param, double val, units::unit unitType) +void TxLifeSpan::set(std::string_view param, double val, units::unit unitType) { if ((param == "initial") || (param == "initiallife")) { mInitialLife = units::convert(val, unitType, units::hr); @@ -76,17 +76,17 @@ void txLifeSpan::set(std::string_view param, double val, units::unit unitType) } } -double txLifeSpan::get(std::string_view param, units::unit unitType) const +double TxLifeSpan::get(std::string_view param, units::unit unitType) const { return Sensor::get(param, unitType); } -void txLifeSpan::add(CoreObject* /*obj*/) +void TxLifeSpan::add(CoreObject* /*obj*/) { throw(UnrecognizedObjectException(this)); } -void txLifeSpan::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void TxLifeSpan::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (m_sourceObject == nullptr) { Sensor::dynObjectInitializeA(time0, flags); @@ -95,11 +95,11 @@ void txLifeSpan::dynObjectInitializeA(coreTime time0, std::uint32_t flags) if (updatePeriod > negTime) { // set the period to the period of the simulation to at least // 1/5 the winding time constant - coreTime simulationStep = getRoot()->get("steptime"); + CoreTime simulationStep = getRoot()->get("steptime"); if (simulationStep < timeZero) { simulationStep = 1.0; } - const coreTime modelTimestep = 120.0; // update once per minute + const CoreTime modelTimestep = 120.0; // update once per minute updatePeriod = simulationStep * std::floor(modelTimestep / simulationStep); if (updatePeriod < simulationStep) { updatePeriod = simulationStep; @@ -154,7 +154,7 @@ void txLifeSpan::dynObjectInitializeA(coreTime time0, std::uint32_t flags) } Sensor::dynObjectInitializeA(time0, flags); } -void txLifeSpan::dynObjectInitializeB(const IOdata& inputs, +void TxLifeSpan::dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) { @@ -166,7 +166,7 @@ void txLifeSpan::dynObjectInitializeB(const IOdata& inputs, // initializing the blocks here } -void txLifeSpan::updateA(coreTime time) +void TxLifeSpan::updateA(CoreTime time) { if (time == prevTime) { return; @@ -184,15 +184,15 @@ void txLifeSpan::updateA(coreTime time) prevTime = time; } -void txLifeSpan::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void TxLifeSpan::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { updateA(time); } -void txLifeSpan::actionTaken(index_t actionNumber, +void TxLifeSpan::actionTaken(index_t actionNumber, index_t /*conditionNum*/, ChangeCode /*actionReturn*/, - coreTime /*actionTime*/) + CoreTime /*actionTime*/) { if (m_sinkObject != nullptr) { if (actionNumber == 0) { diff --git a/src/extraModels/txLifeSpan.h b/src/extraModels/TxLifeSpan.h similarity index 86% rename from src/extraModels/txLifeSpan.h rename to src/extraModels/TxLifeSpan.h index 260bd4f35..ec832ad98 100644 --- a/src/extraModels/txLifeSpan.h +++ b/src/extraModels/TxLifeSpan.h @@ -12,7 +12,7 @@ namespace griddyn::extra { /** @brief class modeling a transformer lifespan based on thermal effects */ -class txLifeSpan: public Sensor { +class TxLifeSpan: public Sensor { public: enum LifespanModelFlags { useIECmethod = object_flag11, @@ -32,7 +32,7 @@ class txLifeSpan: public Sensor { double mAgingAccelerationFactor = 0.0; public: - txLifeSpan(const std::string& objName = "txlifeSpan_$"); + TxLifeSpan(const std::string& objName = "txlifeSpan_$"); CoreObject* clone(CoreObject* obj = nullptr) const override; virtual void setFlag(std::string_view flag, bool val = true) override; virtual void set(std::string_view param, std::string_view val) override; @@ -44,18 +44,18 @@ class txLifeSpan: public Sensor { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; - virtual void updateA(coreTime time) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void updateA(CoreTime time) override; void actionTaken(index_t actionNumber, index_t conditionNum, ChangeCode actionReturn, - coreTime /*actionTime*/) override; + CoreTime /*actionTime*/) override; }; } // namespace griddyn::extra diff --git a/src/extraModels/txThermalModel.cpp b/src/extraModels/TxThermalModel.cpp similarity index 95% rename from src/extraModels/txThermalModel.cpp rename to src/extraModels/TxThermalModel.cpp index 423d3a96c..11bb3f62a 100644 --- a/src/extraModels/txThermalModel.cpp +++ b/src/extraModels/TxThermalModel.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include "txThermalModel.h" +#include "TxThermalModel.h" #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" @@ -21,7 +21,7 @@ #include namespace griddyn::extra { -txThermalModel::txThermalModel(const std::string& objName): Sensor(objName) +TxThermalModel::TxThermalModel(const std::string& objName): Sensor(objName) { opFlags.reset(CONTINUOUS_FLAG); // this is a not a continuous model outputStrings = {{"ambient", "ambientTemp", "airTemp"}, @@ -30,9 +30,9 @@ txThermalModel::txThermalModel(const std::string& objName): Sensor(objName) m_outputSize = 3; } -CoreObject* txThermalModel::clone(CoreObject* obj) const +CoreObject* TxThermalModel::clone(CoreObject* obj) const { - auto* nobj = cloneBase(this, obj); + auto* nobj = cloneBase(this, obj); if (nobj == nullptr) { return obj; } @@ -57,7 +57,7 @@ CoreObject* txThermalModel::clone(CoreObject* obj) const return nobj; } -void txThermalModel::setFlag(std::string_view flag, bool val) +void TxThermalModel::setFlag(std::string_view flag, bool val) { if (flag == "auto") { opFlags.set(auto_parameter_load, val); @@ -70,7 +70,7 @@ void txThermalModel::setFlag(std::string_view flag, bool val) } } -void txThermalModel::set(std::string_view param, std::string_view val) +void TxThermalModel::set(std::string_view param, std::string_view val) { if ((param == "txtype") || (param == "cooling")) { const auto normalizedValue = gmlc::utilities::convertToLowerCase(val); @@ -122,7 +122,7 @@ void txThermalModel::set(std::string_view param, std::string_view val) } } -void txThermalModel::set(std::string_view param, double val, units::unit unitType) +void TxThermalModel::set(std::string_view param, double val, units::unit unitType) { if ((param == "ambient") || (param == "ambienttemp")) { mAmbientTemp = units::convert(val, unitType, units::degC); @@ -179,17 +179,17 @@ void txThermalModel::set(std::string_view param, double val, units::unit unitTyp } } -double txThermalModel::get(std::string_view param, units::unit unitType) const +double TxThermalModel::get(std::string_view param, units::unit unitType) const { return Sensor::get(param, unitType); } -void txThermalModel::add(CoreObject* /*obj*/) +void TxThermalModel::add(CoreObject* /*obj*/) { throw(UnrecognizedObjectException(this)); } -void txThermalModel::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void TxThermalModel::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (m_sourceObject == nullptr) { Sensor::dynObjectInitializeA(time0, flags); @@ -304,7 +304,7 @@ void txThermalModel::dynObjectInitializeA(coreTime time0, std::uint32_t flags) Sensor::dynObjectInitializeA(time0, flags); } -void txThermalModel::dynObjectInitializeB(const IOdata& inputs, +void TxThermalModel::dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) { @@ -337,7 +337,7 @@ void txThermalModel::dynObjectInitializeB(const IOdata& inputs, Sensor::dynObjectInitializeB(inputs, desiredOutput, fieldSet); } -void txThermalModel::updateA(coreTime time) +void TxThermalModel::updateA(CoreTime time) { auto deltaTime = time - prevTime; if (deltaTime == timeZero) { @@ -386,7 +386,7 @@ void txThermalModel::updateA(coreTime time) prevTime = time; } -void txThermalModel::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void TxThermalModel::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { updateA(time); } diff --git a/src/extraModels/txThermalModel.h b/src/extraModels/TxThermalModel.h similarity index 90% rename from src/extraModels/txThermalModel.h rename to src/extraModels/TxThermalModel.h index c3dab25f9..f2ffeb04e 100644 --- a/src/extraModels/txThermalModel.h +++ b/src/extraModels/TxThermalModel.h @@ -12,7 +12,7 @@ namespace griddyn::extra { /** @brief basic thermal model of a transformer */ -class txThermalModel: public Sensor { +class TxThermalModel: public Sensor { public: enum ThermalModelFlags { auto_parameter_load = object_flag10, @@ -41,7 +41,7 @@ class txThermalModel: public Sensor { double mRadiationConstant = 0.0; //!< transformer radiation constant public: /** @brief constructor*/ - txThermalModel(const std::string& objName = "txThermal_$"); + TxThermalModel(const std::string& objName = "txThermal_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; virtual void setFlag(std::string_view flag, bool val = true) override; virtual void set(std::string_view param, std::string_view val) override; @@ -53,13 +53,13 @@ class txThermalModel: public Sensor { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; - virtual void updateA(coreTime time) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void updateA(CoreTime time) override; }; } // namespace griddyn::extra diff --git a/src/extraModels/extraModels.cpp b/src/extraModels/extraModels.cpp index 50f11fe1a..9de8f1ae4 100644 --- a/src/extraModels/extraModels.cpp +++ b/src/extraModels/extraModels.cpp @@ -6,9 +6,9 @@ #include "extraModels.h" +#include "TxLifeSpan.h" +#include "TxThermalModel.h" #include "core/ObjectFactoryTemplates.hpp" -#include "txLifeSpan.h" -#include "txThermalModel.h" #include #include #include @@ -19,12 +19,12 @@ static std::vector> gExtraModelFactories; void loadExtraModels(const std::string& /*subset*/) { auto thermalModelFactory = - std::make_shared>("relay", + std::make_shared>("relay", stringVec{"thermaltx"}); gExtraModelFactories.push_back(thermalModelFactory); auto lifeSpanFactory = - std::make_shared>("relay", + std::make_shared>("relay", stringVec{"txaging", "txage"}); gExtraModelFactories.push_back(lifeSpanFactory); } diff --git a/src/extraSolvers/braid/braidInterface.h b/src/extraSolvers/braid/braidInterface.h index fa107127e..9c6049fd0 100644 --- a/src/extraSolvers/braid/braidInterface.h +++ b/src/extraSolvers/braid/braidInterface.h @@ -29,8 +29,8 @@ class braidSolver: public SolverInterface { std::vector deriv; //!< temp state data location 1 std::vector state2; //!< temp state data location 2 std::vector type; //!< type data - coreTime deltaT = 0.005; //!< the default time step - coreTime tStart = 0.0; //!< the start time + CoreTime deltaT = 0.005; //!< the default time step + CoreTime tStart = 0.0; //!< the start time std::string configFile{ "braid_params.ini"}; //!< file containing additional braid configuration data std::vector @@ -57,16 +57,16 @@ class braidSolver: public SolverInterface { const double* derivData() const noexcept override; const double* typeData() const noexcept override; virtual void allocate(count_t size, count_t numroots = 0) override; - virtual void initialize(coreTime t0) override; + virtual void initialize(CoreTime t0) override; virtual double get(std::string_view param) const override; virtual void set(std::string_view param, std::string_view val) override; virtual void set(std::string_view param, double val) override; - virtual int calcIC(coreTime t0, coreTime tstep0, IcModes mode, bool constraints) override; + virtual int calcIC(CoreTime t0, CoreTime tstep0, IcModes mode, bool constraints) override; virtual int - solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; + solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; /** execute the braid solve*/ virtual int runBraid(ODEProblem* ode, MapParam* param, Real*& timegrid, int Ngridpoints); virtual void getRoots() override; diff --git a/src/extraSolvers/braid/braidSolver.cpp b/src/extraSolvers/braid/braidSolver.cpp index 70d0077d1..c4cc45d1f 100644 --- a/src/extraSolvers/braid/braidSolver.cpp +++ b/src/extraSolvers/braid/braidSolver.cpp @@ -193,7 +193,7 @@ void braidSolver::allocate(count_t stateCount, count_t numRoots) rootsfound.resize(numRoots); } -void braidSolver::initialize(coreTime t0) +void braidSolver::initialize(CoreTime t0) { if (!flags[ALLOCATED_FLAG]) { throw(InvalidSolverOperation(-2)); @@ -457,7 +457,7 @@ int braidSolver::runBraid(ODEProblem* ode, MapParam* param, Real*& timegrid, int return 0; } -int braidSolver::solve(coreTime tStop, coreTime& tReturn, StepMode stepMode) +int braidSolver::solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode) { int mpi_rank; MPI_Comm comm = MPI_COMM_WORLD; @@ -508,7 +508,7 @@ int braidSolver::solve(coreTime tStop, coreTime& tReturn, StepMode stepMode) return FUNCTION_EXECUTION_SUCCESS; } -int braidSolver::calcIC(coreTime t0, coreTime tstep0, IcModes mode, bool constraints) +int braidSolver::calcIC(CoreTime t0, CoreTime tstep0, IcModes mode, bool constraints) { return 0; } diff --git a/src/extraSolvers/extraSolvers.cpp b/src/extraSolvers/extraSolvers.cpp index ca4ce2131..ce9d717c1 100644 --- a/src/extraSolvers/extraSolvers.cpp +++ b/src/extraSolvers/extraSolvers.cpp @@ -27,11 +27,11 @@ void loadExtraSolvers(const std::string& subset) extraFactories.push_back(bfact); #endif } - // auto b = std::make_shared> ("relay", + // auto b = std::make_shared> ("relay", // stringVec{"thermaltx"}); // extraFactories.push_back (b); - // auto c = std::make_shared> ("relay", + // auto c = std::make_shared> ("relay", // stringVec{"txaging", "txage"}); extraFactories.push_back (c); } } // namespace griddyn diff --git a/src/extraSolvers/paradae/math/paradaeArrayData.cxx b/src/extraSolvers/paradae/math/paradaeArrayData.cxx index 5e9725ede..47ab93809 100644 --- a/src/extraSolvers/paradae/math/paradaeArrayData.cxx +++ b/src/extraSolvers/paradae/math/paradaeArrayData.cxx @@ -63,7 +63,7 @@ double paradaeArrayData::at(index_t rowN, index_t colN) const return (*J)(rowN, colN); } -matrixElement paradaeArrayData::element(index_t N) const +MatrixElement paradaeArrayData::element(index_t N) const { return {J->GetRowIndex(N), J->GetColIndex(N), J->GetValue(N)}; } diff --git a/src/extraSolvers/paradae/math/paradaeArrayData.h b/src/extraSolvers/paradae/math/paradaeArrayData.h index b8f3f9f27..135b37707 100644 --- a/src/extraSolvers/paradae/math/paradaeArrayData.h +++ b/src/extraSolvers/paradae/math/paradaeArrayData.h @@ -7,10 +7,10 @@ #pragma once #include "../math/SparseMatrix.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" namespace griddyn::paradae { -class paradaeArrayData: public matrixData { +class paradaeArrayData: public MatrixData { private: SparseMatrix* J = nullptr; @@ -27,6 +27,6 @@ class paradaeArrayData: public matrixData { index_t colIndex(index_t N) const; double val(index_t N) const; double at(index_t rowN, index_t colN) const; - matrixElement element(index_t N) const; + MatrixElement element(index_t N) const; }; } // namespace griddyn::paradae diff --git a/src/fileInput/readElement.h b/src/fileInput/readElement.h index b29f875dd..89e704e9e 100644 --- a/src/fileInput/readElement.h +++ b/src/fileInput/readElement.h @@ -37,7 +37,7 @@ class GridDynSimulation; class Relay; class GridBus; class GridPrimary; -class gridSecondary; +class GridSecondary; class GridSubModel; GridBus* readBusElement(std::shared_ptr& element, @@ -186,7 +186,7 @@ inline const std::string& parentSearchComponent(GridPrimary*) return areaTypeStringRef; } -inline const std::string& parentSearchComponent(gridSecondary*) +inline const std::string& parentSearchComponent(GridSecondary*) { static const std::string busTypeStringRef{busTypeString}; return busTypeStringRef; diff --git a/src/fileInput/readElementFile.cpp b/src/fileInput/readElementFile.cpp index 52118cab4..6b996b93d 100644 --- a/src/fileInput/readElementFile.cpp +++ b/src/fileInput/readElementFile.cpp @@ -11,7 +11,7 @@ #include "gmlc/utilities/stringConversion.h" #include "griddyn/GridDynSimulation.h" #include "readerHelper.h" -#include "utilities/gridRandom.h" +#include "utilities/GridRandom.h" #include #include #include @@ -25,24 +25,24 @@ using gmlc::utilities::numeric_conversion; void loadElementInformation(CoreObject* obj, std::shared_ptr& element, const std::string& objectName, - ReaderInfo& ReaderInfoRef, + ReaderInfo& readerInfoRef, const IgnoreListType& ignoreList) { - objSetAttributes(obj, element, objectName, ReaderInfoRef, ignoreList); - readImports(element, ReaderInfoRef, obj, false); + objSetAttributes(obj, element, objectName, readerInfoRef, ignoreList); + readImports(element, readerInfoRef, obj, false); // check for child objects - loadSubObjects(element, ReaderInfoRef, obj); + loadSubObjects(element, readerInfoRef, obj); // get all element fields - paramLoopElement(obj, element, objectName, ReaderInfoRef, ignoreList); - readImports(element, ReaderInfoRef, obj, true); + paramLoopElement(obj, element, objectName, readerInfoRef, ignoreList); + readImports(element, readerInfoRef, obj, true); } static void checkForEndUnits(GridParameter& param, const std::string& parameterString); static constexpr char importString[] = "import"; void readImports(std::shared_ptr& element, - ReaderInfo& ReaderInformation, + ReaderInfo& readerInformation, CoreObject* parentObject, bool finalFlag) { @@ -51,7 +51,7 @@ void readImports(std::shared_ptr& element, } // run any source files - const auto baseFlags = ReaderInformation.getFlags(); + const auto baseFlags = readerInformation.getFlags(); element->bookmark(); element->moveToFirstChild(importString); while (element->isValid()) { @@ -69,7 +69,7 @@ void readImports(std::shared_ptr& element, const std::string flags = getElementField(element, "flags", readerConfig::defMatchType); if (!flags.empty()) { - addFlags(ReaderInformation, flags); + addFlags(readerInformation, flags); } std::string sourceFile = getElementField(element, "file", readerConfig::defMatchType); if (sourceFile.empty()) { @@ -78,14 +78,14 @@ void readImports(std::shared_ptr& element, } // check through the files to find the right location - ReaderInformation.checkFileParam(sourceFile, true); + readerInformation.checkFileParam(sourceFile, true); std::string prefix = getElementField(element, "prefix", readerConfig::MatchType::CAPITAL_CASE_MATCH); // get the prefix if any if (prefix.empty()) { - prefix = ReaderInformation.prefix; - } else if (!ReaderInformation.prefix.empty()) { - auto temp = ReaderInformation.prefix; + prefix = readerInformation.prefix; + } else if (!readerInformation.prefix.empty()) { + auto temp = readerInformation.prefix; temp.push_back('_'); temp.append(prefix); prefix = std::move(temp); @@ -95,15 +95,15 @@ void readImports(std::shared_ptr& element, const std::string ext = convertToLowerCase(getElementField(element, "filetype", readerConfig::defMatchType)); - std::swap(prefix, ReaderInformation.prefix); + std::swap(prefix, readerInformation.prefix); if (ext.empty()) { - loadFile(parentObject, sourceFile, &ReaderInformation); + loadFile(parentObject, sourceFile, &readerInformation); } else { - loadFile(parentObject, sourceFile, &ReaderInformation, ext); + loadFile(parentObject, sourceFile, &readerInformation, ext); } - std::swap(prefix, ReaderInformation.prefix); + std::swap(prefix, readerInformation.prefix); - ReaderInformation.setAllFlags(baseFlags); + readerInformation.setAllFlags(baseFlags); element->moveToNextSibling(importString); // next import file } element->restore(); @@ -252,7 +252,7 @@ static bool isXmlNamespaceAttribute(const std::string& fieldName) void objSetAttributes(CoreObject* obj, std::shared_ptr& element, const std::string& component, - ReaderInfo& ReaderInfoRef, + ReaderInfo& readerInfoRef, const IgnoreListType& ignoreList) { auto att = element->getFirstAttribute(); @@ -288,12 +288,12 @@ void objSetAttributes(CoreObject* obj, if (fieldName.contains("file") || (fieldName == "fmu")) { std::string strVal = att.getText(); - ReaderInfoRef.checkFileParam(strVal); + readerInfoRef.checkFileParam(strVal); GridParameter paramObject(fieldName, strVal); setObjectParameter(component, obj, paramObject); } else if (fieldName.contains("workdir") || fieldName.contains("directory")) { std::string strVal = att.getText(); - ReaderInfoRef.checkDirectoryParam(strVal); + readerInfoRef.checkDirectoryParam(strVal); GridParameter paramObject(fieldName, strVal); setObjectParameter(component, obj, paramObject); } else if ((fieldName == "flag") || (fieldName == "flags")) { @@ -312,7 +312,7 @@ void objSetAttributes(CoreObject* obj, setObjectParameter(component, obj, paramObject); } else { GridParameter paramObject(fieldName, att.getText()); - processParamString(paramObject, ReaderInfoRef); + processParamString(paramObject, readerInfoRef); setObjectParameter(component, obj, paramObject); } } @@ -323,7 +323,7 @@ void objSetAttributes(CoreObject* obj, void paramLoopElement(CoreObject* obj, std::shared_ptr& element, const std::string& component, - ReaderInfo& ReaderInfoRef, + ReaderInfo& readerInfoRef, const IgnoreListType& ignoreList) { element->moveToFirstChild(); @@ -335,8 +335,8 @@ void paramLoopElement(CoreObject* obj, element->moveToNextSibling(); continue; } - ifind = ReaderInfoRef.getIgnoreList().find(fieldName); - if (ifind != ReaderInfoRef.getIgnoreList().end()) { + ifind = readerInfoRef.getIgnoreList().find(fieldName); + if (ifind != readerInfoRef.getIgnoreList().end()) { element->moveToNextSibling(); continue; } @@ -350,14 +350,14 @@ void paramLoopElement(CoreObject* obj, if (param.valid) { if (param.stringType) { if (param.field.contains("file") || (param.field == "fmu")) { - ReaderInfoRef.checkFileParam(param.strVal); + readerInfoRef.checkFileParam(param.strVal); setObjectParameter(component, obj, param); } else if (param.field.contains("workdir") || param.field.contains("directory")) { - ReaderInfoRef.checkDirectoryParam(param.strVal); + readerInfoRef.checkDirectoryParam(param.strVal); setObjectParameter(component, obj, param); } else if ((fieldName == "flag") || (fieldName == "flags")) { // read the flags parameter - processParamString(param, ReaderInfoRef); + processParamString(param, readerInfoRef); try { setMultipleFlags(obj, param.strVal); } @@ -365,7 +365,7 @@ void paramLoopElement(CoreObject* obj, WARNPRINT(READER_WARN_ALL, "unrecognized flag in " << param.strVal << "\n"); } } else { - processParamString(param, ReaderInfoRef); + processParamString(param, readerInfoRef); setObjectParameter(component, obj, param); } } else { @@ -393,7 +393,7 @@ void readConfigurationFields(std::shared_ptr& sim, ReaderInfo& /* } else if ((cfgname == "seed")) { try { auto seed = std::stoul(cfgAtt.getText()); - utilities::gridRandom::setSeed(seed); + utilities::GridRandom::setSeed(seed); } catch (const std::invalid_argument&) { WARNPRINT(READER_WARN_IMPORTANT, "invalid seed value, must be an integer"); @@ -412,7 +412,7 @@ void readConfigurationFields(std::shared_ptr& sim, ReaderInfo& /* } else if ((fieldName == "seed")) { try { auto seed = std::stoul(cfgAtt.getText()); - utilities::gridRandom::setSeed(seed); + utilities::GridRandom::setSeed(seed); } catch (const std::invalid_argument&) { WARNPRINT(READER_WARN_IMPORTANT, "invalid seed value, must be an integer"); @@ -428,7 +428,7 @@ void readConfigurationFields(std::shared_ptr& sim, ReaderInfo& /* void setAttributes(HelperObject* obj, std::shared_ptr& element, const std::string& component, - ReaderInfo& ReaderInfoRef, + ReaderInfo& readerInfoRef, const IgnoreListType& ignoreList) { auto att = element->getFirstAttribute(); @@ -449,7 +449,7 @@ void setAttributes(HelperObject* obj, try { if (fieldName.contains("file") || (fieldName == "fmu")) { std::string strVal = att.getText(); - ReaderInfoRef.checkFileParam(strVal); + readerInfoRef.checkFileParam(strVal); LEVELPRINT(READER_VERBOSE_PRINT, component << ": setting " << fieldName << " to " << strVal); obj->set(fieldName, strVal); @@ -461,7 +461,7 @@ void setAttributes(HelperObject* obj, obj->set(fieldName, val); } else { GridParameter paramObject(fieldName, att.getText()); - processParamString(paramObject, ReaderInfoRef); + processParamString(paramObject, readerInfoRef); if (paramObject.stringType) { obj->set(paramObject.field, paramObject.strVal); LEVELPRINT(READER_VERBOSE_PRINT, @@ -492,7 +492,7 @@ void setAttributes(HelperObject* obj, void setParams(HelperObject* obj, std::shared_ptr& element, const std::string& component, - ReaderInfo& ReaderInfoRef, + ReaderInfo& readerInfoRef, const IgnoreListType& ignoreList) { element->moveToFirstChild(); @@ -509,13 +509,13 @@ void setParams(HelperObject* obj, try { if (param.stringType) { if (param.field.contains("file") || (param.field == "fmu")) { - ReaderInfoRef.checkFileParam(param.strVal); + readerInfoRef.checkFileParam(param.strVal); LEVELPRINT(READER_VERBOSE_PRINT, component << ":setting " << obj->getName() << " file to " << param.strVal); obj->set(param.field, param.strVal); } else { - processParamString(param, ReaderInfoRef); + processParamString(param, readerInfoRef); if (param.stringType) { LEVELPRINT(READER_VERBOSE_PRINT, component << ":setting " << obj->getName() << " " diff --git a/src/fileInput/readEventElement.cpp b/src/fileInput/readEventElement.cpp index bd2ce1c8c..2c5bb0f22 100644 --- a/src/fileInput/readEventElement.cpp +++ b/src/fileInput/readEventElement.cpp @@ -45,7 +45,7 @@ namespace { static void readEventElement(std::shared_ptr& element, EventInfo& eventInfo, - ReaderInfo& ReaderInformation, + ReaderInfo& readerInformation, CoreObject* obj) { if (element->getName() != "event") { @@ -62,31 +62,31 @@ static void readEventElement(std::shared_ptr& element, // check for the field attributes std::string name = getElementField(element, "name", readerConfig::defMatchType); if (!name.empty()) { - name = ReaderInformation.checkDefines(name); + name = readerInformation.checkDefines(name); eventInfo.name = name; } // check for the field attributes const std::string type = getElementField(element, "type", readerConfig::defMatchType); if (!type.empty()) { - eventInfo.type = ReaderInformation.checkDefines(type); + eventInfo.type = readerInformation.checkDefines(type); } // check for the field attributes auto targetList = getElementFieldMultiple(element, "target", readerConfig::defMatchType); for (auto& targetName : targetList) { - targetName = ReaderInformation.checkDefines(targetName); + targetName = readerInformation.checkDefines(targetName); eventInfo.targetObjs.push_back(locateObject(targetName, obj)); } auto fieldList = getElementFieldMultiple(element, "field", readerConfig::defMatchType); for (auto& fieldName : fieldList) { - fieldName = ReaderInformation.checkDefines(fieldName); + fieldName = readerInformation.checkDefines(fieldName); eventInfo.fieldList.push_back(fieldName); } auto unitList = getElementFieldMultiple(element, "units", readerConfig::defMatchType); for (auto& unitName : unitList) { - unitName = ReaderInformation.checkDefines(unitName); + unitName = readerInformation.checkDefines(unitName); eventInfo.units.push_back(units::unit_cast_from_string(unitName)); } @@ -94,13 +94,13 @@ static void readEventElement(std::shared_ptr& element, std::string field = getElementField(element, "period", readerConfig::defMatchType); if (!field.empty()) { - eventInfo.period = interpretString(field, ReaderInformation); + eventInfo.period = interpretString(field, readerInformation); } field = getElementFieldOptions(element, {"t", "time"}, readerConfig::defMatchType); if (!field.empty()) { eventInfo.time = - gmlc::utilities::str2vector(ReaderInformation.checkDefines(field), negTime); + gmlc::utilities::str2vector(readerInformation.checkDefines(field), negTime); } else { if (eventInfo.time.empty() && element->getName() == "scenario") { eventInfo.time.emplace_back(-1.0); @@ -110,37 +110,37 @@ static void readEventElement(std::shared_ptr& element, field = getElementFieldOptions(element, {"value", "val"}, readerConfig::defMatchType); if (!field.empty()) { eventInfo.value = - gmlc::utilities::str2vector(ReaderInformation.checkDefines(field), kNullVal); + gmlc::utilities::str2vector(readerInformation.checkDefines(field), kNullVal); } name = getElementField(element, "file", readerConfig::defMatchType); if (!name.empty()) { - ReaderInformation.checkFileParam(name); + readerInformation.checkFileParam(name); eventInfo.file = name; } field = getElementField(element, "column", readerConfig::defMatchType); if (!field.empty()) { - eventInfo.columns.push_back(static_cast(interpretString(field, ReaderInformation))); + eventInfo.columns.push_back(static_cast(interpretString(field, readerInformation))); } } int loadEventElement(std::shared_ptr& element, CoreObject* obj, - ReaderInfo& ReaderInformation) + ReaderInfo& readerInformation) { int returnValue = FUNCTION_EXECUTION_SUCCESS; element->bookmark(); EventInfo eventInfo; - readEventElement(element, eventInfo, ReaderInformation, obj); + readEventElement(element, eventInfo, readerInformation, obj); auto eventObject = makeEvent(eventInfo, obj); if (!eventObject) { WARNPRINT(READER_WARN_IMPORTANT, "unable to create an event of type " << eventInfo.type); return FUNCTION_EXECUTION_FAILURE; } setAttributes( - eventObject.get(), element, eventNameString, ReaderInformation, eventIgnoreStrings()); - setParams(eventObject.get(), element, eventNameString, ReaderInformation, eventIgnoreStrings()); + eventObject.get(), element, eventNameString, readerInformation, eventIgnoreStrings()); + setParams(eventObject.get(), element, eventNameString, readerInformation, eventIgnoreStrings()); if (!eventObject->isArmed()) { WARNPRINT(READER_WARN_IMPORTANT, "event for " << eventInfo.name << ":unable to load event"); @@ -156,10 +156,10 @@ int loadEventElement(std::shared_ptr& element, WARNPRINT(READER_WARN_IMPORTANT, "Event: " << ownedEvent->getName() << " unable to be added to " << owner->getName()); - ReaderInformation.events.push_back(std::move(ownedEvent)); + readerInformation.events.push_back(std::move(ownedEvent)); } } else { // if it doesn't just put it on the stack and deal with it later - ReaderInformation.events.push_back(std::move(eventObject)); + readerInformation.events.push_back(std::move(eventObject)); } } element->restore(); diff --git a/src/fmi/fmi_import/fmiInfo.cpp b/src/fmi/fmi_import/fmiInfo.cpp index 78500d57b..ed0b046e5 100644 --- a/src/fmi/fmi_import/fmiInfo.cpp +++ b/src/fmi/fmi_import/fmiInfo.cpp @@ -574,7 +574,7 @@ static constexpr char depKindString[] = "dependenciesKind"; static void loadDependencies(std::shared_ptr& readerElementPtr, std::vector& store, - matrixData& depData) + MatrixData& depData) { using gmlc::utilities::stringOps::delimiter_compression; using gmlc::utilities::stringOps::splitline; diff --git a/src/fmi/fmi_import/fmiInfo.h b/src/fmi/fmi_import/fmiInfo.h index 4995b6803..57affce0e 100644 --- a/src/fmi/fmi_import/fmiInfo.h +++ b/src/fmi/fmi_import/fmiInfo.h @@ -12,7 +12,7 @@ #include "../FMI2/fmi2TypesPlatform.h" #include "fmiEnumDefinitions.h" -#include "utilities/matrixDataOrdered.hpp" +#include "utilities/MatrixDataOrdered.hpp" #ifdef __GNUC__ # pragma GCC diagnostic push @@ -145,11 +145,11 @@ class FmiInfo { std::map variableLookup; //!< map translating strings to indices into the variables array - matrixDataOrdered + MatrixDataOrdered outputDep; //!< the output dependency information - matrixDataOrdered + MatrixDataOrdered derivDep; //!< the derivative dependency information - matrixDataOrdered + MatrixDataOrdered unknownDep; //!< the initial unknown dependency information std::vector outputs; //!< a list of the output indices std::vector parameters; //!< a list of all the parameters diff --git a/src/fmi/fmi_models/fmiCoSimLoad.cpp b/src/fmi/fmi_models/fmiCoSimLoad.cpp index 9c9eb9bff..252654543 100644 --- a/src/fmi/fmi_models/fmiCoSimLoad.cpp +++ b/src/fmi/fmi_models/fmiCoSimLoad.cpp @@ -27,7 +27,7 @@ CoreObject* FmiCoSimLoad::clone(CoreObject* obj) const return nobj; } -void FmiCoSimLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void FmiCoSimLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (fmisub->isLoaded()) { configureFmiIo(); @@ -42,7 +42,7 @@ void FmiCoSimLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) disable(); } } -void FmiCoSimLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void FmiCoSimLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { fmisub->dynInitializeA(time0, flags); // ZipLoad::dynObjectInitializeA(time0, flags); @@ -55,7 +55,7 @@ void FmiCoSimLoad::dynObjectInitializeB(const IOdata& inputs, fmisub->dynInitializeB(inputs, desiredOutput, fieldSet); } -void FmiCoSimLoad::setState(coreTime time, +void FmiCoSimLoad::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) diff --git a/src/fmi/fmi_models/fmiCoSimLoad.h b/src/fmi/fmi_models/fmiCoSimLoad.h index db9eeffb2..ae27aff90 100644 --- a/src/fmi/fmi_models/fmiCoSimLoad.h +++ b/src/fmi/fmi_models/fmiCoSimLoad.h @@ -23,13 +23,13 @@ class FmiCoSimLoad: public FmiCoSimWrapper { public: FmiCoSimLoad(const std::string& objName = "fmiLoad_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; diff --git a/src/fmi/fmi_models/fmiCoSimLoad3phase.cpp b/src/fmi/fmi_models/fmiCoSimLoad3phase.cpp index 81d08e6f8..71314a5fd 100644 --- a/src/fmi/fmi_models/fmiCoSimLoad3phase.cpp +++ b/src/fmi/fmi_models/fmiCoSimLoad3phase.cpp @@ -65,7 +65,7 @@ void FmiCoSimLoad3phase::set(std::string_view param, double val, units::unit uni } } -void FmiCoSimLoad3phase::setState(coreTime time, +void FmiCoSimLoad3phase::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) diff --git a/src/fmi/fmi_models/fmiCoSimLoad3phase.h b/src/fmi/fmi_models/fmiCoSimLoad3phase.h index 92bd270f3..29f822247 100644 --- a/src/fmi/fmi_models/fmiCoSimLoad3phase.h +++ b/src/fmi/fmi_models/fmiCoSimLoad3phase.h @@ -32,7 +32,7 @@ class FmiCoSimLoad3phase: public FmiCoSimWrapper { set(std::string_view param, double val, units::unit unitType = units::defunit) override; virtual void setFlag(std::string_view flag, bool val) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; diff --git a/src/fmi/fmi_models/fmiCoSimSubModel.cpp b/src/fmi/fmi_models/fmiCoSimSubModel.cpp index 73023e8a1..ea5a05165 100644 --- a/src/fmi/fmi_models/fmiCoSimSubModel.cpp +++ b/src/fmi/fmi_models/fmiCoSimSubModel.cpp @@ -13,7 +13,7 @@ #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" #include "outputEstimator.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -49,7 +49,7 @@ bool FmiCoSimSubModel::isLoaded() const return static_cast(cs); } -void FmiCoSimSubModel::dynObjectInitializeA(coreTime time, std::uint32_t flags) +void FmiCoSimSubModel::dynObjectInitializeA(CoreTime time, std::uint32_t flags) { if (CHECK_CONTROLFLAG(force_constant_pflow_initialization, flags)) { opFlags.set(pflow_init_required); @@ -415,7 +415,7 @@ double FmiCoSimSubModel::getPartial(int depIndex, int refIndex, RefMode /*mode*/ return res; } -void FmiCoSimSubModel::timestep(coreTime /*time*/, +void FmiCoSimSubModel::timestep(CoreTime /*time*/, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { @@ -470,7 +470,7 @@ return out; void FmiCoSimSubModel::ioPartialDerivatives(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /* md*/, + MatrixData& /* md*/, const IOlocs& /*inputLocs*/, const SolverMode& /*sMode*/) { diff --git a/src/fmi/fmi_models/fmiCoSimSubModel.h b/src/fmi/fmi_models/fmiCoSimSubModel.h index 42446dbdc..758800cae 100644 --- a/src/fmi/fmi_models/fmiCoSimSubModel.h +++ b/src/fmi/fmi_models/fmiCoSimSubModel.h @@ -42,7 +42,7 @@ class FmiCoSimSubModel: public GridSubModel { FmiCoSimSubModel(std::shared_ptr fmi = nullptr); virtual ~FmiCoSimSubModel(); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -57,10 +57,10 @@ class FmiCoSimSubModel: public GridSubModel { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; diff --git a/src/fmi/fmi_models/fmiCoSimWrapper.hpp b/src/fmi/fmi_models/fmiCoSimWrapper.hpp index 8da4938f9..11148b417 100644 --- a/src/fmi/fmi_models/fmiCoSimWrapper.hpp +++ b/src/fmi/fmi_models/fmiCoSimWrapper.hpp @@ -25,7 +25,7 @@ class FmiCoSimWrapper: public FmiWrapper { return nobj; } - void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override + void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override { if (FmiWrapper::fmisub->isLoaded()) { FmiWrapper::configureFmiIo(); @@ -56,7 +56,7 @@ class FmiCoSimWrapper: public FmiWrapper { void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override { FmiWrapper::fmisub->outputPartialDerivatives(inputs, @@ -66,7 +66,7 @@ class FmiCoSimWrapper: public FmiWrapper { } void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override { @@ -75,7 +75,7 @@ class FmiCoSimWrapper: public FmiWrapper { } void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override { @@ -90,7 +90,7 @@ class FmiCoSimWrapper: public FmiWrapper { { FmiWrapper::fmisub->rootTest(inputs, sD, roots, sMode); } - void rootTrigger(coreTime time, + void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override @@ -98,7 +98,7 @@ class FmiCoSimWrapper: public FmiWrapper { FmiWrapper::fmisub->rootTrigger(time, inputs, rootMask, sMode); } - void setState(coreTime time, + void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override @@ -111,7 +111,7 @@ class FmiCoSimWrapper: public FmiWrapper { return FmiWrapper::fmisub->findIndex(field, sMode); } - void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override + void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override { BaseObj::prevTime = time; FmiWrapper::fmisub->timestep(time, inputs, sMode); diff --git a/src/fmi/fmi_models/fmiGenModel.h b/src/fmi/fmi_models/fmiGenModel.h index 8bd6de976..ac986a4e5 100644 --- a/src/fmi/fmi_models/fmiGenModel.h +++ b/src/fmi/fmi_models/fmiGenModel.h @@ -17,7 +17,7 @@ class FmiGenModel: public FmiMEWrapper { public: FmiGenModel(const std::string& objName = "fmiGenModel_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - // virtual void dynObjectInitializeA (coreTime time0, std::uint32_t flags) override; + // virtual void dynObjectInitializeA (CoreTime time0, std::uint32_t flags) override; // virtual void dynObjectInitializeB (const IOdata &inputs, const IOdata &desiredOutput, // IOdata &fieldSet) override; diff --git a/src/fmi/fmi_models/fmiMELoad.cpp b/src/fmi/fmi_models/fmiMELoad.cpp index b981629fa..83beb31dc 100644 --- a/src/fmi/fmi_models/fmiMELoad.cpp +++ b/src/fmi/fmi_models/fmiMELoad.cpp @@ -64,7 +64,7 @@ void FmiMELoad::set(std::string_view param, double val, units::unit unitType) } } -void FmiMELoad::setState(coreTime time, +void FmiMELoad::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) diff --git a/src/fmi/fmi_models/fmiMELoad.h b/src/fmi/fmi_models/fmiMELoad.h index fc59e5d79..38647faf0 100644 --- a/src/fmi/fmi_models/fmiMELoad.h +++ b/src/fmi/fmi_models/fmiMELoad.h @@ -33,7 +33,7 @@ class FmiMELoad: public FmiMEWrapper { virtual void updateLocalCache(const IOdata& inputs, const StateData& stateDataRef, const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; diff --git a/src/fmi/fmi_models/fmiMELoad3phase.cpp b/src/fmi/fmi_models/fmiMELoad3phase.cpp index f57e2c4f8..39a45ea06 100644 --- a/src/fmi/fmi_models/fmiMELoad3phase.cpp +++ b/src/fmi/fmi_models/fmiMELoad3phase.cpp @@ -66,7 +66,7 @@ void FmiMELoad3phase::set(std::string_view param, double val, units::unit unitTy } } -void FmiMELoad3phase::setState(coreTime time, +void FmiMELoad3phase::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) diff --git a/src/fmi/fmi_models/fmiMELoad3phase.h b/src/fmi/fmi_models/fmiMELoad3phase.h index c40fac9f0..d0736d949 100644 --- a/src/fmi/fmi_models/fmiMELoad3phase.h +++ b/src/fmi/fmi_models/fmiMELoad3phase.h @@ -32,7 +32,7 @@ class FmiMELoad3phase: public FmiMEWrapper { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; diff --git a/src/fmi/fmi_models/fmiMESubModel.cpp b/src/fmi/fmi_models/fmiMESubModel.cpp index b9073a186..cf729af54 100644 --- a/src/fmi/fmi_models/fmiMESubModel.cpp +++ b/src/fmi/fmi_models/fmiMESubModel.cpp @@ -13,7 +13,7 @@ #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" #include "outputEstimator.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -49,7 +49,7 @@ bool FmiMESubModel::isLoaded() const return static_cast(me); } -void FmiMESubModel::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void FmiMESubModel::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // printf("GridDyn Pflow A\n"); if (CHECK_CONTROLFLAG(flags, force_constant_pflow_initialization)) { @@ -72,7 +72,7 @@ void FmiMESubModel::pFlowObjectInitializeB() } } -void FmiMESubModel::dynObjectInitializeA(coreTime time0, std::uint32_t /*flags*/) +void FmiMESubModel::dynObjectInitializeA(CoreTime time0, std::uint32_t /*flags*/) { prevTime = time0; } @@ -358,7 +358,7 @@ std::pair FmiMESubModel::LocalRootCount(const SolverMode& /* s return {0, m_eventCount}; } -void FmiMESubModel::setState(coreTime time, +void FmiMESubModel::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -406,7 +406,7 @@ void FmiMESubModel::setState(coreTime time, prevTime = time; } // for saving the state -void FmiMESubModel::guessState(coreTime /*time*/, +void FmiMESubModel::guessState(CoreTime /*time*/, double state[], double dstateDt[], const SolverMode& sMode) @@ -600,7 +600,7 @@ double FmiMESubModel::getPartial(int depIndex, int refIndex, RefMode mode) } void FmiMESubModel::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -659,16 +659,16 @@ void FmiMESubModel::jacobianElements(const IOdata& inputs, } } -void FmiMESubModel::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void FmiMESubModel::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { - coreTime h = localIntegrationTime; + CoreTime h = localIntegrationTime; // int sv = 0; // double aval = 0.95; // size_t aloc = 7; - coreTime curTime = prevTime; + CoreTime curTime = prevTime; fmi2Boolean eventMode; fmi2Boolean terminateSim; - coreTime tend = time; + CoreTime tend = time; std::vector derX(m_stateSize); std::vector derX2(m_stateSize); std::vector prevInput(m_inputSize); @@ -705,7 +705,7 @@ void FmiMESubModel::timestep(coreTime time, const IOdata& inputs, const SolverMo void FmiMESubModel::ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { @@ -735,7 +735,7 @@ void FmiMESubModel::ioPartialDerivatives(const IOdata& inputs, void FmiMESubModel::outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) { auto loc = offsets.getLocations(sD, sMode, this); @@ -774,7 +774,7 @@ void FmiMESubModel::rootTest(const IOdata& inputs, me->getEventIndicators(&(roots[rootOffset])); } -void FmiMESubModel::rootTrigger(coreTime /*time*/, +void FmiMESubModel::rootTrigger(CoreTime /*time*/, const IOdata& /*inputs*/, const std::vector& /*rootMask*/, const SolverMode& /*sMode*/) diff --git a/src/fmi/fmi_models/fmiMESubModel.h b/src/fmi/fmi_models/fmiMESubModel.h index ffe41fc84..34f3c4e20 100644 --- a/src/fmi/fmi_models/fmiMESubModel.h +++ b/src/fmi/fmi_models/fmiMESubModel.h @@ -40,7 +40,7 @@ class FmiMESubModel: public GridSubModel { std::vector oEst; //!< vector of objects used for output estimation //!< //TODO:: Make this an actual vector of objects - coreTime localIntegrationTime = 0.01; + CoreTime localIntegrationTime = 0.01; FmuMode prevFmiState = FmuMode::INSTANTIATED_MODE; std::vector stateInformation; std::vector outputInformation; @@ -61,10 +61,10 @@ class FmiMESubModel: public GridSubModel { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -96,24 +96,24 @@ class FmiMESubModel: public GridSubModel { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -133,12 +133,12 @@ class FmiMESubModel: public GridSubModel { virtual double getOutput(index_t outputNum = 0) const override; virtual index_t getOutputLoc(const SolverMode& sMode, index_t outputNum = 0) const override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; // for saving the state - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; diff --git a/src/fmi/fmi_models/fmiMEWrapper.hpp b/src/fmi/fmi_models/fmiMEWrapper.hpp index 1cc4f8246..c4d15d838 100644 --- a/src/fmi/fmi_models/fmiMEWrapper.hpp +++ b/src/fmi/fmi_models/fmiMEWrapper.hpp @@ -26,7 +26,7 @@ class FmiMEWrapper: public FmiWrapper { return nobj; } - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override { if (FmiWrapper::fmisub == nullptr) { this->disable(); @@ -41,7 +41,7 @@ class FmiMEWrapper: public FmiWrapper { } } - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override { if (!BaseObj::opFlags[pFlow_initialized]) { // just to make sure we actually // initialized and didn't go directly to @@ -73,7 +73,7 @@ class FmiMEWrapper: public FmiWrapper { virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override { if (FmiWrapper::fmisub == nullptr) { @@ -83,7 +83,7 @@ class FmiMEWrapper: public FmiWrapper { } virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override { @@ -95,7 +95,7 @@ class FmiMEWrapper: public FmiWrapper { } virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override { @@ -116,7 +116,7 @@ class FmiMEWrapper: public FmiWrapper { } FmiWrapper::fmisub->rootTest(inputs, sD, roots, sMode); } - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override @@ -127,7 +127,7 @@ class FmiMEWrapper: public FmiWrapper { FmiWrapper::fmisub->rootTrigger(time, inputs, rootMask, sMode); } - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override @@ -146,7 +146,7 @@ class FmiMEWrapper: public FmiWrapper { return FmiWrapper::fmisub->findIndex(field, sMode); } - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override { BaseObj::prevTime = time; if (FmiWrapper::fmisub == nullptr) { diff --git a/src/fmi/fmi_models/fmiWrapper.hpp b/src/fmi/fmi_models/fmiWrapper.hpp index 99bb9f0dc..b3f80397c 100644 --- a/src/fmi/fmi_models/fmiWrapper.hpp +++ b/src/fmi/fmi_models/fmiWrapper.hpp @@ -205,7 +205,7 @@ provided with the default to the regular call fmisub->set("outputs", outputs); } - void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override + void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override { if (fmisub->isLoaded()) { configureFmiIo(); diff --git a/src/fmi/fmi_models/outputEstimator.cpp b/src/fmi/fmi_models/outputEstimator.cpp index 31cf3d9ce..7532b4741 100644 --- a/src/fmi/fmi_models/outputEstimator.cpp +++ b/src/fmi/fmi_models/outputEstimator.cpp @@ -22,7 +22,7 @@ OutputEstimator::OutputEstimator(std::vector sDep, std::vector iDep): prevInputs.resize(inputDep.size()); } -double OutputEstimator::estimate(coreTime timeVal, const IOdata& inputs, const double state[]) +double OutputEstimator::estimate(CoreTime timeVal, const IOdata& inputs, const double state[]) { double val = prevValue; for (size_t kk = 0; kk < stateDep.size(); ++kk) { @@ -35,7 +35,7 @@ double OutputEstimator::estimate(coreTime timeVal, const IOdata& inputs, const d return val; } -bool OutputEstimator::update(coreTime timeVal, +bool OutputEstimator::update(CoreTime timeVal, double val, const IOdata& inputs, const double state[]) diff --git a/src/fmi/fmi_models/outputEstimator.h b/src/fmi/fmi_models/outputEstimator.h index f21d17275..40e56daca 100644 --- a/src/fmi/fmi_models/outputEstimator.h +++ b/src/fmi/fmi_models/outputEstimator.h @@ -18,7 +18,7 @@ the input and states and summing them with the actual difference between the las */ class OutputEstimator { private: - coreTime time = timeZero; //!< the last time of known values + CoreTime time = timeZero; //!< the last time of known values double prevValue = 0.0; //!< the previous known value std::vector prevInputs; //!< the last known inputs std::vector prevStates; //!< the last known states @@ -35,9 +35,9 @@ class OutputEstimator { /** construct with the known indices of the dependencies*/ OutputEstimator(std::vector sDep, std::vector iDep); /** make a guess as to the present output based on time inputs and states*/ - double estimate(coreTime time, const IOdata& inputs, const double state[]); + double estimate(CoreTime time, const IOdata& inputs, const double state[]); /** update the estimator with new values inputs and states*/ - bool update(coreTime time, double val, const IOdata& inputs, const double state[]); + bool update(CoreTime time, double val, const IOdata& inputs, const double state[]); }; } // namespace griddyn::fmi diff --git a/src/fmi_export/fmiCollector.cpp b/src/fmi_export/fmiCollector.cpp index 03570e61d..67c02fea4 100644 --- a/src/fmi_export/fmiCollector.cpp +++ b/src/fmi_export/fmiCollector.cpp @@ -36,7 +36,7 @@ void FmiCollector::cloneTo(Collector* collectorClone) const } } -ChangeCode FmiCollector::trigger(coreTime time) +ChangeCode FmiCollector::trigger(CoreTime time) { Collector::trigger(time); return ChangeCode::NO_CHANGE; diff --git a/src/fmi_export/fmiCollector.h b/src/fmi_export/fmiCollector.h index d22dcc3fd..eb1664593 100644 --- a/src/fmi_export/fmiCollector.h +++ b/src/fmi_export/fmiCollector.h @@ -27,7 +27,7 @@ class FmiCollector: public Collector { virtual std::unique_ptr clone() const override; virtual void cloneTo(Collector* collectorClone = nullptr) const override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; void set(std::string_view param, double val) override; void set(std::string_view param, std::string_view val) override; diff --git a/src/fmi_export/fmiCoordinator.cpp b/src/fmi_export/fmiCoordinator.cpp index a22257ada..09a1f0557 100644 --- a/src/fmi_export/fmiCoordinator.cpp +++ b/src/fmi_export/fmiCoordinator.cpp @@ -178,7 +178,7 @@ double FmiCoordinator::getOutput(index_t valueReference) return kNullVal; } -void FmiCoordinator::updateOutputs(coreTime time) +void FmiCoordinator::updateOutputs(CoreTime time) { for (auto* collector : mCollectors) { collector->trigger(time); diff --git a/src/fmi_export/fmiCoordinator.h b/src/fmi_export/fmiCoordinator.h index 5673e94c4..2b504c596 100644 --- a/src/fmi_export/fmiCoordinator.h +++ b/src/fmi_export/fmiCoordinator.h @@ -92,7 +92,7 @@ class FmiCoordinator: public griddyn::CoreObject { buffer @param[in] time the time to get the outputs for */ - void updateOutputs(coreTime time); + void updateOutputs(CoreTime time); /** get a string representing the FMIName of the current simulation*/ const std::string& getFmiName() const; diff --git a/src/fmi_export/fmiRunner.cpp b/src/fmi_export/fmiRunner.cpp index 70988e2e3..21569c5c3 100644 --- a/src/fmi_export/fmiRunner.cpp +++ b/src/fmi_export/fmiRunner.cpp @@ -64,12 +64,12 @@ void FmiRunner::updateOutputs() mCoordinator->updateOutputs(m_gds->getSimulationTime()); } -coreTime FmiRunner::Run() +CoreTime FmiRunner::Run() { return GriddynRunner::Run(); } -void FmiRunner::StepAsync(coreTime time) +void FmiRunner::StepAsync(CoreTime time) { if (stepFinished != nullptr) { mAsyncReturn = std::async(std::launch::async, [this, time] { @@ -90,7 +90,7 @@ bool FmiRunner::isFinished() const (mAsyncReturn.wait_for(std::chrono::seconds(0)) == std::future_status::ready) : true; } -coreTime FmiRunner::Step(coreTime time) +CoreTime FmiRunner::Step(CoreTime time) { auto retTime = GriddynRunner::Step(time); mCoordinator->updateOutputs(retTime); diff --git a/src/fmi_export/fmiRunner.h b/src/fmi_export/fmiRunner.h index 44d99394b..4f5791804 100644 --- a/src/fmi_export/fmiRunner.h +++ b/src/fmi_export/fmiRunner.h @@ -46,13 +46,13 @@ it inherits from gridDynRunner and adds some extra features necessary for execut ~FmiRunner(); public: - virtual coreTime Run() override; + virtual CoreTime Run() override; /** update the FMI outputs*/ void updateOutputs(); - virtual coreTime Step(coreTime time) override; - virtual void StepAsync(coreTime time) override; + virtual CoreTime Step(CoreTime time) override; + virtual void StepAsync(CoreTime time) override; virtual void Finalize() override; private: diff --git a/src/fmi_export/testFMIExport.cpp b/src/fmi_export/testFMIExport.cpp index a8f099e20..68849c3bf 100644 --- a/src/fmi_export/testFMIExport.cpp +++ b/src/fmi_export/testFMIExport.cpp @@ -46,7 +46,7 @@ void generateFmu(const std::string& target, const std::string& inputFile) } // namespace -using griddyn::coreTime; +using griddyn::CoreTime; using griddyn::GridBus; using griddyn::GridDynSimulation; using griddyn::loadFile; @@ -260,7 +260,7 @@ TEST_F(FmiExportTests, TestFmiRunner2) ASSERT_NE(loadObject, nullptr); auto ret = runner->Step(10.0); - EXPECT_EQ(ret, coreTime(10.0)); + EXPECT_EQ(ret, CoreTime(10.0)); auto vaVr = runner->findVR("Bus11_VA"); auto vbVr = runner->findVR("Bus11_VB"); diff --git a/src/formatInterpreters/tomlElement.cpp b/src/formatInterpreters/tomlElement.cpp index 2d895b8ed..70e4947f4 100644 --- a/src/formatInterpreters/tomlElement.cpp +++ b/src/formatInterpreters/tomlElement.cpp @@ -9,7 +9,7 @@ #include #include -static const char nullStr[] = ""; +static constexpr char nullStr[] = ""; namespace { bool isTomlNodeEmpty(const toml::ordered_value& value) diff --git a/src/fskit/GridDynFederatedSimulator.cpp b/src/fskit/GridDynFederatedSimulator.cpp index e0ac1c48a..ff4830913 100644 --- a/src/fskit/GridDynFederatedSimulator.cpp +++ b/src/fskit/GridDynFederatedSimulator.cpp @@ -43,7 +43,7 @@ fskit::Time GridDynFederatedSimulator::CalculateLocalGrantedTime(void) { const double kBigNum(1e49); - griddyn::coreTime griddynNextEventTime = mGridDyn->getNextEvent(); + griddyn::CoreTime griddynNextEventTime = mGridDyn->getNextEvent(); // assert(griddynNextEventTime > mCurrentGriddynTime); @@ -66,9 +66,9 @@ bool GridDynFederatedSimulator::Finalize(void) // Method used by Variable Step Size simulator std::tuple GridDynFederatedSimulator::TimeAdvancement(const fskit::Time& time) { - griddyn::coreTime gdTime; + griddyn::CoreTime gdTime; - // Convert fskit time to coreTime used by Griddyn + // Convert fskit time to CoreTime used by Griddyn gdTime.setBaseTimeCode(time.GetRaw()); bool stopSimulation = false; @@ -86,7 +86,7 @@ std::tuple GridDynFederatedSimulator::TimeAdvancement(const f { // Next event time should now be larger than granted time - griddyn::coreTime griddynNextEventTime = mGridDyn->getNextEvent(); + griddyn::CoreTime griddynNextEventTime = mGridDyn->getNextEvent(); // assert(griddynNextEventTime > mCurrentGriddynTime); } } diff --git a/src/fskit/GridDynFederatedSimulator.h b/src/fskit/GridDynFederatedSimulator.h index 11418a02e..1e52a5341 100644 --- a/src/fskit/GridDynFederatedSimulator.h +++ b/src/fskit/GridDynFederatedSimulator.h @@ -58,7 +58,7 @@ class GridDynFederatedSimulator: fskit::Time mCurrentFskitTime; fskit::Time mGrantedTime; - griddyn::coreTime mCurrentGriddynTime; + griddyn::CoreTime mCurrentGriddynTime; std::shared_ptr mGridDyn; }; diff --git a/src/fskit/fskitRunner.cpp b/src/fskit/fskitRunner.cpp index da61fb264..3c26dc839 100644 --- a/src/fskit/fskitRunner.cpp +++ b/src/fskit/fskitRunner.cpp @@ -42,7 +42,7 @@ int FskitRunner::Initialize(int argc, char* argv[]) return returnValue; } -coreTime FskitRunner::Run() +CoreTime FskitRunner::Run() { GRIDDYN_TRACER("GridDyn::GriddynRunner::Run"); return GriddynRunner::Run(); diff --git a/src/fskit/fskitRunner.h b/src/fskit/fskitRunner.h index c6c6b4692..15cecd631 100644 --- a/src/fskit/fskitRunner.h +++ b/src/fskit/fskitRunner.h @@ -32,7 +32,7 @@ class FskitRunner: public GriddynRunner { std::shared_ptr grantedTimeWindowScheduler); virtual int Initialize(int argc, char* argv[]) override; - virtual coreTime Run() override; + virtual CoreTime Run() override; virtual void Finalize() override; }; } // namespace griddyn diff --git a/src/griddyn/Block.h b/src/griddyn/Block.h index 41a477dd2..f51f5ab5f 100644 --- a/src/griddyn/Block.h +++ b/src/griddyn/Block.h @@ -78,7 +78,7 @@ class GridBlock: public GridSubModel { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, @@ -172,28 +172,28 @@ class GridBlock: public GridSubModel { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& solverModeValue); virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& solverModeValue) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** @brief simplifying function in place of timestep since block have only one input/output @param[in] time the time to step to @param[in] input the input argument @return the output */ - virtual double step(coreTime time, double input); + virtual double step(CoreTime time, double input); virtual void rootTest(const IOdata& inputs, const StateData& stateDataValue, double roots[], const SolverMode& solverModeValue) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& solverModeValue) override; @@ -201,7 +201,7 @@ class GridBlock: public GridSubModel { const StateData& stateDataValue, const SolverMode& solverModeValue, CheckLevel level) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; virtual stringVec localStateNames() const override; /** get the single output for the block @param[in] stateDataValue the state data to use in computing the output diff --git a/src/griddyn/CMakeLists.txt b/src/griddyn/CMakeLists.txt index b5dc00070..1daf0b025 100644 --- a/src/griddyn/CMakeLists.txt +++ b/src/griddyn/CMakeLists.txt @@ -385,7 +385,7 @@ set(measurement_sources measurement/stateGrabbers.cpp measurement/Condition.cpp measurement/ObjectGrabbers.cpp - measurement/compoundCondition.cpp + measurement/CompoundCondition.cpp measurement/Collector.cpp measurement/GrabberSet.cpp ) diff --git a/src/griddyn/Exciter.h b/src/griddyn/Exciter.h index f58533eab..c976f9cf4 100644 --- a/src/griddyn/Exciter.h +++ b/src/griddyn/Exciter.h @@ -45,7 +45,7 @@ class Exciter: public GridSubModel { explicit Exciter(const std::string& objName = "exciter_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -65,7 +65,7 @@ class Exciter: public GridSubModel { const SolverMode& SolverMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateData, - matrixData& matrix, + MatrixData& matrix, const IOlocs& inputLocs, const SolverMode& SolverMode) override; // handle the rootfinding functions @@ -73,7 +73,7 @@ class Exciter: public GridSubModel { const StateData& stateData, double root[], const SolverMode& SolverMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& SolverMode) override; @@ -82,7 +82,7 @@ class Exciter: public GridSubModel { const SolverMode& SolverMode, CheckLevel level) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; virtual const std::vector& inputNames() const override; virtual const std::vector& outputNames() const override; diff --git a/src/griddyn/GenModel.h b/src/griddyn/GenModel.h index 7d14c8601..d10f16448 100644 --- a/src/griddyn/GenModel.h +++ b/src/griddyn/GenModel.h @@ -66,7 +66,7 @@ class GenModel: public GridSubModel { virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; diff --git a/src/griddyn/Generator.h b/src/griddyn/Generator.h index 34fdab0b1..59cb54fec 100644 --- a/src/griddyn/Generator.h +++ b/src/griddyn/Generator.h @@ -21,10 +21,10 @@ class GridSubModel; /** @ brief class describing a generator unit a generator is a power production unit in GridDyn. the base generator class implements methods set -forth in the gridSecondary class and inherits from that class it has mechanics for dealing with the +forth in the GridSecondary class and inherits from that class it has mechanics for dealing with the power flow solution modes of a generator with no dynamics */ -class Generator: public gridSecondary { +class Generator: public GridSecondary { public: /** @brief flags for controlling operation of the generator*/ enum GeneratorFlags { @@ -87,17 +87,17 @@ class Generator: public gridSecondary { ~Generator(); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; // for saving the state - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstate_dt[], const SolverMode& sMode) override; // for initial setting of the state @@ -134,25 +134,25 @@ class Generator: public gridSecondary { virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void getStateName(stringVec& stNames, const SolverMode& sMode, const std::string& prefix) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** @brief get the current generator set point @return the current generator set point*/ @@ -174,31 +174,31 @@ class Generator: public gridSecondary { const std::vector& Qminpts, const std::vector& Qmaxpts); - virtual IOdata predictOutputs(coreTime predictionTime, + virtual IOdata predictOutputs(CoreTime predictionTime, const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode) const override; - virtual double getAdjustableCapacityUp(coreTime time = maxTime) const override; - virtual double getAdjustableCapacityDown(coreTime time = maxTime) const override; + virtual double getAdjustableCapacityUp(CoreTime time = maxTime) const override; + virtual double getAdjustableCapacityDown(CoreTime time = maxTime) const override; /** @brief get the maximum generation attainable in a specific amount of time @param[in] time the time window to achieve the generation @return the max real power*/ - virtual double getPmax(coreTime time = maxTime) const; + virtual double getPmax(CoreTime time = maxTime) const; /** @brief get the maximum reactive generation attainable in a specific amount of time @param[in] time the time window to achieve the generation @param[in] Ptest the real power output corresponding to the desired attainable generation @return the max reactive power*/ - virtual double getQmax(coreTime time = maxTime, double Ptest = kNullVal) const; + virtual double getQmax(CoreTime time = maxTime, double Ptest = kNullVal) const; /** @brief get the minimum real generation attainable in a specific amount of time @param[in] time the time window to achieve the generation @return the max real power*/ - virtual double getPmin(coreTime time = maxTime) const; + virtual double getPmin(CoreTime time = maxTime) const; /** @brief get the minimum reactive generation attainable in a specific amount of time @param[in] time the time window to achieve the generation @param[in] Ptest the real power output corresponding to the desired attainable generation @return the min reactive power*/ - virtual double getQmin(coreTime time = maxTime, double Ptest = kNullVal) const; + virtual double getQmin(CoreTime time = maxTime, double Ptest = kNullVal) const; /** @brief adjust the output generation by the specified amount @param[in] adjustment the value of the desired adjustment */ diff --git a/src/griddyn/Governor.h b/src/griddyn/Governor.h index 2013bd874..4f5a1e3d2 100644 --- a/src/griddyn/Governor.h +++ b/src/griddyn/Governor.h @@ -53,7 +53,7 @@ class Governor: public GridSubModel { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; /** @brief destructor*/ virtual ~Governor(); - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -75,10 +75,10 @@ class Governor: public GridSubModel { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& sD, diff --git a/src/griddyn/GridArea.h b/src/griddyn/GridArea.h index f9cb28ea1..e67d7d4a2 100644 --- a/src/griddyn/GridArea.h +++ b/src/griddyn/GridArea.h @@ -154,23 +154,23 @@ class GridArea: public GridPrimary { virtual void setRootOffset(index_t rootOffset, const SolverMode& sMode) override; protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; // dynInitializeB dynamics - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; public: - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; // TODO(phlpt): Implement this or remove it if angle updates are no longer used. /** @brief update the angles may be deprecated @param[in] time the time to update to */ - virtual void updateTheta(coreTime time); + virtual void updateTheta(CoreTime time); // parameter set functions virtual void setFlag(std::string_view flag, bool val) override; @@ -207,7 +207,7 @@ class GridArea: public GridPrimary { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void residual(const IOdata& inputs, @@ -234,7 +234,7 @@ class GridArea: public GridPrimary { const SolverMode& sMode) override; virtual void delayedJacobian(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void delayedAlgebraicUpdate(const IOdata& inputs, @@ -246,7 +246,7 @@ class GridArea: public GridPrimary { virtual ChangeCode powerFlowAdjust(const IOdata& inputs, std::uint32_t flags, CheckLevel level) override; virtual void pFlowCheck(std::vector& Violation_vector) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; @@ -254,7 +254,7 @@ class GridArea: public GridPrimary { virtual void getVariableType(double sdata[], const SolverMode& sMode) override; virtual void getTols(double tols[], const SolverMode& sMode) override; // dynamic simulation - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; @@ -269,7 +269,7 @@ class GridArea: public GridPrimary { @param[in] tol the tolerance to converge to */ - virtual void converge(coreTime time, + virtual void converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -287,7 +287,7 @@ class GridArea: public GridPrimary { const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -412,12 +412,12 @@ class GridArea: public GridPrimary { @param[in] time the time within which to make the adjustment @return athe total adjustable capacity Up */ - double getAdjustableCapacityUp(coreTime time = maxTime) const; + double getAdjustableCapacityUp(CoreTime time = maxTime) const; /** @brief get the total adjustable Capacity Down for the area within a certain time frame @param[in] time the time within which to make the adjustment @return athe total adjustable capacity Down */ - double getAdjustableCapacityDown(coreTime time = maxTime) const; + double getAdjustableCapacityDown(CoreTime time = maxTime) const; /** @brief get the total loss for contained links @return the total area loss */ diff --git a/src/griddyn/GridBus.h b/src/griddyn/GridBus.h index b77473250..e5bf8b021 100644 --- a/src/griddyn/GridBus.h +++ b/src/griddyn/GridBus.h @@ -100,7 +100,7 @@ class GridBus: public GridPrimary { model_parameter Atol = -1.0; //!<[rad] angle tolerance value <0 implies automatic setting from global levels - coreTime lowVtime = negTime; //!< the last time a low voltage alert was triggered + CoreTime lowVtime = negTime; //!< the last time a low voltage alert was triggered public: /** @brief default constructor*/ @@ -134,7 +134,7 @@ class GridBus: public GridPrimary { // dynInitializeB protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; public: @@ -147,7 +147,7 @@ class GridBus: public GridPrimary { virtual void reset(ResetLevels level = ResetLevels::minimal) override; // dynInitializeB dynamics protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -181,7 +181,7 @@ class GridBus: public GridPrimary { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void residual(const IOdata& inputs, @@ -209,7 +209,7 @@ class GridBus: public GridPrimary { const SolverMode& sMode, double alpha); - virtual void converge(coreTime time, + virtual void converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -225,7 +225,7 @@ class GridBus: public GridPrimary { const SolverMode& sMode) override; public: - void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** @brief a faster function to set the voltage and angle of a bus* @param[in] voltageNew the new voltage @@ -352,13 +352,13 @@ class GridBus: public GridPrimary { @param[in] time the time period within which to do the adjustments * @return the reactive link power **/ - virtual double getAdjustableCapacityUp(coreTime time = maxTime) const; + virtual double getAdjustableCapacityUp(CoreTime time = maxTime) const; /** @brief get the available controllable upward adjustments within a time period @ details this means power production or load reduction @param[in] time the time period within which to do the adjustments * @return the reactive link power **/ - virtual double getAdjustableCapacityDown(coreTime time = maxTime) const; + virtual double getAdjustableCapacityDown(CoreTime time = maxTime) const; /** @brief the dPdf partial derivative (may be deprecated in the future) * @return the $\frac{\partial P}{\partial f}$ **/ @@ -436,7 +436,7 @@ class GridBus: public GridPrimary { const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; diff --git a/src/griddyn/GridComponent.cpp b/src/griddyn/GridComponent.cpp index 6cf1c4f41..8508d12c4 100644 --- a/src/griddyn/GridComponent.cpp +++ b/src/griddyn/GridComponent.cpp @@ -11,7 +11,7 @@ #include "core/ObjectInterpreter.h" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -122,7 +122,7 @@ void GridComponent::updateObjectLinkages(CoreObject* newRoot) } // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::pFlowInitializeA(coreTime time0, std::uint32_t flags) +void GridComponent::pFlowInitializeA(CoreTime time0, std::uint32_t flags) { if (localBaseVoltage == kNullVal) { if (isRoot()) { // NOLINT @@ -151,7 +151,7 @@ void GridComponent::pFlowInitializeB() } // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::dynInitializeA(coreTime time0, std::uint32_t flags) +void GridComponent::dynInitializeA(CoreTime time0, std::uint32_t flags) { if (isEnabled()) { dynObjectInitializeA(time0, flags); @@ -177,7 +177,7 @@ void GridComponent::dynInitializeB(const IOdata& inputs, } // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridComponent::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { for (auto& subobj : subObjectList) { subobj->pFlowInitializeA(time0, flags); @@ -193,7 +193,7 @@ void GridComponent::pFlowObjectInitializeB() } // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridComponent::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { for (auto& subobj : subObjectList) { subobj->dynInitializeA(time0, flags); @@ -919,7 +919,7 @@ ChangeCode // NOLINTEND(misc-no-recursion) // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::setState(coreTime time, +void GridComponent::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -964,7 +964,7 @@ void GridComponent::setState(coreTime time, } // for saving the state // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::guessState(coreTime time, +void GridComponent::guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) @@ -1687,7 +1687,7 @@ CoreObject* GridComponent::findByUserID(std::string_view typeName, index_t searc } // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void GridComponent::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { prevTime = time; @@ -1702,7 +1702,7 @@ void GridComponent::timestep(coreTime time, const IOdata& inputs, const SolverMo void GridComponent::ioPartialDerivatives(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const IOlocs& /*inputLocs*/, const SolverMode& /*sMode*/) { @@ -1713,7 +1713,7 @@ void GridComponent::ioPartialDerivatives(const IOdata& /*inputs*/, void GridComponent::outputPartialDerivatives(const IOdata& /*inputs*/, const StateData& /*stateDataValue*/, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { /* assume the output is a state and compute accordingly*/ @@ -1795,7 +1795,7 @@ void GridComponent::algebraicUpdate(const IOdata& inputs, // NOLINTNEXTLINE(misc-no-recursion) void GridComponent::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -1824,7 +1824,7 @@ void GridComponent::rootTest(const IOdata& inputs, } // NOLINTNEXTLINE(misc-no-recursion) -void GridComponent::rootTrigger(coreTime time, +void GridComponent::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) @@ -2006,7 +2006,7 @@ void GridComponent::parameterPartialDerivatives(index_t param, double /*val*/, const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const SolverMode& /*sMode*/) { throw(UnrecognizedParameter("param" + std::to_string(param))); diff --git a/src/griddyn/GridComponent.h b/src/griddyn/GridComponent.h index bd7a4f80b..27dbaf26f 100644 --- a/src/griddyn/GridComponent.h +++ b/src/griddyn/GridComponent.h @@ -15,11 +15,11 @@ #include template -class matrixData; +class MatrixData; /** the primary namespace for the griddyn library*/ namespace griddyn { -// forward declare the template class matrixData +// forward declare the template class MatrixData class Violation; @@ -27,8 +27,8 @@ class Violation; * the basic object for creating a power system encapsulating some common functions and data that is *needed by all objects in the simulation and defining some common methods for use by all objects. *This object is not really intended to be instantiated directly and is mostly a common interface to - *inheriting objects @see gridPrimary, - *@see gridSecondary, and @see GridSubModel as it encapsulated common functionality between those + *inheriting objects @see GridPrimary, + *@see GridSecondary, and @see GridSubModel as it encapsulated common functionality between those *objects **/ class GridComponent: public CoreObject { @@ -73,7 +73,7 @@ class GridComponent: public CoreObject { @param[in] flags any flags indicating how the initialization or execution will take place @throw an error if something went wrong */ - virtual void pFlowInitializeA(coreTime time0, std::uint32_t flags); + virtual void pFlowInitializeA(CoreTime time0, std::uint32_t flags); /** @brief initialize object for power flow part B partB is to actually initialize the object so an initial guessState will be meaningful, many @@ -92,7 +92,7 @@ class GridComponent: public CoreObject { @param[in] time0 the time0 at which the power flow will take place @param[in] flags any flags indicating how the initialization or execution will take place */ - virtual void dynInitializeA(coreTime time0, std::uint32_t flags); + virtual void dynInitializeA(CoreTime time0, std::uint32_t flags); /** @brief initialize object for dynamic simulation part B partB is to actually initialize the object so an initial guessState will be meaningful, many @@ -110,7 +110,7 @@ class GridComponent: public CoreObject { @param[in] time0 the time0 at which the power flow will take place @param[in] flags any flags indicating how the initialization or execution will take place */ - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags); + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags); /** @brief initialize local object for power flow part B see GridComponent::pFlowInitializeB for more details @@ -121,7 +121,7 @@ see GridComponent::dynInitializeA for more details @param[in] time0 the time at which the power flow will take place @param[in] flags any flags indicating how the initialization or execution will take place */ - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags); + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags); /** @brief initialize local object for dynamics part B see GridComponent::dynInitializeB for more details @@ -434,7 +434,7 @@ see GridComponent::dynInitializeA for more details states with no corresponding time derivative @param sMode -- the SolverMode corresponding to the computed state. */ - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode); @@ -446,7 +446,7 @@ see GridComponent::dynInitializeA for more details @param sMode -- the SolverMode corresponding to the computed state. */ virtual void - guessState(coreTime time, double state[], double dstateDt[], const SolverMode& sMode); + guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode); /** @brief load tolerance information from the objects @param[out] tols -- a double array with the state tolerance information @param[in] sMode -- the SolverMode corresponding to the computed state. @@ -594,7 +594,7 @@ see GridComponent::dynInitializeA for more details **/ virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode); @@ -607,7 +607,7 @@ see GridComponent::dynInitializeA for more details @param[in] sMode the SolverMode to give guidance to objects on how to perform internal calculations */ - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode); + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode); /** *@brief compute the partial derivatives of the output states with respect to internal states @@ -618,7 +618,7 @@ see GridComponent::dynInitializeA for more details **/ virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode); /** @brief return the count of output dependencies on internal states @@ -637,7 +637,7 @@ see GridComponent::dynInitializeA for more details **/ virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode); @@ -675,7 +675,7 @@ see GridComponent::dynInitializeA for more details 1 in their root locations should actually trigger * @param[in] sMode the mode the solver is in **/ - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode); @@ -792,7 +792,7 @@ see GridComponent::dynInitializeA for more details double val, const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode); /** *@brief compute the partial derivatives of an outputs with respect to a parameter diff --git a/src/griddyn/GridComponentHelperClasses.h b/src/griddyn/GridComponentHelperClasses.h index 890f37c6a..1e98dafca 100644 --- a/src/griddyn/GridComponentHelperClasses.h +++ b/src/griddyn/GridComponentHelperClasses.h @@ -416,7 +416,7 @@ class SolverOffsets { */ class Lp { public: - coreTime time = timeZero; //!< time + CoreTime time = timeZero; //!< time count_t algOffset = kNullLocation; //!< data offset for algebraic components count_t diffOffset = kNullLocation; //!< data offset for differential components const double* algStateLoc = nullptr; //!< location of algebraic state variables @@ -432,7 +432,7 @@ class Lp { */ class StateData { public: - coreTime time = 0.0; //!< time corresponding to the state data + CoreTime time = 0.0; //!< time corresponding to the state data count_t seqID = 0; //!< a sequence id to differentiate between subsequent state data objects index_t stateSize = 0; //!< the size of the state vector, if at zero the information is //!< presumed to come from another source @@ -452,10 +452,10 @@ class StateData { double* scratch2 = nullptr; //!< scratch space the objects can use for calculations (if not null it should be //! the same size as state - coreTime altTime = 0.0; //!< the time corresponding to the other part of the state + CoreTime altTime = 0.0; //!< the time corresponding to the other part of the state index_t pairIndex = kNullLocation; //!< the index of the mode the paired data comes from - StateData(coreTime sTime = 0.0, + StateData(CoreTime sTime = 0.0, const double* sstate = nullptr, const double* ndstate_dt = nullptr, count_t cseq = 0): time(sTime), seqID(cseq), state(sstate), dstate_dt(ndstate_dt) diff --git a/src/griddyn/GridDynGovernor.h b/src/griddyn/GridDynGovernor.h index 91e1f41a4..6382c29ac 100644 --- a/src/griddyn/GridDynGovernor.h +++ b/src/griddyn/GridDynGovernor.h @@ -52,7 +52,7 @@ class Governor: public GridSubModel { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; /** @brief destructor*/ virtual ~Governor(); - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -75,10 +75,10 @@ class Governor: public GridSubModel { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& sD, @@ -86,7 +86,7 @@ class Governor: public GridSubModel { const SolverMode& sMode) override; protected: - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn diff --git a/src/griddyn/GridDynSimulation.h b/src/griddyn/GridDynSimulation.h index e263f191b..d2bfe6f10 100644 --- a/src/griddyn/GridDynSimulation.h +++ b/src/griddyn/GridDynSimulation.h @@ -84,7 +84,7 @@ struct tolerances { double defaultTolerance = 1e-8; //!< default tolerance on all other variables double toleranceRelaxationFactor = 1.0; //!< relax the tolerances to help the solver double rtol = 1e-6; //!< the relative tolerance - coreTime timeTol = + CoreTime timeTol = kSmallTime; //!< the allowable time slop in events. The time span below which the system //! doesn't really care about }; @@ -154,9 +154,9 @@ class GridDynSimulation: public GridSimulation { count_t busCount = 0; //!< counter for the number of buses count_t linkCount = 0; //!< counter for the number of links count_t networkCount{0}; //!< number of islanded networks in the simulation - coreTime probeStepTime = coreTime(1e-3); //!< initial step size + CoreTime probeStepTime = CoreTime(1e-3); //!< initial step size double powerAdjustThreshold = 0.01; //!< tolerance on the power adjust step - coreTime powerFlowStartTime = + CoreTime powerFlowStartTime = negTime; //!< power flow start time if negTime then it computes based on start time; struct tolerances tols; //!< structure of the tolerances @@ -257,23 +257,23 @@ class GridDynSimulation: public GridSimulation { /**@brief run the simulation until the specified time @param[in] tEnd the simulation time to stop defaults to the time given in system parameters @return int indicating success (0) or failure (non-zero)*/ - int run(coreTime tEnd = negTime) override; + int run(CoreTime tEnd = negTime) override; /**@brief initialize the simulation for power flow at the specified time @param[in] time0 the time of the initialization default to 0 @return int indicating success (0) or failure (non-zero)*/ - int pFlowInitialize(coreTime time0 = negTime); + int pFlowInitialize(CoreTime time0 = negTime); /**@brief step the simulation until the next event or stop point @param[in] nextStep the maximum time to stop @param[out] timeActual the actual time that was achieved @return int indicating success (0) or failure (non-zero)*/ - int step(coreTime nextStep, coreTime& timeActual); + int step(CoreTime nextStep, CoreTime& timeActual); /**@brief step the simulation until the next event or stop point @param[out] timeActual the actual time that was achieved @return int indicating success (0) or failure (non-zero)*/ - int step(coreTime& timeActual) { return step(getSimulationTime() + stepTime, timeActual); } + int step(CoreTime& timeActual) { return step(getSimulationTime() + stepTime, timeActual); } /**@brief step the simulation until the next event or stop point @return int indicating success (0) or failure (non-zero)*/ @@ -284,7 +284,7 @@ class GridDynSimulation: public GridSimulation { @param[in] t_end the stopping time for the simulation @param[in] t_step the step size (the maximum time between powerFlow evaluation is t_step @return int indicating success (0) or failure (non-zero)*/ - virtual int eventDrivenPowerflow(coreTime t_end = negTime, coreTime t_step = negTime); + virtual int eventDrivenPowerflow(CoreTime t_end = negTime, CoreTime t_step = negTime); /** @brief execute a specific command *@param[in] cmd the command to execute @@ -327,7 +327,7 @@ class GridDynSimulation: public GridSimulation { /**@brief initialize the simulation for dynamic simulation at the specified time @param[in] tStart the time of the initialization default to 0 @return int indicating success (0) or failure (non-zero)*/ - int dynInitialize(coreTime tStart = negTime); // code can detect this default param and use a + int dynInitialize(CoreTime tStart = negTime); // code can detect this default param and use a // previously specified start time void alert(CoreObject* object, int code) override; @@ -353,7 +353,7 @@ class GridDynSimulation: public GridSimulation { @param[in] sMode the SolverMode to solve for @return integer indicating success (0) or failure (non-zero) */ - int residualFunction(coreTime time, + int residualFunction(CoreTime time, const double state[], const double dstate_dt[], double resid[], @@ -366,7 +366,7 @@ class GridDynSimulation: public GridSimulation { @param[in] sMode the SolverMode to solve for @return integer indicating success (0) or failure (non-zero) */ - int derivativeFunction(coreTime time, + int derivativeFunction(CoreTime time, const double state[], double dstate_dt[], const SolverMode& sMode) noexcept; @@ -380,7 +380,7 @@ class GridDynSimulation: public GridSimulation { @param[in] alpha a multiplication factor for updates that are expected to be iterative @return integer indicating success (0) or failure (non-zero) */ - int algUpdateFunction(coreTime time, + int algUpdateFunction(CoreTime time, const double state[], double update[], const SolverMode& sMode, @@ -391,15 +391,15 @@ class GridDynSimulation: public GridSimulation { @param[in] time the simulation time of the evaluation @param[in] state the state information to evaluation @param[in] dstate_dt the time derivative of the state - @param[out] matrixDataRef the matrixData object to store the Jacobian information into + @param[out] matrixDataRef the MatrixData object to store the Jacobian information into @param[in] cjValue the constant of integration for use in Jacobian elements using derivatives @param[in] sMode the SolverMode to solve for @return integer indicating success (0) or failure (non-zero) */ - int jacobianFunction(coreTime time, + int jacobianFunction(CoreTime time, const double state[], const double dstate_dt[], - matrixData& matrixDataRef, + MatrixData& matrixDataRef, double cjValue, const SolverMode& sMode) noexcept; @@ -412,7 +412,7 @@ class GridDynSimulation: public GridSimulation { @param[in] sMode the SolverMode to solve for @return integer indicating success (0) or failure (non-zero) */ - int rootFindingFunction(coreTime time, + int rootFindingFunction(CoreTime time, const double state[], const double dstate_dt[], double roots[], @@ -424,17 +424,17 @@ class GridDynSimulation: public GridSimulation { @param[in] values the values for the parameters @param[in] state the state information to evaluation @param[in] dstateDt the time derivative of the state - @param[out] matrixDataRef the matrixData object to store the partial derivatives + @param[out] matrixDataRef the MatrixData object to store the partial derivatives @param[in] sMode the SolverMode to use for the computations */ - void parameterDerivatives(coreTime time, + void parameterDerivatives(CoreTime time, ParameterSet& parameterOperators, const index_t indices[], const double values[], count_t parameterCount, const double state[], const double dstateDt[], - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode); /** @brief solve for the algebraic components of a system for use with the ode solvers @@ -444,7 +444,7 @@ class GridDynSimulation: public GridSimulation { @param[in] sMode the SolverMode to solve related to the differential state information @return integer indicating success (0) or failure (non-zero) */ - int dynAlgebraicSolve(coreTime time, + int dynAlgebraicSolve(CoreTime time, const double diffState[], const double deriv[], const SolverMode& sMode) noexcept; @@ -648,21 +648,21 @@ class GridDynSimulation: public GridSimulation { @param[in] tStop the stop time for the simulation @return FUNCTION_EXECUTION_SUCCESS(0) if successful negative number if not */ - virtual int dynamicDAE(coreTime tStop); + virtual int dynamicDAE(CoreTime tStop); /** @brief execute a partitioned dynamic simulation @param[in] tStop the stop time for the simulation @param[in] tStep the step interval (defaults to the step size parameter stored in the simulation @return FUNCTION_EXECUTION_SUCCESS(0) if successful negative number if not */ - virtual int dynamicPartitioned(coreTime tStop, coreTime tStep = negTime); + virtual int dynamicPartitioned(CoreTime tStop, CoreTime tStep = negTime); /** @brief execute a decoupled dynamic simulation @param[in] tStop the stop time for the simulation @param[in] tStep the step interval (defaults to the step size parameter stored in the simulation @return FUNCTION_EXECUTION_SUCCESS(0) if successful negative number if not */ - virtual int dynamicDecoupled(coreTime tStop, coreTime tStep = negTime); + virtual int dynamicDecoupled(CoreTime tStop, CoreTime tStep = negTime); /** @brief ensure that the simulation has consistent initial conditions for starting a dynamic simulation @@ -691,7 +691,7 @@ class GridDynSimulation: public GridSimulation { @param[in] dynData the SolverInterface currently in use */ void handleEarlySolverReturn(int retval, - coreTime timeActual, + CoreTime timeActual, std::shared_ptr& dynData); /** @brief reset the dynamic simulation @@ -715,7 +715,7 @@ class GridDynSimulation: public GridSimulation { @param[in] sMode the SolverMode to run @return true if the reset Function was run and did something */ - bool checkEventsForDynamicReset(coreTime cTime, const SolverMode& sMode); + bool checkEventsForDynamicReset(CoreTime cTime, const SolverMode& sMode); private: void setupDynamicDAE(); @@ -728,8 +728,8 @@ class GridDynSimulation: public GridSimulation { const SolverMode& sModeDiff, const SolverMode& sModeAlg); int runDynamicSolverStep(std::shared_ptr& dynData, - coreTime nextStop, - coreTime& timeActual); + CoreTime nextStop, + CoreTime& timeActual); static std::atomic s_instance; //!< static variable to set the master simulation instance diff --git a/src/griddyn/GridPrimary.cpp b/src/griddyn/GridPrimary.cpp index c0df7d95c..f23126299 100644 --- a/src/griddyn/GridPrimary.cpp +++ b/src/griddyn/GridPrimary.cpp @@ -25,7 +25,7 @@ CoreObject* GridPrimary::clone(CoreObject* obj) const return nobj; } -void GridPrimary::pFlowInitializeA(coreTime time0, std::uint32_t flags) +void GridPrimary::pFlowInitializeA(CoreTime time0, std::uint32_t flags) { GridComponent::pFlowInitializeA(time0, flags); } @@ -34,7 +34,7 @@ void GridPrimary::pFlowInitializeB() { GridComponent::pFlowInitializeB(); } -void GridPrimary::dynInitializeA(coreTime time0, std::uint32_t flags) +void GridPrimary::dynInitializeA(CoreTime time0, std::uint32_t flags) { GridComponent::dynInitializeA(time0, flags); } @@ -70,7 +70,7 @@ double GridPrimary::get(std::string_view param, units::unit unitType) const return GridComponent::get(param, unitType); } -void GridPrimary::converge(coreTime /*time*/, +void GridPrimary::converge(CoreTime /*time*/, double /*state*/[], double /*dstateDt*/[], const SolverMode& /*sMode*/, @@ -79,7 +79,7 @@ void GridPrimary::converge(coreTime /*time*/, { } -void GridPrimary::setState(coreTime time, +void GridPrimary::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -116,7 +116,7 @@ void GridPrimary::delayedAlgebraicUpdate(const IOdata& inputs, void GridPrimary::delayedJacobian(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/GridPrimary.h b/src/griddyn/GridPrimary.h index 972f1227a..c556711c6 100644 --- a/src/griddyn/GridPrimary.h +++ b/src/griddyn/GridPrimary.h @@ -49,11 +49,11 @@ class GridPrimary: public GridComponent { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowInitializeA(coreTime time0, std::uint32_t flags) override final; + virtual void pFlowInitializeA(CoreTime time0, std::uint32_t flags) override final; virtual void pFlowInitializeB() override final; - virtual void dynInitializeA(coreTime time0, std::uint32_t flags) override final; + virtual void dynInitializeA(CoreTime time0, std::uint32_t flags) override final; virtual void dynInitializeB(const IOdata& inputs, const IOdata& desiredOutput, @@ -68,7 +68,7 @@ class GridPrimary: public GridComponent { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; @@ -109,12 +109,12 @@ class GridPrimary: public GridComponent { /** @brief get the residual computation for object requiring a delay basically calls the Jacobian calculation on the delayed objects @param[in] stateDataValue the data representing the current state to operate on - @param[out] matrixDataValue the matrixData structure to store the Jacobian values + @param[out] matrixDataValue the MatrixData structure to store the Jacobian values @param[in] sMode the SolverMode which is being solved for */ virtual void delayedJacobian(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode); @@ -130,7 +130,7 @@ class GridPrimary: public GridComponent { @param[in] mode the mode of the convergence @param[in] tol the convergence tolerance */ - virtual void converge(coreTime time, + virtual void converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, diff --git a/src/griddyn/GridSecondary.cpp b/src/griddyn/GridSecondary.cpp index 07a622e36..71b624693 100644 --- a/src/griddyn/GridSecondary.cpp +++ b/src/griddyn/GridSecondary.cpp @@ -42,15 +42,15 @@ namespace { } } // namespace -gridSecondary::gridSecondary(const std::string& objName): GridComponent(objName), bus(&defaultBus()) +GridSecondary::GridSecondary(const std::string& objName): GridComponent(objName), bus(&defaultBus()) { m_outputSize = 2; m_inputSize = 3; } -CoreObject* gridSecondary::clone(CoreObject* obj) const +CoreObject* GridSecondary::clone(CoreObject* obj) const { - auto* nobj = cloneBase(this, obj); + auto* nobj = cloneBase(this, obj); if (nobj == nullptr) { return obj; } @@ -59,7 +59,7 @@ CoreObject* gridSecondary::clone(CoreObject* obj) const return nobj; } -void gridSecondary::updateObjectLinkages(CoreObject* newRoot) +void GridSecondary::updateObjectLinkages(CoreObject* newRoot) { if (opFlags[pFlow_initialized]) { auto* matchedObject = findMatchingObject(bus, newRoot); @@ -70,7 +70,7 @@ void gridSecondary::updateObjectLinkages(CoreObject* newRoot) GridComponent::updateObjectLinkages(newRoot); } -void gridSecondary::pFlowInitializeA(coreTime time0, std::uint32_t flags) +void GridSecondary::pFlowInitializeA(CoreTime time0, std::uint32_t flags) { bus = static_cast(getParent()->find("bus")); if (bus == nullptr) { @@ -79,16 +79,16 @@ void gridSecondary::pFlowInitializeA(coreTime time0, std::uint32_t flags) GridComponent::pFlowInitializeA(time0, flags); } -void gridSecondary::pFlowInitializeB() +void GridSecondary::pFlowInitializeB() { GridComponent::pFlowInitializeB(); } -void gridSecondary::dynInitializeA(coreTime time0, std::uint32_t flags) +void GridSecondary::dynInitializeA(CoreTime time0, std::uint32_t flags) { GridComponent::dynInitializeA(time0, flags); } -void gridSecondary::dynInitializeB(const IOdata& inputs, +void GridSecondary::dynInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) { @@ -107,7 +107,7 @@ void gridSecondary::dynInitializeB(const IOdata& inputs, } } -void gridSecondary::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridSecondary::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (!getSubObjects().empty()) { for (const auto& subobj : getSubObjects()) { @@ -127,48 +127,48 @@ void gridSecondary::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) prevTime = time0; } -void gridSecondary::set(std::string_view param, std::string_view val) +void GridSecondary::set(std::string_view param, std::string_view val) { GridComponent::set(param, val); } -void gridSecondary::set(std::string_view param, double val, units::unit unitType) +void GridSecondary::set(std::string_view param, double val, units::unit unitType) { if (!param.empty()) { GridComponent::set(param, val, unitType); } } -double gridSecondary::getRealPower(const IOdata& /*inputs*/, +double GridSecondary::getRealPower(const IOdata& /*inputs*/, const StateData& /*stateDataValue*/, const SolverMode& /*sMode*/) const { return 0.0; } -double gridSecondary::getReactivePower(const IOdata& /*inputs*/, +double GridSecondary::getReactivePower(const IOdata& /*inputs*/, const StateData& /*stateDataValue*/, const SolverMode& /*sMode*/) const { return 0.0; } -double gridSecondary::getRealPower() const +double GridSecondary::getRealPower() const { return 0.0; } -double gridSecondary::getReactivePower() const +double GridSecondary::getReactivePower() const { return 0.0; } -double gridSecondary::getAdjustableCapacityUp(coreTime /*time*/) const +double GridSecondary::getAdjustableCapacityUp(CoreTime /*time*/) const { return 0.0; } -double gridSecondary::getAdjustableCapacityDown(coreTime /*time*/) const +double GridSecondary::getAdjustableCapacityDown(CoreTime /*time*/) const { return 0.0; } -double gridSecondary::getDoutdt(const IOdata& /*inputs*/, +double GridSecondary::getDoutdt(const IOdata& /*inputs*/, const StateData& /*stateDataValue*/, const SolverMode& /*sMode*/, index_t /*outputNum*/) const @@ -176,7 +176,7 @@ double gridSecondary::getDoutdt(const IOdata& /*inputs*/, return 0.0; } -double gridSecondary::getOutput(const IOdata& inputs, +double GridSecondary::getOutput(const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode, index_t outputNum) const @@ -190,7 +190,7 @@ double gridSecondary::getOutput(const IOdata& inputs, return kNullVal; } -double gridSecondary::getOutput(index_t outputNum) const +double GridSecondary::getOutput(index_t outputNum) const { if (outputNum == PoutLocation) { return getRealPower(); @@ -201,7 +201,7 @@ double gridSecondary::getOutput(index_t outputNum) const return kNullVal; } -IOdata gridSecondary::getOutputs(const IOdata& inputs, +IOdata GridSecondary::getOutputs(const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode) const { @@ -211,7 +211,7 @@ IOdata gridSecondary::getOutputs(const IOdata& inputs, return out; } -IOdata gridSecondary::predictOutputs(coreTime /*predictionTime*/, +IOdata GridSecondary::predictOutputs(CoreTime /*predictionTime*/, const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode) const @@ -222,17 +222,17 @@ IOdata gridSecondary::predictOutputs(coreTime /*predictionTime*/, return out; } -const std::vector& gridSecondary::inputNames() const +const std::vector& GridSecondary::inputNames() const { return secondaryInputNames(); } -const std::vector& gridSecondary::outputNames() const +const std::vector& GridSecondary::outputNames() const { return secondaryOutputNames(); } -units::unit gridSecondary::inputUnits(index_t inputNum) const +units::unit GridSecondary::inputUnits(index_t inputNum) const { switch (inputNum) { case voltageInLocation: @@ -246,7 +246,7 @@ units::unit gridSecondary::inputUnits(index_t inputNum) const } } -units::unit gridSecondary::outputUnits(index_t outputNum) const +units::unit GridSecondary::outputUnits(index_t outputNum) const { switch (outputNum) { case PoutLocation: diff --git a/src/griddyn/GridSecondary.h b/src/griddyn/GridSecondary.h index 56897e7bf..382109512 100644 --- a/src/griddyn/GridSecondary.h +++ b/src/griddyn/GridSecondary.h @@ -14,32 +14,32 @@ namespace griddyn { class GridBus; /** @brief base class for objects that can attach to a bus like GridLoad and Generator - * gridSecondary class defines the interface for secondary objects which are nominally objects that + * GridSecondary class defines the interface for secondary objects which are nominally objects that *hang directly off a bus **/ -class gridSecondary: public GridComponent { +class GridSecondary: public GridComponent { protected: GridBus* bus = nullptr; //!< reference to the bus connecting the object; public: /** @brief default constructor*/ - explicit gridSecondary(const std::string& objName = ""); + explicit GridSecondary(const std::string& objName = ""); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; virtual void updateObjectLinkages(CoreObject* newRoot) override; - virtual void pFlowInitializeA(coreTime time0, std::uint32_t flags) override final; + virtual void pFlowInitializeA(CoreTime time0, std::uint32_t flags) override final; virtual void pFlowInitializeB() override final; - virtual void dynInitializeA(coreTime time0, std::uint32_t flags) override final; + virtual void dynInitializeA(CoreTime time0, std::uint32_t flags) override final; virtual void dynInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override final; protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; public: virtual void set(std::string_view param, std::string_view val) override; @@ -138,7 +138,7 @@ class gridSecondary: public GridComponent { * @param[in] sMode the mode the solver is in @return a vector containing all the predicted outputs **/ - virtual IOdata predictOutputs(coreTime predictionTime, + virtual IOdata predictOutputs(CoreTime predictionTime, const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode) const; @@ -146,16 +146,16 @@ class gridSecondary: public GridComponent { /** *@brief get the available upwards generating capacity of a system @param[in] time the time period within which to do the adjustment - @return the available up capacity of the gridSecondary unit + @return the available up capacity of the GridSecondary unit **/ - virtual double getAdjustableCapacityUp(coreTime time = maxTime) const; + virtual double getAdjustableCapacityUp(CoreTime time = maxTime) const; /** *@brief get the available downwards generating capacity of a system @param[in] time the time period within which to do the adjustment - @return the available up capacity of the gridSecondary unit + @return the available up capacity of the GridSecondary unit **/ - virtual double getAdjustableCapacityDown(coreTime time = maxTime) const; + virtual double getAdjustableCapacityDown(CoreTime time = maxTime) const; virtual const std::vector& inputNames() const override; virtual const std::vector& outputNames() const override; diff --git a/src/griddyn/GridSubModel.cpp b/src/griddyn/GridSubModel.cpp index 912ea603e..9bca47c67 100644 --- a/src/griddyn/GridSubModel.cpp +++ b/src/griddyn/GridSubModel.cpp @@ -16,7 +16,7 @@ GridSubModel::GridSubModel(const std::string& objName): GridComponent(objName) m_outputSize = 1; } -void GridSubModel::pFlowInitializeA(coreTime time, std::uint32_t flags) +void GridSubModel::pFlowInitializeA(CoreTime time, std::uint32_t flags) { GridComponent::pFlowInitializeA(time, flags); } @@ -25,7 +25,7 @@ void GridSubModel::pFlowInitializeB() { GridComponent::pFlowInitializeB(); } -void GridSubModel::dynInitializeA(coreTime time, std::uint32_t flags) +void GridSubModel::dynInitializeA(CoreTime time, std::uint32_t flags) { if (isEnabled()) { dynObjectInitializeA(time, flags); diff --git a/src/griddyn/GridSubModel.h b/src/griddyn/GridSubModel.h index ee78b3e22..d2f52971d 100644 --- a/src/griddyn/GridSubModel.h +++ b/src/griddyn/GridSubModel.h @@ -13,7 +13,7 @@ namespace griddyn { /** @brief base class for any model can act as a component of another model * GridSubModel class defines the interface for models which can act as components of other models such as Exciter, or Governor most of the differential equations are contained in submodels. The -interface is meant to be flexible so unlike gridSecondary models there is no predefined interface, +interface is meant to be flexible so unlike GridSecondary models there is no predefined interface, but at the same time many of the function calls are intended to be the same, The main difference being there is only one initialize function, they can operate in power flow but those objects just call initialize twice @@ -26,11 +26,11 @@ class GridSubModel: public GridComponent { /** @brief default constructor*/ explicit GridSubModel(const std::string& objName = "submodel_#"); - virtual void pFlowInitializeA(coreTime time, std::uint32_t flags) override final; + virtual void pFlowInitializeA(CoreTime time, std::uint32_t flags) override final; virtual void pFlowInitializeB() override final; - virtual void dynInitializeA(coreTime time, std::uint32_t flags) override final; + virtual void dynInitializeA(CoreTime time, std::uint32_t flags) override final; virtual void dynInitializeB(const IOdata& inputs, const IOdata& desiredOutput, diff --git a/src/griddyn/Link.h b/src/griddyn/Link.h index 5261958d4..87fdf23e9 100644 --- a/src/griddyn/Link.h +++ b/src/griddyn/Link.h @@ -164,12 +164,12 @@ class Link: public GridPrimary { /** @brief check for any violations of link limits or other factors based on power flow results checks things like the maximum angle, power flow /current limits based on ratings and a few other things - @param[out] Violation_vector --a list of all the violations any new violations get added to the + @param[out] violationVector --a list of all the violations any new violations get added to the result */ virtual void pFlowCheck(std::vector& violationVector) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** @brief do a quick update (may be deprecated) * @return the power transfer */ @@ -244,13 +244,13 @@ class Link: public GridPrimary { */ virtual double getImagCurrent(id_type_t busId = 0) const; /** @brief get the real power at a particular bus - this function is to allow a link to act similarly to a gridSecondary + this function is to allow a link to act similarly to a GridSecondary @param[in] busId either 1 or 2 or the object id of the bus * @return the real Power */ virtual double getRealPower(id_type_t busId = 0) const; /** @brief get the real power at a particular bus - this function is to allow a link to act similarly to a gridSecondary + this function is to allow a link to act similarly to a GridSecondary @param[in] busId either 1 or 2 or the object id of the bus * @return the real Power */ @@ -289,7 +289,7 @@ class Link: public GridPrimary { virtual bool testAndTrip(int tripLevel); // dynInitializeB power flow protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; public: /** @brief check if two buses should be merged and the line effects ignored @@ -297,28 +297,28 @@ class Link: public GridPrimary { virtual void checkMerge() {} // dynInitializeB dynamics protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; public: // for computing all the Jacobian elements at once using GridComponent::ioPartialDerivatives; virtual void ioPartialDerivatives(id_type_t busId, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode); using GridComponent::outputPartialDerivatives; virtual void outputPartialDerivatives(id_type_t busId, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode); virtual IOdata getOutputs(const IOdata& inputs, const StateData& stateData, const SolverMode& sMode) const override; virtual IOdata getOutputs(id_type_t busId, const StateData& sD, const SolverMode& sMode) const; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; diff --git a/src/griddyn/Load.h b/src/griddyn/Load.h index 2d296c567..0a5c29c76 100644 --- a/src/griddyn/Load.h +++ b/src/griddyn/Load.h @@ -14,7 +14,7 @@ class GridBus; /** primary load class defines the load component is a very simple constant power load */ -class GridLoad: public gridSecondary { +class GridLoad: public GridSecondary { public: /** flags used in the load object*/ enum LoadFlags { diff --git a/src/griddyn/NumericEstimationFunctions.cpp b/src/griddyn/NumericEstimationFunctions.cpp index 4af817207..dc7636617 100644 --- a/src/griddyn/NumericEstimationFunctions.cpp +++ b/src/griddyn/NumericEstimationFunctions.cpp @@ -7,7 +7,7 @@ #include "NumericEstimationFunctions.h" #include "GridComponent.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include namespace griddyn { @@ -15,7 +15,7 @@ namespace griddyn { void numericJacobianCalculation(GridComponent* /* comp */, const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& /*inputLocs*/, const SolverMode& /*sMode*/) { diff --git a/src/griddyn/NumericEstimationFunctions.h b/src/griddyn/NumericEstimationFunctions.h index 8a6d5bb75..0167f3411 100644 --- a/src/griddyn/NumericEstimationFunctions.h +++ b/src/griddyn/NumericEstimationFunctions.h @@ -10,7 +10,7 @@ #include template -class matrixData; +class MatrixData; namespace griddyn { class GridComponent; @@ -33,7 +33,7 @@ given object void numericJacobianCalculation(GridComponent* comp, const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode); diff --git a/src/griddyn/Relay.h b/src/griddyn/Relay.h index 4b42d33eb..24d7b21e1 100644 --- a/src/griddyn/Relay.h +++ b/src/griddyn/Relay.h @@ -86,7 +86,7 @@ class Relay: public GridPrimary, ObjectOperatorInterface { object_flag5, //!< just defining an extra name for additional relay flags }; - coreTime triggerTime = maxTime; //!< the next time execute + CoreTime triggerTime = maxTime; //!< the next time execute CoreObject* m_sourceObject = nullptr; //!< the default object where the data comes from CoreObject* m_sinkObject = nullptr; //!< the default object where the actions occur std::uint16_t triggerCount = 0; //!< count of the number of triggers @@ -99,7 +99,7 @@ class Relay: public GridPrimary, ObjectOperatorInterface { std::shared_ptr commLink; //!< communicator link - coreTime m_nextSampleTime = maxTime; //!< the next time to sample the conditions + CoreTime m_nextSampleTime = maxTime; //!< the next time to sample the conditions public: explicit Relay(const std::string& objName = "relay_$"); @@ -218,7 +218,7 @@ class Relay: public GridPrimary, ObjectOperatorInterface { */ virtual void setActionTrigger(index_t actionNumber, index_t conditionNumber, - coreTime delayTime = timeZero); + CoreTime delayTime = timeZero); /** manually trigger a particular action @param[in] actionNumber the index of the action to manually trigger @return a ChangeCode associated with the action describing the level of change to the system @@ -235,7 +235,7 @@ class Relay: public GridPrimary, ObjectOperatorInterface { */ virtual void setActionMultiTrigger(index_t actionNumber, const IOlocs& multiConditions, - coreTime delayTime = timeZero); + CoreTime delayTime = timeZero); /** define the margin by which a resettable condition must be on the other side of reset level to actually reset @@ -253,16 +253,16 @@ class Relay: public GridPrimary, ObjectOperatorInterface { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void updateA(coreTime time) override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void updateA(CoreTime time) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual ChangeCode powerFlowAdjust(const IOdata& inputs, std::uint32_t flags, CheckLevel level) override; virtual void rootTest(const IOdata& inputs, const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -309,17 +309,17 @@ class Relay: public GridPrimary, ObjectOperatorInterface { virtual void actionTaken(index_t actionNum, index_t conditionNum, ChangeCode actionReturn, - coreTime actionTime); + CoreTime actionTime); /** do something when an condition is triggered @param conditionNum the index of the condition that triggered the action @param timeTriggered the time at which the condition was triggered */ - virtual void conditionTriggered(index_t conditionNum, coreTime timeTriggered); + virtual void conditionTriggered(index_t conditionNum, CoreTime timeTriggered); /** do something when an condition is cleared @param conditionNum the index of the condition that triggered the action @param timeCleared the time at which the condition was cleared */ - virtual void conditionCleared(index_t conditionNum, coreTime timeCleared); + virtual void conditionCleared(index_t conditionNum, CoreTime timeCleared); /** generate the commlink name*/ virtual std::string generateCommName(); @@ -330,7 +330,7 @@ class Relay: public GridPrimary, ObjectOperatorInterface { public: index_t conditionNum; //!< the condition Number index_t actionNum; //!< the action number - coreTime testTime; //!< the time the test should be performed + CoreTime testTime; //!< the time the test should be performed bool multiCondition = false; //!< flag if the condition is part of a multiCondition /** @brief constructor with all the data @@ -341,7 +341,7 @@ class Relay: public GridPrimary, ObjectOperatorInterface { */ condCheckTime(index_t cNum = 0, index_t aNum = 0, - coreTime time = maxTime, + CoreTime time = maxTime, bool mcond = false): conditionNum(cNum), actionNum(aNum), testTime(time), multiCondition(mcond) { @@ -352,11 +352,11 @@ class Relay: public GridPrimary, ObjectOperatorInterface { public: index_t actionNum = kInvalidLocation; //!< the related ActionNumber IOlocs multiConditions; //!< identification of all the conditions involved - coreTime delayTime = + CoreTime delayTime = timeZero; //!< the delay time all conditions must be true before the action is taken //!< TODO:PT account for this delay mcondTrig() = default; - mcondTrig(index_t actNum, const IOlocs& conds, coreTime delTime = timeZero): + mcondTrig(index_t actNum, const IOlocs& conds, CoreTime delTime = timeZero): actionNum(actNum), multiConditions(conds), delayTime(delTime) { } @@ -368,11 +368,11 @@ class Relay: public GridPrimary, ObjectOperatorInterface { std::vector> actions; //!< actions to take in response to triggers std::vector> actionTriggers; //!< the conditions that cause actions - std::vector> + std::vector> actionDelays; //!< the periods of time in which the condition must be true for an action to //!< occur std::vector cStates; //!< a vector of states for the conditions - std::vector conditionTriggerTimes; //!< the times at which the condition triggered + std::vector conditionTriggerTimes; //!< the times at which the condition triggered std::vector condChecks; //!< a vector of condition action pairs that are in wait and see mode std::vector> @@ -391,15 +391,15 @@ class Relay: public GridPrimary, ObjectOperatorInterface { @param[in] actionTime the time which to execute the action @return a ChangeCode indicating the effect of the action */ - ChangeCode executeAction(index_t actionNumber, index_t conditionNumber, coreTime actionTime); + ChangeCode executeAction(index_t actionNumber, index_t conditionNumber, CoreTime actionTime); /** trigger a specific condition @param[in] conditionNum the index of the condition to trigger @param[in] conditionTriggerTime the time of the trigger @param[in] minimumDelayTime ignore all trigger delays below the minimumDelayTime */ ChangeCode triggerCondition(index_t conditionNum, - coreTime conditionTriggerTime, - coreTime minimumDelayTime); + CoreTime conditionTriggerTime, + CoreTime minimumDelayTime); /** check and if all conditions hold execute a multi-condition trigger @param[in] conditionNum the index of the condition that was just triggered that might also @@ -408,14 +408,14 @@ class Relay: public GridPrimary, ObjectOperatorInterface { @param[in] minimumDelayTime ignore all trigger delays below the minimumDelayTime */ ChangeCode multiConditionCheckExecute(index_t conditionNum, - coreTime conditionTriggerTime, - coreTime minimumDelayTime); + CoreTime conditionTriggerTime, + CoreTime minimumDelayTime); /** evaluate a condition awaiting a delay and execute the action if appropriate @param[in] cond the condition to check @param[in] checkTime the time to check @return a change code indicating the effect of any action Taken */ - ChangeCode evaluateCondCheck(condCheckTime& cond, coreTime checkTime); + ChangeCode evaluateCondCheck(condCheckTime& cond, CoreTime checkTime); }; } // namespace griddyn diff --git a/src/griddyn/Source.h b/src/griddyn/Source.h index 222ef740b..5217f0133 100644 --- a/src/griddyn/Source.h +++ b/src/griddyn/Source.h @@ -18,7 +18,7 @@ class Source: public GridSubModel { std::string purpose_; //!< string for use by applications to indicate usage protected: double m_tempOut = 0; //!< temporary output corresponding to desired time - coreTime lastTime = timeZero; //!< storage for the previously queried time + CoreTime lastTime = timeZero; //!< storage for the previously queried time units::unit outputUnits_ = units::defunit; //!< specify the units of the output public: /** constructor @@ -32,7 +32,7 @@ class Source: public GridSubModel { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual IOdata getOutputs(const IOdata& inputs, const StateData& sD, @@ -48,12 +48,12 @@ class Source: public GridSubModel { virtual units::unit outputUnits(index_t outputNum) const override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; /** update the output to correspond to a new time value*/ - virtual void updateOutput(coreTime time); + virtual void updateOutput(CoreTime time); virtual void updateLocalCache(const IOdata& inputs, const StateData& sD, const SolverMode& sMode) override; @@ -61,7 +61,7 @@ class Source: public GridSubModel { /** update the source output and advance the model time @param[in] time the time to update to */ - virtual double computeOutput(coreTime time) const; + virtual double computeOutput(CoreTime time) const; /** set the output level @param[in] newLevel the level to set the output at */ diff --git a/src/griddyn/Stabilizer.h b/src/griddyn/Stabilizer.h index 288aa81a9..1035fa06c 100644 --- a/src/griddyn/Stabilizer.h +++ b/src/griddyn/Stabilizer.h @@ -39,7 +39,7 @@ class Stabilizer: public GridSubModel { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; diff --git a/src/griddyn/blocks/Block.cpp b/src/griddyn/blocks/Block.cpp index 06843cd42..e928432a6 100644 --- a/src/griddyn/blocks/Block.cpp +++ b/src/griddyn/blocks/Block.cpp @@ -12,7 +12,7 @@ #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/string_viewConversion.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -71,7 +71,7 @@ CoreObject* GridBlock::clone(CoreObject* obj) const return nobj; } -void GridBlock::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GridBlock::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { auto& lcinfo = offsets.local(); lcinfo.reset(); @@ -266,14 +266,14 @@ void GridBlock::dynObjectInitializeB(const IOdata& inputs, } } -void GridBlock::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void GridBlock::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { step(time, inputs[0]); } static IOdata gKNullVec; -double GridBlock::step(coreTime time, double input) +double GridBlock::step(CoreTime time, double input) { if (!opFlags[useState]) { m_state[limiter_alg + limiter_diff] = (input + bias) * K; @@ -535,7 +535,7 @@ void GridBlock::derivative(const IOdata& inputs, void GridBlock::blockJacobianElements(double /*input*/, double /*didt*/, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& solverModeValue) { @@ -596,7 +596,7 @@ void GridBlock::blockJacobianElements(double /*input*/, void GridBlock::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& solverModeValue) { @@ -679,7 +679,7 @@ ChangeCode GridBlock::rootCheck(const IOdata& inputs, return ret; } -void GridBlock::rootTrigger(coreTime /*time*/, +void GridBlock::rootTrigger(CoreTime /*time*/, const IOdata& inputs, const std::vector& rootMask, const SolverMode& solverModeValue) diff --git a/src/griddyn/blocks/BlockSequence.cpp b/src/griddyn/blocks/BlockSequence.cpp index 232be77db..067946aa5 100644 --- a/src/griddyn/blocks/BlockSequence.cpp +++ b/src/griddyn/blocks/BlockSequence.cpp @@ -10,7 +10,7 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/stringConversion.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -31,7 +31,7 @@ CoreObject* BlockSequence::clone(CoreObject* obj) const return nobj; } -void BlockSequence::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void BlockSequence::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { bool diffInput = opFlags[DIFFERENTIAL_INPUT_ACTUAL]; if (sequence.empty()) { // create a default sequence with all the blocks @@ -127,14 +127,14 @@ void BlockSequence::updateLocalCache(const IOdata& /*inputs*/, seqID = stateData.seqID; } -double BlockSequence::step(coreTime time, double input) +double BlockSequence::step(CoreTime time, double input) { // compute a core sample time then cycle through all the objects at that // sampling rate input = input + bias; const double drate = (input - prevInput) / (time - prevTime); while (prevTime < time) { - const coreTime newTime = std::min(time, prevTime + sampleTime); + const CoreTime newTime = std::min(time, prevTime + sampleTime); double blockInput = prevInput + drate * (newTime - prevTime); for (auto& blkIn : sequence) { blockInput = blocks[blkIn]->step(newTime, blockInput); @@ -198,7 +198,7 @@ void BlockSequence::blockAlgebraicUpdate(double input, void BlockSequence::blockJacobianElements(double input, double didt, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, index_t argLoc, const SolverMode& sMode) { @@ -234,7 +234,7 @@ void BlockSequence::rootTest(const IOdata& inputs, GridBlock::rootTest(inAct, stateData, roots, sMode); } -void BlockSequence::rootTrigger(coreTime time, +void BlockSequence::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/blocks/BlockSequence.h b/src/griddyn/blocks/BlockSequence.h index 4a3b9f9db..c96a2dc02 100644 --- a/src/griddyn/blocks/BlockSequence.h +++ b/src/griddyn/blocks/BlockSequence.h @@ -37,7 +37,7 @@ class BlockSequence: public GridBlock { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -71,16 +71,16 @@ class BlockSequence: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double input) override; + virtual double step(CoreTime time, double input) override; virtual void rootTest(const IOdata& inputs, const StateData& stateData, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -88,7 +88,7 @@ class BlockSequence: public GridBlock { const StateData& stateData, const SolverMode& sMode, CheckLevel level) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; /** get the output of one of the component blocks *@param[in] blockNum the index of the block to the get the output of @return the output value of the requested block diff --git a/src/griddyn/blocks/ControlBlock.cpp b/src/griddyn/blocks/ControlBlock.cpp index b6df30c95..1487125d7 100644 --- a/src/griddyn/blocks/ControlBlock.cpp +++ b/src/griddyn/blocks/ControlBlock.cpp @@ -8,7 +8,7 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include namespace griddyn::blocks { @@ -40,7 +40,7 @@ CoreObject* ControlBlock::clone(CoreObject* obj) const return nobj; } // set up the number of states -void ControlBlock::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void ControlBlock::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (opFlags[differentialInput]) { opFlags.set(differential_output); @@ -113,7 +113,7 @@ void ControlBlock::blockDerivative(double input, void ControlBlock::blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) { @@ -147,7 +147,7 @@ void ControlBlock::blockJacobianElements(double input, } } -double ControlBlock::step(coreTime time, double input) +double ControlBlock::step(CoreTime time, double input) { const double timeDelta = time - prevTime; double out; diff --git a/src/griddyn/blocks/ControlBlock.h b/src/griddyn/blocks/ControlBlock.h index 4fa6c1321..3382869b4 100644 --- a/src/griddyn/blocks/ControlBlock.h +++ b/src/griddyn/blocks/ControlBlock.h @@ -39,7 +39,7 @@ class ControlBlock: public GridBlock { double upperTimeConstant, const std::string& objName = "controlBlock_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -62,11 +62,11 @@ class ControlBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double input) override; - // virtual void setTime(coreTime time){prevTime=time;}; + virtual double step(CoreTime time, double input) override; + // virtual void setTime(CoreTime time){prevTime=time;}; virtual stringVec localStateNames() const override; }; diff --git a/src/griddyn/blocks/DeadbandBlock.cpp b/src/griddyn/blocks/DeadbandBlock.cpp index a9f084288..128b28090 100644 --- a/src/griddyn/blocks/DeadbandBlock.cpp +++ b/src/griddyn/blocks/DeadbandBlock.cpp @@ -9,7 +9,7 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -41,7 +41,7 @@ CoreObject* DeadbandBlock::clone(CoreObject* obj) const return nobj; } -void DeadbandBlock::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void DeadbandBlock::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridBlock::dynObjectInitializeA(time0, flags); if (mDeadbandLow < mDeadbandHigh) // this means it was set to some value @@ -188,7 +188,7 @@ double DeadbandBlock::computeDoutDin(double input) const } return out; } -double DeadbandBlock::step(coreTime time, double input) +double DeadbandBlock::step(CoreTime time, double input) { rootCheck({input}, emptyStateData, cLocalSolverMode, CheckLevel::reversable_only); m_state[limiter_alg] = K * computeValue(input + bias); @@ -242,7 +242,7 @@ void DeadbandBlock::blockAlgebraicUpdate(double input, void DeadbandBlock::blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) { @@ -334,7 +334,7 @@ void DeadbandBlock::rootTest(const IOdata& inputs, } } -void DeadbandBlock::rootTrigger(coreTime time, +void DeadbandBlock::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/blocks/DeadbandBlock.h b/src/griddyn/blocks/DeadbandBlock.h index af7ccbb71..4189a857a 100644 --- a/src/griddyn/blocks/DeadbandBlock.h +++ b/src/griddyn/blocks/DeadbandBlock.h @@ -49,7 +49,7 @@ class DeadbandBlock: public GridBlock { */ DeadbandBlock(double deadbandWidth, const std::string& objName = "deadband_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -75,15 +75,15 @@ class DeadbandBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double input) override; + virtual double step(CoreTime time, double input) override; virtual void rootTest(const IOdata& inputs, const StateData& stateDataRef, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -105,7 +105,7 @@ class DeadbandBlock: public GridBlock { @return the computed derivative */ double computeDoutDin(double input) const; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn::blocks diff --git a/src/griddyn/blocks/DelayBlock.cpp b/src/griddyn/blocks/DelayBlock.cpp index 240f3c23f..0dfeda80e 100644 --- a/src/griddyn/blocks/DelayBlock.cpp +++ b/src/griddyn/blocks/DelayBlock.cpp @@ -8,7 +8,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::blocks { @@ -50,7 +50,7 @@ CoreObject* DelayBlock::clone(CoreObject* obj) const return nobj; } -void DelayBlock::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void DelayBlock::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if ((mT1 < kMin_Res) || (opFlags[simplifiedMode])) { opFlags.set(simplifiedMode); @@ -73,7 +73,7 @@ void DelayBlock::dynObjectInitializeB(const IOdata& inputs, } } -double DelayBlock::step(coreTime time, double inputA) +double DelayBlock::step(CoreTime time, double inputA) { if (opFlags[simplifiedMode]) { return GridBlock::step(time, inputA); @@ -135,7 +135,7 @@ void DelayBlock::blockDerivative(double input, void DelayBlock::blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) { diff --git a/src/griddyn/blocks/DelayBlock.h b/src/griddyn/blocks/DelayBlock.h index 158a395a6..7d34b225d 100644 --- a/src/griddyn/blocks/DelayBlock.h +++ b/src/griddyn/blocks/DelayBlock.h @@ -35,7 +35,7 @@ class DelayBlock: public GridBlock { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -55,11 +55,11 @@ class DelayBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double inputA) override; - // virtual void setTime(coreTime time){prevTime=time;}; + virtual double step(CoreTime time, double inputA) override; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn::blocks diff --git a/src/griddyn/blocks/DerivativeBlock.cpp b/src/griddyn/blocks/DerivativeBlock.cpp index f9c1b1437..70fae0202 100644 --- a/src/griddyn/blocks/DerivativeBlock.cpp +++ b/src/griddyn/blocks/DerivativeBlock.cpp @@ -9,7 +9,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactory.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include @@ -35,7 +35,7 @@ CoreObject* DerivativeBlock::clone(CoreObject* obj) const return nobj; } -void DerivativeBlock::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void DerivativeBlock::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridBlock::dynObjectInitializeA(time0, flags); offsets.local().local.diffSize++; @@ -62,7 +62,7 @@ void DerivativeBlock::dynObjectInitializeB(const IOdata& inputs, } } -double DerivativeBlock::step(coreTime time, double inputA) +double DerivativeBlock::step(CoreTime time, double inputA) { const index_t loc = limiter_alg; const double timeDelta = time - prevTime; @@ -135,7 +135,7 @@ void DerivativeBlock::blockDerivative(double input, void DerivativeBlock::blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) { diff --git a/src/griddyn/blocks/DerivativeBlock.h b/src/griddyn/blocks/DerivativeBlock.h index 345a314d8..96c1b0b98 100644 --- a/src/griddyn/blocks/DerivativeBlock.h +++ b/src/griddyn/blocks/DerivativeBlock.h @@ -27,7 +27,7 @@ class DerivativeBlock: public GridBlock { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -51,12 +51,12 @@ class DerivativeBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double inputA) override; + virtual double step(CoreTime time, double inputA) override; virtual stringVec localStateNames() const override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn::blocks diff --git a/src/griddyn/blocks/FilteredDerivativeBlock.cpp b/src/griddyn/blocks/FilteredDerivativeBlock.cpp index 3ab19af32..d03044fc3 100644 --- a/src/griddyn/blocks/FilteredDerivativeBlock.cpp +++ b/src/griddyn/blocks/FilteredDerivativeBlock.cpp @@ -9,7 +9,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactory.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -41,7 +41,7 @@ CoreObject* FilteredDerivativeBlock::clone(CoreObject* obj) const return nobj; } -void FilteredDerivativeBlock::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void FilteredDerivativeBlock::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridBlock::dynObjectInitializeA(time0, flags); offsets.local().local.diffSize++; @@ -71,7 +71,7 @@ void FilteredDerivativeBlock::dynObjectInitializeB(const IOdata& inputs, } } -double FilteredDerivativeBlock::step(coreTime time, double inputA) +double FilteredDerivativeBlock::step(CoreTime time, double inputA) { const index_t loc = limiter_diff; const double timeDelta = time - prevTime; @@ -133,7 +133,7 @@ void FilteredDerivativeBlock::blockDerivative(double input, void FilteredDerivativeBlock::blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) { diff --git a/src/griddyn/blocks/FilteredDerivativeBlock.h b/src/griddyn/blocks/FilteredDerivativeBlock.h index ddcb6f7b4..6867135a6 100644 --- a/src/griddyn/blocks/FilteredDerivativeBlock.h +++ b/src/griddyn/blocks/FilteredDerivativeBlock.h @@ -31,7 +31,7 @@ class FilteredDerivativeBlock: public GridBlock { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -51,12 +51,12 @@ class FilteredDerivativeBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double inputA) override; + virtual double step(CoreTime time, double inputA) override; virtual stringVec localStateNames() const override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn::blocks diff --git a/src/griddyn/blocks/FunctionBlock.cpp b/src/griddyn/blocks/FunctionBlock.cpp index 99ffe0c40..61567ae82 100644 --- a/src/griddyn/blocks/FunctionBlock.cpp +++ b/src/griddyn/blocks/FunctionBlock.cpp @@ -9,8 +9,8 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" +#include "utilities/MatrixData.hpp" #include "utilities/functionInterpreter.h" -#include "utilities/matrixData.hpp" #include namespace griddyn::blocks { @@ -82,7 +82,7 @@ void FunctionBlock::blockAlgebraicUpdate(double input, void FunctionBlock::blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) { @@ -111,7 +111,7 @@ void FunctionBlock::blockJacobianElements(double input, } } -double FunctionBlock::step(coreTime time, double input) +double FunctionBlock::step(CoreTime time, double input) { if (opFlags[USES_CONSTANT_ARG]) { m_state[limiter_alg] = K * mBinaryFunctionPtr(mGain * (input + bias), mArg2); diff --git a/src/griddyn/blocks/FunctionBlock.h b/src/griddyn/blocks/FunctionBlock.h index 3ccab6178..4a2377811 100644 --- a/src/griddyn/blocks/FunctionBlock.h +++ b/src/griddyn/blocks/FunctionBlock.h @@ -59,11 +59,11 @@ class FunctionBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double input) override; - // virtual void setTime(coreTime time){prevTime=time;}; + virtual double step(CoreTime time, double input) override; + // virtual void setTime(CoreTime time){prevTime=time;}; protected: /** @brief load the function objects from a string input @param[in] functionName the name of the function as a string*/ diff --git a/src/griddyn/blocks/IntegralBlock.cpp b/src/griddyn/blocks/IntegralBlock.cpp index 433b47ea4..3f55329ed 100644 --- a/src/griddyn/blocks/IntegralBlock.cpp +++ b/src/griddyn/blocks/IntegralBlock.cpp @@ -8,7 +8,7 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include namespace griddyn::blocks { IntegralBlock::IntegralBlock(const std::string& objName): GridBlock(objName) @@ -82,7 +82,7 @@ void IntegralBlock::blockDerivative(double input, void IntegralBlock::blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) { @@ -98,7 +98,7 @@ void IntegralBlock::blockJacobianElements(double input, GridBlock::blockJacobianElements(input, didt, stateDataValue, matrixDataValue, argLoc, sMode); } -double IntegralBlock::step(coreTime time, double inputA) +double IntegralBlock::step(CoreTime time, double inputA) { const double timeDelta = time - prevTime; double out; diff --git a/src/griddyn/blocks/IntegralBlock.h b/src/griddyn/blocks/IntegralBlock.h index 0e2dc1a48..ebb8fa03d 100644 --- a/src/griddyn/blocks/IntegralBlock.h +++ b/src/griddyn/blocks/IntegralBlock.h @@ -49,11 +49,11 @@ class IntegralBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double inputA) override; - // virtual void timestep(coreTime time, const IOdata &inputs, const SolverMode &sMode); - // virtual void setTime(coreTime time){prevTime=time;}; + virtual double step(CoreTime time, double inputA) override; + // virtual void timestep(CoreTime time, const IOdata &inputs, const SolverMode &sMode); + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn::blocks diff --git a/src/griddyn/blocks/LutBlock.cpp b/src/griddyn/blocks/LutBlock.cpp index d4d56ca84..9c18b8387 100644 --- a/src/griddyn/blocks/LutBlock.cpp +++ b/src/griddyn/blocks/LutBlock.cpp @@ -10,7 +10,7 @@ #include "gmlc/utilities/TimeSeries.hpp" #include "gmlc/utilities/stringConversion.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -65,7 +65,7 @@ void LutBlock::blockAlgebraicUpdate(double input, void LutBlock::blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) { @@ -129,7 +129,7 @@ void LutBlock::set(std::string_view param, double val, units::unit unitType) } } -double LutBlock::step(coreTime time, double input) +double LutBlock::step(CoreTime time, double input) { m_state[limiter_alg] = K * computeValue(input + bias); diff --git a/src/griddyn/blocks/LutBlock.h b/src/griddyn/blocks/LutBlock.h index 616cbcdbe..fff163d6d 100644 --- a/src/griddyn/blocks/LutBlock.h +++ b/src/griddyn/blocks/LutBlock.h @@ -25,7 +25,7 @@ class LutBlock: public GridBlock { public: explicit LutBlock(const std::string& objName = "lutBlock_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - // virtual void dynObjectInitializeA (coreTime time0, std::uint32_t flags); + // virtual void dynObjectInitializeA (CoreTime time0, std::uint32_t flags); virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -43,11 +43,11 @@ class LutBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double input) override; - // virtual void setTime(coreTime time){prevTime=time;}; + virtual double step(CoreTime time, double input) override; + // virtual void setTime(CoreTime time){prevTime=time;}; double computeValue(double input); }; } // namespace griddyn::blocks diff --git a/src/griddyn/blocks/NullBlock.cpp b/src/griddyn/blocks/NullBlock.cpp index 1cc7a1986..1e99baee5 100644 --- a/src/griddyn/blocks/NullBlock.cpp +++ b/src/griddyn/blocks/NullBlock.cpp @@ -27,7 +27,7 @@ CoreObject* NullBlock::clone(CoreObject* obj) const return nobj; } -void NullBlock::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void NullBlock::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { auto& lcinfo = offsets.local(); lcinfo.reset(); @@ -57,14 +57,14 @@ void NullBlock::dynObjectInitializeB(const IOdata& inputs, fieldSet[0] = prevInput; } -void NullBlock::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void NullBlock::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { step(time, inputs[0]); } static IOdata gNullVec; -double NullBlock::step(coreTime time, double input) +double NullBlock::step(CoreTime time, double input) { prevTime = time; return input; @@ -124,7 +124,7 @@ void NullBlock::blockDerivative(double /*input*/, void NullBlock::blockJacobianElements(double /*input*/, double /*didt*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, index_t /*argLoc*/, const SolverMode& /*sMode*/) { @@ -145,7 +145,7 @@ ChangeCode NullBlock::rootCheck(const IOdata& /*inputs*/, return ChangeCode::NO_CHANGE; } -void NullBlock::rootTrigger(coreTime /*time*/, +void NullBlock::rootTrigger(CoreTime /*time*/, const IOdata& /*inputs*/, const std::vector& /*rootMask*/, const SolverMode& /*sMode*/) diff --git a/src/griddyn/blocks/NullBlock.h b/src/griddyn/blocks/NullBlock.h index fbd3b8a48..9dd0773a2 100644 --- a/src/griddyn/blocks/NullBlock.h +++ b/src/griddyn/blocks/NullBlock.h @@ -21,7 +21,7 @@ class NullBlock final: public GridBlock { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, @@ -55,18 +55,18 @@ class NullBlock final: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& solverModeValue) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; - virtual double step(coreTime time, double input) override; + virtual double step(CoreTime time, double input) override; virtual void rootTest(const IOdata& inputs, const StateData& stateDataValue, double roots[], const SolverMode& solverModeValue) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& solverModeValue) override; @@ -74,7 +74,7 @@ class NullBlock final: public GridBlock { const StateData& stateDataValue, const SolverMode& solverModeValue, CheckLevel level) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; virtual double getBlockOutput(const StateData& stateDataValue, const SolverMode& solverModeValue) const override; diff --git a/src/griddyn/blocks/PidBlock.cpp b/src/griddyn/blocks/PidBlock.cpp index 0e5afc62c..8a3ef2b13 100644 --- a/src/griddyn/blocks/PidBlock.cpp +++ b/src/griddyn/blocks/PidBlock.cpp @@ -8,7 +8,7 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::blocks { @@ -47,7 +47,7 @@ CoreObject* PidBlock::clone(CoreObject* obj) const return nobj; } -void PidBlock::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void PidBlock::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridBlock::dynObjectInitializeA(time0, flags); offsets.local().local.diffSize += 2; @@ -124,7 +124,7 @@ void PidBlock::blockDerivative(double input, void PidBlock::blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) { @@ -159,7 +159,7 @@ void PidBlock::blockJacobianElements(double input, } } -double PidBlock::step(coreTime time, double inputA) +double PidBlock::step(CoreTime time, double inputA) { const double timeDelta = time - prevTime; const double inputValue = inputA + bias; diff --git a/src/griddyn/blocks/PidBlock.h b/src/griddyn/blocks/PidBlock.h index d7a573388..f9c6a9c36 100644 --- a/src/griddyn/blocks/PidBlock.h +++ b/src/griddyn/blocks/PidBlock.h @@ -36,7 +36,7 @@ class PidBlock: public GridBlock { double derivativeGain, const std::string& objName = "pidBlock_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -55,10 +55,10 @@ class PidBlock: public GridBlock { virtual void blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double inputA) override; + virtual double step(CoreTime time, double inputA) override; virtual stringVec localStateNames() const override; }; diff --git a/src/griddyn/blocks/TransferFunctionBlock.cpp b/src/griddyn/blocks/TransferFunctionBlock.cpp index 1d0d150fb..bfecd9e15 100644 --- a/src/griddyn/blocks/TransferFunctionBlock.cpp +++ b/src/griddyn/blocks/TransferFunctionBlock.cpp @@ -10,7 +10,7 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/stringConversion.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -68,7 +68,7 @@ CoreObject* TransferFunctionBlock::clone(CoreObject* obj) const return nobj; } // set up the number of states -void TransferFunctionBlock::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void TransferFunctionBlock::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (b.back() == 0) { opFlags[differential_output] = true; @@ -149,7 +149,7 @@ void TransferFunctionBlock::blockDerivative(double input, void TransferFunctionBlock::blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) { @@ -170,7 +170,7 @@ void TransferFunctionBlock::blockJacobianElements(double input, matrixDataValue.assign(loc.diffOffset, loc.diffOffset, -stateDataValue.cj); } -double TransferFunctionBlock::step(coreTime time, double inputA) +double TransferFunctionBlock::step(CoreTime time, double inputA) { const double timeDelta = time - prevTime; double out; diff --git a/src/griddyn/blocks/TransferFunctionBlock.h b/src/griddyn/blocks/TransferFunctionBlock.h index 286a731a0..3559d4e49 100644 --- a/src/griddyn/blocks/TransferFunctionBlock.h +++ b/src/griddyn/blocks/TransferFunctionBlock.h @@ -48,7 +48,7 @@ are 0 */ TransferFunctionBlock(std::vector acoef, std::vector bcoef); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -72,11 +72,11 @@ are 0 virtual void blockJacobianElements(double input, double didt, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, index_t argLoc, const SolverMode& sMode) override; - virtual double step(coreTime time, double inputA) override; - // virtual void setTime(coreTime time){prevTime=time;}; + virtual double step(CoreTime time, double inputA) override; + // virtual void setTime(CoreTime time){prevTime=time;}; virtual stringVec localStateNames() const override; }; } // namespace griddyn::blocks diff --git a/src/griddyn/comms/CommunicationsCore.h b/src/griddyn/comms/CommunicationsCore.h index 68741d330..b53fce7df 100644 --- a/src/griddyn/comms/CommunicationsCore.h +++ b/src/griddyn/comms/CommunicationsCore.h @@ -52,8 +52,8 @@ class CommunicationsCore { */ virtual int send(std::uint64_t source, std::uint64_t dest, const std::shared_ptr& message); - coreTime getTime() const { return mTime; } - void setTime(coreTime nTime) { mTime = nTime; } + CoreTime getTime() const { return mTime; } + void setTime(CoreTime nTime) { mTime = nTime; } /** lookup an id by name @param[in] commName the name of the communicator @return the id associated with the communicator*/ @@ -68,6 +68,6 @@ class CommunicationsCore { CommunicationsCore() = default; commMapString mStringMap; //!< map containing the strings commMapID mIdMap; //!< map containing the id - coreTime mTime = timeZero; //!< current time of the communicator + CoreTime mTime = timeZero; //!< current time of the communicator }; } // namespace griddyn diff --git a/src/griddyn/comms/Communicator.cpp b/src/griddyn/comms/Communicator.cpp index 12e7da5e1..071d81eb0 100644 --- a/src/griddyn/comms/Communicator.cpp +++ b/src/griddyn/comms/Communicator.cpp @@ -129,7 +129,7 @@ void Communicator::ping(std::string_view destName) ccore->send(mId, destName, message); } -coreTime Communicator::getLastPingTime() const +CoreTime Communicator::getLastPingTime() const { return mLastReplyRx - mLastPingSend; } diff --git a/src/griddyn/comms/Communicator.h b/src/griddyn/comms/Communicator.h index 16af902e3..a042c0f9e 100644 --- a/src/griddyn/comms/Communicator.h +++ b/src/griddyn/comms/Communicator.h @@ -76,7 +76,7 @@ class Communicator: /** transmit a ping message to the named destination*/ void ping(std::string_view destName); /** query for the last time a ping response was received*/ - griddyn::coreTime getLastPingTime() const; + griddyn::CoreTime getLastPingTime() const; /** set the identifier for the communicator*/ void setCommID(std::uint64_t newID) { mId = newID; } @@ -102,8 +102,8 @@ class Communicator: private: std::uint64_t mId; //!< individual comm id rxMessageCallback_t mRxCallbackMessage; //!< call back action from parent object - griddyn::coreTime mLastPingSend = griddyn::timeZero; //!< the time last ping was sent - griddyn::coreTime mLastReplyRx = + griddyn::CoreTime mLastPingSend = griddyn::timeZero; //!< the time last ping was sent + griddyn::CoreTime mLastReplyRx = griddyn::timeZero; //!< the time the last response was received gmlc::containers::SimpleQueue>> mMessageQueue; //!< the message queue storing source and message diff --git a/src/griddyn/comms/ControlMessage.h b/src/griddyn/comms/ControlMessage.h index 3deb25fcc..be6eed053 100644 --- a/src/griddyn/comms/ControlMessage.h +++ b/src/griddyn/comms/ControlMessage.h @@ -61,7 +61,7 @@ class ControlMessagePayload: public CommPayload { @param[in] val the value associated with the field @param[in] time the time for a schedule */ - ControlMessagePayload(const std::string& fld, double val, coreTime time): + ControlMessagePayload(const std::string& fld, double val, CoreTime time): m_field(fld), m_value(val), m_time(time) { } diff --git a/src/griddyn/controllers/AGControl.cpp b/src/griddyn/controllers/AGControl.cpp index dd11c6d6b..235b18056 100644 --- a/src/griddyn/controllers/AGControl.cpp +++ b/src/griddyn/controllers/AGControl.cpp @@ -51,9 +51,9 @@ class AGControl ~AGControl(); - double initialize(coreTime time0,double freq0,double tiedev0); + double initialize(CoreTime time0,double freq0,double tiedev0); - double updateP(coreTime time, double freq, double tiedev); + double updateP(CoreTime time, double freq, double tiedev); double currentValue(); double addGen(scheduler *sched); @@ -133,9 +133,9 @@ void AGControl::dynObjectInitializeB(const IOdata& inputs, fieldSet[0] = pid->getOutput(); } -void AGControl::updateA(coreTime /*time*/) {} +void AGControl::updateA(CoreTime /*time*/) {} -void AGControl::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void AGControl::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { prevTime = time; diff --git a/src/griddyn/controllers/AGControl.h b/src/griddyn/controllers/AGControl.h index 67c02ec73..7166cf51f 100644 --- a/src/griddyn/controllers/AGControl.h +++ b/src/griddyn/controllers/AGControl.h @@ -68,9 +68,9 @@ class AGControl: public GridSubModel { const IOdata& desiredOutput, IOdata& fieldSet) override; - virtual void updateA(coreTime time) override; + virtual void updateA(CoreTime time) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual double getOutput(const IOdata& inputs, const StateData& sD, @@ -114,9 +114,9 @@ class AGControlBattery:public AGControl virtual CoreObject *clone(CoreObject *obj = nullptr, bool copyName = false) const; virtual ~AGControlBattery(); - virtual double dynObjectInitializeA (coreTime time0,double freq0,double tiedev0); + virtual double dynObjectInitializeA (CoreTime time0,double freq0,double tiedev0); - virtual double updateA(coreTime time, double freq, double tiedev); + virtual double updateA(CoreTime time, double freq, double tiedev); virtual void addGen(schedulerReg *sched); virtual void removeSched(schedulerReg *sched); diff --git a/src/griddyn/controllers/ControlSystem.cpp b/src/griddyn/controllers/ControlSystem.cpp index bdd00e451..282fb787f 100644 --- a/src/griddyn/controllers/ControlSystem.cpp +++ b/src/griddyn/controllers/ControlSystem.cpp @@ -42,7 +42,7 @@ void ControlSystem::add(GridBlock* blk) addSubObject(blk); } -void ControlSystem::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void ControlSystem::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { for (auto& blockObject : blocks) { blockObject->dynInitializeA(time0, flags); @@ -84,13 +84,13 @@ void ControlSystem::residual(const IOdata& /*inputs*/, void ControlSystem::jacobianElements(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const IOlocs& /*inputLocs*/, const SolverMode& /*sMode*/) { } -void ControlSystem::timestep(coreTime /*time*/, +void ControlSystem::timestep(CoreTime /*time*/, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { @@ -103,7 +103,7 @@ void ControlSystem::rootTest(const IOdata& /*inputs*/, { } -void ControlSystem::rootTrigger(coreTime /*time*/, +void ControlSystem::rootTrigger(CoreTime /*time*/, const IOdata& /*inputs*/, const std::vector& /*rootMask*/, const SolverMode& /*sMode*/) @@ -117,5 +117,5 @@ ChangeCode ControlSystem::rootCheck(const IOdata& /*inputs*/, { return ChangeCode::NO_CHANGE; } -// virtual void setTime(coreTime time){prevTime=time;}; +// virtual void setTime(CoreTime time){prevTime=time;}; } // namespace griddyn diff --git a/src/griddyn/controllers/ControlSystem.h b/src/griddyn/controllers/ControlSystem.h index e6c83d437..a186e702f 100644 --- a/src/griddyn/controllers/ControlSystem.h +++ b/src/griddyn/controllers/ControlSystem.h @@ -7,7 +7,7 @@ #pragma once #include "../GridSubModel.h" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/MatrixDataSparse.hpp" #include #include namespace griddyn { @@ -17,9 +17,9 @@ class GridBlock; class ControlSystem: public GridSubModel { protected: std::vector blocks; //!< the set of blocks to operate on - matrixDataSparse inputMult; //!< multipliers for the input to the blocks - matrixDataSparse outputMult; //!< multipliers for the outputs - matrixDataSparse connections; //!< multipliers for the block inputs + MatrixDataSparse inputMult; //!< multipliers for the input to the blocks + MatrixDataSparse outputMult; //!< multipliers for the outputs + MatrixDataSparse connections; //!< multipliers for the block inputs std::vector blockOutputs; //!< current vector of block outputs @@ -28,7 +28,7 @@ class ControlSystem: public GridSubModel { virtual ~ControlSystem(); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -48,17 +48,17 @@ class ControlSystem: public GridSubModel { virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -66,6 +66,6 @@ class ControlSystem: public GridSubModel { const StateData& sD, const SolverMode& sMode, CheckLevel level) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn diff --git a/src/griddyn/controllers/Dispatcher.cpp b/src/griddyn/controllers/Dispatcher.cpp index 57a8ef62b..fa32c472b 100644 --- a/src/griddyn/controllers/Dispatcher.cpp +++ b/src/griddyn/controllers/Dispatcher.cpp @@ -19,16 +19,16 @@ CoreObject* Dispatcher::clone(CoreObject* /*obj*/) const } void Dispatcher::moveSchedulers(Dispatcher* /*dis*/) {} -double Dispatcher::initialize(coreTime /*time0*/, double /*dispatch*/) +double Dispatcher::initialize(CoreTime /*time0*/, double /*dispatch*/) { return 0; } -double Dispatcher::updateP(coreTime /*time*/, double /*required*/, double /*targetTime*/) +double Dispatcher::updateP(CoreTime /*time*/, double /*required*/, double /*targetTime*/) { return 0; } -double Dispatcher::testP(coreTime /*time*/, double /*required*/, double /*targetTime*/) +double Dispatcher::testP(CoreTime /*time*/, double /*required*/, double /*targetTime*/) { return 0; } diff --git a/src/griddyn/controllers/Dispatcher.h b/src/griddyn/controllers/Dispatcher.h index 4223ac669..25a349c31 100644 --- a/src/griddyn/controllers/Dispatcher.h +++ b/src/griddyn/controllers/Dispatcher.h @@ -31,10 +31,10 @@ class Dispatcher: public CoreObject { virtual ~Dispatcher(); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; void moveSchedulers(Dispatcher* dis); - virtual double initialize(coreTime time0, double dispatch); + virtual double initialize(CoreTime time0, double dispatch); - virtual double updateP(coreTime time, double required, double targetTime); - virtual double testP(coreTime time, double required, double targetTime); + virtual double updateP(CoreTime time, double required, double targetTime); + virtual double testP(CoreTime time, double required, double targetTime); double currentValue() { return totalDispatch; } virtual void add(CoreObject* obj) override; diff --git a/src/griddyn/controllers/ReserveDispatcher.cpp b/src/griddyn/controllers/ReserveDispatcher.cpp index b214890d2..ca4390ff4 100644 --- a/src/griddyn/controllers/ReserveDispatcher.cpp +++ b/src/griddyn/controllers/ReserveDispatcher.cpp @@ -40,11 +40,11 @@ class reserveDispatcher virtual ~reserveDispatcher(); - virtual double initialize(coreTime time0,double dispatchSet); + virtual double initialize(CoreTime time0,double dispatchSet); - void setTime(coreTime time); - virtual double updateP(coreTime time); - virtual double testP(coreTime time); + void setTime(CoreTime time); + virtual double updateP(CoreTime time); + virtual double testP(CoreTime time); double currentValue(){return dispatch;}; virtual void addGen(scheduler *sched); @@ -105,7 +105,7 @@ void ReserveDispatcher::moveSchedulers(ReserveDispatcher* dispatcherToMove) checkGen(); } -double ReserveDispatcher::dynInitializeA(coreTime time0, double dispatchSet) +double ReserveDispatcher::dynInitializeA(CoreTime time0, double dispatchSet) { currentDispatch = dispatchSet; if (dispatchSet > 0) { @@ -116,7 +116,7 @@ double ReserveDispatcher::dynInitializeA(coreTime time0, double dispatchSet) return currentDispatch; } -double ReserveDispatcher::updateP(coreTime time, double pShort) +double ReserveDispatcher::updateP(CoreTime time, double pShort) { if (currentDispatch > 0) { if (time > (dispatchTime + dispatchInterval)) { @@ -139,7 +139,7 @@ double ReserveDispatcher::updateP(coreTime time, double pShort) return currentDispatch; } -double ReserveDispatcher::testP(coreTime time, double pShort) +double ReserveDispatcher::testP(CoreTime time, double pShort) { double output = 0; if (currentDispatch > 0) { diff --git a/src/griddyn/controllers/ReserveDispatcher.h b/src/griddyn/controllers/ReserveDispatcher.h index 64cbe7581..902690b46 100644 --- a/src/griddyn/controllers/ReserveDispatcher.h +++ b/src/griddyn/controllers/ReserveDispatcher.h @@ -24,8 +24,8 @@ class ReserveDispatcher: public CoreObject { double thresholdStop = kBigNum; double currentDispatch = 0.0; double reserveAvailable = 0.0; - coreTime dispatchTime = negTime; - coreTime dispatchInterval = 60.0 * 5.0; + CoreTime dispatchTime = negTime; + CoreTime dispatchInterval = 60.0 * 5.0; count_t schedCount = 0; std::vector schedList; @@ -37,12 +37,12 @@ class ReserveDispatcher: public CoreObject { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; virtual ~ReserveDispatcher(); - virtual double dynInitializeA(coreTime time0, double dispatchSet); + virtual double dynInitializeA(CoreTime time0, double dispatchSet); void moveSchedulers(ReserveDispatcher* dispatcherToMove); - virtual double updateP(coreTime time, double pShort); - virtual double testP(coreTime time, double pShort); + virtual double updateP(CoreTime time, double pShort); + virtual double testP(CoreTime time, double pShort); double getOutput(index_t /*num*/ = 0) { return currentDispatch; } virtual void add(SchedulerRamp* sched); diff --git a/src/griddyn/controllers/Scheduler.cpp b/src/griddyn/controllers/Scheduler.cpp index be8897730..1f2acc32b 100644 --- a/src/griddyn/controllers/Scheduler.cpp +++ b/src/griddyn/controllers/Scheduler.cpp @@ -50,27 +50,27 @@ bool operator!=(const Tsched& td1, const Tsched& td2) { return (td1.time != td2.time); } -bool operator<(const Tsched& td1, coreTime timeC) +bool operator<(const Tsched& td1, CoreTime timeC) { return (td1.time < timeC); } -bool operator<=(const Tsched& td1, coreTime timeC) +bool operator<=(const Tsched& td1, CoreTime timeC) { return (td1.time <= timeC); } -bool operator>(const Tsched& td1, coreTime timeC) +bool operator>(const Tsched& td1, CoreTime timeC) { return (td1.time > timeC); } -bool operator>=(const Tsched& td1, coreTime timeC) +bool operator>=(const Tsched& td1, CoreTime timeC) { return (td1.time >= timeC); } -bool operator==(const Tsched& td1, coreTime timeC) +bool operator==(const Tsched& td1, CoreTime timeC) { return (td1.time == timeC); } -bool operator!=(const Tsched& td1, coreTime timeC) +bool operator!=(const Tsched& td1, CoreTime timeC) { return (td1.time != timeC); } @@ -110,7 +110,7 @@ void Scheduler::setTarget(double target) insertTarget(Tsched(prevTime, target)); } -void Scheduler::setTarget(coreTime time, double target) +void Scheduler::setTarget(CoreTime time, double target) { insertTarget(Tsched(time, target)); } @@ -135,7 +135,7 @@ void Scheduler::setTarget(std::vector& time, std::vector& target void Scheduler::setTarget(const std::string& fileName) { - gmlc::utilities::TimeSeries targets; + gmlc::utilities::TimeSeries targets; targets.loadFile(fileName); auto targetList = [&targets]() { @@ -154,7 +154,7 @@ void Scheduler::setTarget(const std::string& fileName) } } -void Scheduler::updateA(coreTime time) +void Scheduler::updateA(CoreTime time) { const auto deltaTime = (time - prevTime); if (deltaTime == timeZero) { @@ -179,7 +179,7 @@ void Scheduler::updateA(coreTime time) lastUpdateTime = time; } -double Scheduler::predict(coreTime time) +double Scheduler::predict(CoreTime time) { double out = m_output; if (time >= nextUpdateTime) { @@ -189,7 +189,7 @@ double Scheduler::predict(coreTime time) return out; } -void Scheduler::dynObjectInitializeA(coreTime time0, std::uint32_t /*flags*/) +void Scheduler::dynObjectInitializeA(CoreTime time0, std::uint32_t /*flags*/) { commLink = cManager.build(); @@ -221,12 +221,12 @@ double Scheduler::getTarget() const return (pTarget.empty()) ? pCurr : (pTarget.front()).target; } -double Scheduler::getMax(coreTime /*time*/) const +double Scheduler::getMax(CoreTime /*time*/) const { return pMax; } -double Scheduler::getMin(coreTime /*time*/) const +double Scheduler::getMin(CoreTime /*time*/) const { return pMin; } diff --git a/src/griddyn/controllers/Scheduler.h b/src/griddyn/controllers/Scheduler.h index c0c58ac64..b443c63d8 100644 --- a/src/griddyn/controllers/Scheduler.h +++ b/src/griddyn/controllers/Scheduler.h @@ -39,10 +39,10 @@ class Scheduler: public Source { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; virtual ~Scheduler(); - virtual void updateA(coreTime time) override; - virtual double predict(coreTime time); + virtual void updateA(CoreTime time) override; + virtual double predict(CoreTime time); - virtual void setTarget(coreTime time, double target); + virtual void setTarget(CoreTime time, double target); virtual void setTarget(double target); virtual void setTarget(const std::string& fileName); virtual void setTarget(std::vector& time, std::vector& target); @@ -50,7 +50,7 @@ class Scheduler: public Source { double getEnergy() { return pCurr; } protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -67,11 +67,11 @@ class Scheduler: public Source { /** get the maximum available power within a specified time window @param[in] time the time window to make the power */ - virtual double getMax(coreTime time = maxTime) const; + virtual double getMax(CoreTime time = maxTime) const; /** get the low power level available within a specified time window @param[in] time the time window to make the power level */ - virtual double getMin(coreTime time = maxTime) const; + virtual double getMin(CoreTime time = maxTime) const; protected: virtual void insertTarget(Tsched targetSchedule); @@ -96,10 +96,10 @@ class SchedulerRamp: public Scheduler { protected: double rampUp = kBigNum; //!< maximum ramp rate in the up direction double rampDown = kBigNum; //!< maximum ramp rate in the down direction - coreTime rampTime = 20.0 * 60.0; //!< the ramp window + CoreTime rampTime = 20.0 * 60.0; //!< the ramp window double dpdt = 0.0; //!< the actual ramp rate double pRampCurr = 0.0; //!< the current scheduled ramp rate - coreTime lastTargetTime = negTime; //!< the time of the last scheduled target power level + CoreTime lastTargetTime = negTime; //!< the time of the last scheduled target power level double ramp10Up = kBigNum; //!<[puMW] The 10 minute maximum up ramp double ramp30Up = kBigNum; //!< the 30 minute maximum up ramp @@ -110,7 +110,7 @@ class SchedulerRamp: public Scheduler { // spinning reserve capacity double reserveAvail = 0.0; //!< the amount of reserve power in the generator double reserveUse = 0.0; //!< the amount of reserve power to use - coreTime reserveRampTime = 15.0 * 60.0; //!< the time window the object has to meet the reserve + CoreTime reserveRampTime = 15.0 * 60.0; //!< the time window the object has to meet the reserve double reserveAct = 0.0; //!< the actual current reserve double reservePriority = 0.0; //!< the priority level of the reserve @@ -120,14 +120,14 @@ class SchedulerRamp: public Scheduler { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; using Scheduler::setTarget; - void setTarget(coreTime time, double target) override; + void setTarget(CoreTime time, double target) override; void setTarget(double target) override; void setTarget(const std::string& fileName) override; - virtual void updateA(coreTime time) override; - virtual double predict(coreTime time) override; + virtual void updateA(CoreTime time) override; + virtual double predict(CoreTime time) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -146,8 +146,8 @@ class SchedulerRamp: public Scheduler { double getReserveUse() { return reserveAct; } double getReserveAvailable() { return reserveAvail; } virtual void dispatcherLink() override; - virtual double getMax(coreTime time = maxTime) const override; - virtual double getMin(coreTime time = maxTime) const override; + virtual double getMax(CoreTime time = maxTime) const override; + virtual double getMin(CoreTime time = maxTime) const override; protected: virtual void updatePTarget(); @@ -192,10 +192,10 @@ class SchedulerReg: public SchedulerRamp { double getRegDownAvailable() const { return regDownFrac * participationRating; } bool getRegEnabled() const { return regEnabled; } - void updateA(coreTime time) override; - double predict(coreTime time) override; + void updateA(CoreTime time) override; + double predict(CoreTime time) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -212,8 +212,8 @@ class SchedulerReg: public SchedulerRamp { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; virtual void dispatcherLink() override; - virtual double getMax(coreTime time = maxTime) const override; - virtual double getMin(coreTime time = maxTime) const override; + virtual double getMax(CoreTime time = maxTime) const override; + virtual double getMin(CoreTime time = maxTime) const override; protected: virtual void receiveMessage(std::uint64_t sourceID, diff --git a/src/griddyn/controllers/SchedulerInfo.h b/src/griddyn/controllers/SchedulerInfo.h index d91b55eed..6fef0dc83 100644 --- a/src/griddyn/controllers/SchedulerInfo.h +++ b/src/griddyn/controllers/SchedulerInfo.h @@ -13,10 +13,10 @@ namespace griddyn { class Tsched { public: - coreTime time = maxTime; + CoreTime time = maxTime; double target = 0; Tsched() {} - Tsched(coreTime atime, double atarget): time(atime), target(atarget) {} + Tsched(CoreTime atime, double atarget): time(atime), target(atarget) {} }; // comparison operators for Tsched classes @@ -32,16 +32,16 @@ bool operator==(const Tsched& td1, const Tsched& td2); bool operator!=(const Tsched& td1, const Tsched& td2); -bool operator<(const Tsched& td1, coreTime timeC); +bool operator<(const Tsched& td1, CoreTime timeC); -bool operator<=(const Tsched& td1, coreTime timeC); +bool operator<=(const Tsched& td1, CoreTime timeC); -bool operator>(const Tsched& td1, coreTime timeC); +bool operator>(const Tsched& td1, CoreTime timeC); -bool operator>=(const Tsched& td1, coreTime timeC); +bool operator>=(const Tsched& td1, CoreTime timeC); -bool operator==(const Tsched& td1, coreTime timeC); +bool operator==(const Tsched& td1, CoreTime timeC); -bool operator!=(const Tsched& td1, coreTime timeC); +bool operator!=(const Tsched& td1, CoreTime timeC); } // namespace griddyn diff --git a/src/griddyn/controllers/schedulerRamp.cpp b/src/griddyn/controllers/schedulerRamp.cpp index b45587c7e..33eecb150 100644 --- a/src/griddyn/controllers/schedulerRamp.cpp +++ b/src/griddyn/controllers/schedulerRamp.cpp @@ -55,7 +55,7 @@ void SchedulerRamp::setTarget(double target) insertTarget(Tsched(prevTime, target)); } -void SchedulerRamp::setTarget(coreTime time, double target) +void SchedulerRamp::setTarget(CoreTime time, double target) { insertTarget(Tsched(time, target)); if (time == nextUpdateTime) { @@ -63,7 +63,7 @@ void SchedulerRamp::setTarget(coreTime time, double target) } } -void SchedulerRamp::updateA(coreTime time) +void SchedulerRamp::updateA(CoreTime time) { double deltaTime = (time - prevTime); @@ -91,7 +91,7 @@ void SchedulerRamp::updateA(coreTime time) prevTime = time; } -double SchedulerRamp::predict(coreTime time) +double SchedulerRamp::predict(CoreTime time) { const double deltaTime = (time - prevTime); if (deltaTime == 0) { @@ -101,7 +101,7 @@ double SchedulerRamp::predict(coreTime time) return (m_output + (ramp * deltaTime)); } -void SchedulerRamp::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void SchedulerRamp::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { Scheduler::dynObjectInitializeA(time0, flags); prevTime = time0 - 0.001; @@ -160,12 +160,12 @@ double SchedulerRamp::getRampTime() const return (pTarget.front()).time - prevTime; } -double SchedulerRamp::getMax(const coreTime /*time*/) const +double SchedulerRamp::getMax(const CoreTime /*time*/) const { return pMax; } -double SchedulerRamp::getMin(coreTime /*time*/) const +double SchedulerRamp::getMin(CoreTime /*time*/) const { return pMin; } @@ -286,7 +286,7 @@ void SchedulerRamp::updatePTarget() double rempower = 0.0; double remtime = 0.0; double target; - coreTime time; + CoreTime time; double targetSpan; double rampLimitUp; diff --git a/src/griddyn/controllers/schedulerReg.cpp b/src/griddyn/controllers/schedulerReg.cpp index 75f4e3a76..53c9335b3 100644 --- a/src/griddyn/controllers/schedulerReg.cpp +++ b/src/griddyn/controllers/schedulerReg.cpp @@ -79,7 +79,7 @@ void SchedulerReg::setReg(double regLevel) } } -void SchedulerReg::updateA(coreTime time) +void SchedulerReg::updateA(CoreTime time) { const double deltaTime = (time - prevTime); @@ -102,7 +102,7 @@ void SchedulerReg::updateA(coreTime time) regCurrent = m_output - pCurr - reserveAct; } -double SchedulerReg::predict(coreTime time) +double SchedulerReg::predict(CoreTime time) { const double deltaTime = (time - prevTime); if (deltaTime == 0) { @@ -122,7 +122,7 @@ double SchedulerReg::predict(coreTime time) return predictedRampOutput; } -void SchedulerReg::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void SchedulerReg::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { SchedulerRamp::dynObjectInitializeA(time0, flags); participationRating = (m_Base >= kHalfBigNum) ? regMax : m_Base; @@ -178,12 +178,12 @@ double SchedulerReg::getRampTime() const return SchedulerRamp::getRampTime(); } -double SchedulerReg::getMax(const coreTime /*time*/) const +double SchedulerReg::getMax(const CoreTime /*time*/) const { return pMax; } -double SchedulerReg::getMin(coreTime /*time*/) const +double SchedulerReg::getMin(CoreTime /*time*/) const { return pMin; } diff --git a/src/griddyn/events/CompoundEvent.cpp b/src/griddyn/events/CompoundEvent.cpp index d0d401cca..aaf370654 100644 --- a/src/griddyn/events/CompoundEvent.cpp +++ b/src/griddyn/events/CompoundEvent.cpp @@ -15,7 +15,7 @@ #include namespace griddyn::events { -CompoundEvent::CompoundEvent(coreTime time0): Event(time0) {} +CompoundEvent::CompoundEvent(CoreTime time0): Event(time0) {} CompoundEvent::CompoundEvent(const std::string& eventName): Event(eventName) {} @@ -149,7 +149,7 @@ ChangeCode CompoundEvent::trigger() } } -ChangeCode CompoundEvent::trigger(coreTime time) +ChangeCode CompoundEvent::trigger(CoreTime time) { ChangeCode ret = ChangeCode::NOT_TRIGGERED; if (time >= triggerTime) { diff --git a/src/griddyn/events/CompoundEvent.h b/src/griddyn/events/CompoundEvent.h index 2688a7722..1fd1e589c 100644 --- a/src/griddyn/events/CompoundEvent.h +++ b/src/griddyn/events/CompoundEvent.h @@ -21,7 +21,7 @@ class CompoundEvent: public Event { std::vector targetObjects; //!< the set of objects to target public: explicit CompoundEvent(const std::string& eventName); - explicit CompoundEvent(coreTime time0 = 0.0); + explicit CompoundEvent(CoreTime time0 = 0.0); CompoundEvent(const EventInfo& gdEI, CoreObject* rootObject); virtual std::unique_ptr clone() const override; @@ -29,7 +29,7 @@ class CompoundEvent: public Event { // virtual void updateEvent(EventInfo &gdEI, CoreObject *rootObject) override; virtual ChangeCode trigger() override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; virtual void set(std::string_view param, double val) override; virtual void set(std::string_view param, std::string_view val) override; diff --git a/src/griddyn/events/CompoundEventPlayer.cpp b/src/griddyn/events/CompoundEventPlayer.cpp index 011ba759f..94f5ff07c 100644 --- a/src/griddyn/events/CompoundEventPlayer.cpp +++ b/src/griddyn/events/CompoundEventPlayer.cpp @@ -39,18 +39,18 @@ void CompoundEventPlayer::cloneTo(Event* gE) const } } -void CompoundEventPlayer::setTime(coreTime time) +void CompoundEventPlayer::setTime(CoreTime time) { triggerTime = time; } -void CompoundEventPlayer::setTimeValue(coreTime time, double val) +void CompoundEventPlayer::setTimeValue(CoreTime time, double val) { triggerTime = time; value = val; } -void CompoundEventPlayer::setTimeValue(const std::vector& /* times */, +void CompoundEventPlayer::setTimeValue(const std::vector& /* times */, const std::vector& /* vals */) { } @@ -70,7 +70,7 @@ void CompoundEventPlayer::set(std::string_view param, std::string_view val) CompoundEvent::set(param, val); } } -void CompoundEventPlayer::updateTrigger(coreTime time) +void CompoundEventPlayer::updateTrigger(CoreTime time) { if (currIndex != kNullLocation) // we have a file operation { @@ -162,7 +162,7 @@ ChangeCode CompoundEventPlayer::trigger() } } -ChangeCode CompoundEventPlayer::trigger(coreTime time) +ChangeCode CompoundEventPlayer::trigger(CoreTime time) { ChangeCode ret = ChangeCode::NOT_TRIGGERED; if (time + kSmallTime >= triggerTime) { diff --git a/src/griddyn/events/CompoundEventPlayer.h b/src/griddyn/events/CompoundEventPlayer.h index fda6abddf..0a1f0ee74 100644 --- a/src/griddyn/events/CompoundEventPlayer.h +++ b/src/griddyn/events/CompoundEventPlayer.h @@ -19,8 +19,8 @@ namespace griddyn::events { /** event type allowing multiple changes on multiple object at a set of given time points*/ class CompoundEventPlayer: public CompoundEvent { protected: - coreTime period = maxTime; //!< period of the player - gmlc::utilities::TimeSeriesMulti + CoreTime period = maxTime; //!< period of the player + gmlc::utilities::TimeSeriesMulti ts; //!< the time series containing the data for the player index_t currIndex = kNullLocation; //!< the current index of the player std::string eFile; //!< the file name @@ -40,13 +40,13 @@ class CompoundEventPlayer: public CompoundEvent { // virtual void updateEvent(EventInfo &gdEI, CoreObject *rootObject) override; virtual ChangeCode trigger() override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; virtual void set(std::string_view param, double val) override; virtual void set(std::string_view param, std::string_view val) override; - void setTime(coreTime time) override; - void setTimeValue(coreTime time, double val); - void setTimeValue(const std::vector& time, const std::vector& val); + void setTime(CoreTime time) override; + void setTimeValue(CoreTime time, double val); + void setTimeValue(const std::vector& time, const std::vector& val); /** load the player data from a file @param[in] fileName the name of the file to load */ @@ -58,6 +58,6 @@ class CompoundEventPlayer: public CompoundEvent { protected: /** helper function to update the trigger time*/ - virtual void updateTrigger(coreTime time); + virtual void updateTrigger(CoreTime time); }; } // namespace griddyn::events diff --git a/src/griddyn/events/Event.cpp b/src/griddyn/events/Event.cpp index 07799700a..1c19d92cf 100644 --- a/src/griddyn/events/Event.cpp +++ b/src/griddyn/events/Event.cpp @@ -51,7 +51,7 @@ Event::Event(const std::string& eventName): { } -Event::Event(coreTime time0): triggerTime(time0), eventId(static_cast(getID())) {} +Event::Event(CoreTime time0): triggerTime(time0), eventId(static_cast(getID())) {} Event::Event(const EventInfo& gdEI, CoreObject* rootObject): triggerTime(negTime), eventId(static_cast(getID())) @@ -182,7 +182,7 @@ void Event::set(std::string_view param, std::string_view val) } } -void Event::setTime(coreTime time) +void Event::setTime(CoreTime time) { triggerTime = time; } @@ -237,7 +237,7 @@ ChangeCode Event::trigger() } } -ChangeCode Event::trigger(coreTime time) +ChangeCode Event::trigger(CoreTime time) { ChangeCode ret = ChangeCode::NOT_TRIGGERED; if (time >= triggerTime) { @@ -396,7 +396,7 @@ void EventInfo::loadString(std::string_view eventString, CoreObject* rootObj) period = std::stod(tstring.substr(cstr + 1, std::string::npos)); } } else { - time = str2vector(tstring, negTime, ","); + time = str2vector(tstring, negTime, ","); } objString = (posA > 2) ? eventString.substr(0, posA - 1) : eventString.substr(posT + 1, std::string::npos); @@ -435,7 +435,7 @@ void EventInfo::loadString(std::string_view eventString, CoreObject* rootObj) } std::unique_ptr - makeEvent(std::string_view field, double val, coreTime eventTime, CoreObject* rootObject) + makeEvent(std::string_view field, double val, CoreTime eventTime, CoreObject* rootObject) { auto eventObject = std::make_unique(eventTime); const ObjectInfo fdata(std::string{field}, rootObject); diff --git a/src/griddyn/events/Event.h b/src/griddyn/events/Event.h index f8e1fabce..efd501591 100644 --- a/src/griddyn/events/Event.h +++ b/src/griddyn/events/Event.h @@ -25,8 +25,8 @@ class EventInfo { std::string description; //!< event description std::string type; //!< event type std::string file; //!< file associated with the event - coreTime period = timeZero; //!< event periodicity - std::vector time; //!< event trigger times + CoreTime period = timeZero; //!< event periodicity + std::vector time; //!< event trigger times std::vector value; //!< event trigger values stringVec fieldList; //!< list of fields associated with the event std::vector targetObjs; //!< the event targets @@ -46,7 +46,7 @@ class Event: public HelperObject, public EventInterface, public ObjectOperatorIn protected: std::string field; //!< event trigger field double value = 0.0; //!< new value - coreTime triggerTime; //!< the time the event is scheduled to be triggered + CoreTime triggerTime; //!< the time the event is scheduled to be triggered CoreObject* m_obj = nullptr; //!< the target object of the event units::unit unitType = units::defunit; //!< units of the event index_t eventId; //!< a unique Identifier code for the event @@ -63,7 +63,7 @@ class Event: public HelperObject, public EventInterface, public ObjectOperatorIn own @param[in] time0 the time to trigger the event */ - explicit Event(coreTime time0 = negTime); + explicit Event(CoreTime time0 = negTime); /** constructor from and EventInfo object and rootObject @param[in] gdEI a structure defining the information of an event @param[in] rootObject the base object to use for searching for any parameters or other objects*/ @@ -86,9 +86,9 @@ class Event: public HelperObject, public EventInterface, public ObjectOperatorIn */ virtual ChangeCode trigger(); - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; - virtual coreTime nextTriggerTime() const override { return triggerTime; } + virtual CoreTime nextTriggerTime() const override { return triggerTime; } virtual bool isArmed() const override { return armed; } EventExecutionMode executionMode() const override { return EventExecutionMode::normal; } bool initNeeded() const { return initRequired; } @@ -97,7 +97,7 @@ class Event: public HelperObject, public EventInterface, public ObjectOperatorIn virtual void setFlag(std::string_view flag, bool val) override; /** set the trigger time of an event */ - virtual void setTime(coreTime time); + virtual void setTime(CoreTime time); /** set the value associated with a parameter change event @param[in] val the new value @param[in] newUnits the units associated with the value @@ -134,7 +134,7 @@ class Event: public HelperObject, public EventInterface, public ObjectOperatorIn @return a unique ptr to the created event */ std::unique_ptr - makeEvent(std::string_view field, double val, coreTime eventTime, CoreObject* rootObject); + makeEvent(std::string_view field, double val, CoreTime eventTime, CoreObject* rootObject); /** construct an event from an event Info structure @param[in] gdEI the information associated with an event @param[in] rootObject the high level object to base any object searches from diff --git a/src/griddyn/events/EventAdapters.cpp b/src/griddyn/events/EventAdapters.cpp index f805c3936..e3b2acccf 100644 --- a/src/griddyn/events/EventAdapters.cpp +++ b/src/griddyn/events/EventAdapters.cpp @@ -17,7 +17,7 @@ namespace griddyn { std::atomic EventAdapter::eventCounter(0); -EventAdapter::EventAdapter(coreTime nextTime, coreTime period): +EventAdapter::EventAdapter(CoreTime nextTime, CoreTime period): m_period(period), m_nextTime(nextTime) { eventID = ++eventCounter; @@ -45,7 +45,7 @@ void EventAdapter::cloneTo(EventAdapter* eA) const void EventAdapter::updateObject(CoreObject* /*newObject*/, ObjectUpdateMode /*mode*/) {} void EventAdapter::getObjects(std::vector& /*objects*/) const {} -void EventAdapter::executeA(coreTime /*cTime*/) {} +void EventAdapter::executeA(CoreTime /*cTime*/) {} void EventAdapter::updateTime() {} void EventAdapter::initialize() {} @@ -55,7 +55,7 @@ int EventAdapter::eventCode() const return 0; } -ChangeCode EventAdapter::execute(coreTime cTime) +ChangeCode EventAdapter::execute(CoreTime cTime) { if (m_period > timeZero) { m_nextTime += std::floor((cTime - m_nextTime) / m_period) * m_period + m_period; @@ -73,8 +73,8 @@ bool compareEventAdapters(const std::shared_ptr& e1, FunctionEventAdapter::FunctionEventAdapter(ccode_function_t fcal): fptr(std::move(fcal)) {} FunctionEventAdapter::FunctionEventAdapter(ccode_function_t fcal, - coreTime triggerTime, - coreTime period): + CoreTime triggerTime, + CoreTime period): EventAdapter(triggerTime, period), fptr(std::move(fcal)) { } @@ -97,7 +97,7 @@ std::unique_ptr FunctionEventAdapter::clone() const return ea; } -ChangeCode FunctionEventAdapter::execute(coreTime cTime) +ChangeCode FunctionEventAdapter::execute(CoreTime cTime) { auto retval = fptr(); if (m_period > timeZero) { diff --git a/src/griddyn/events/EventAdapters.h b/src/griddyn/events/EventAdapters.h index d70ccf52d..7dcbf6879 100644 --- a/src/griddyn/events/EventAdapters.h +++ b/src/griddyn/events/EventAdapters.h @@ -34,9 +34,9 @@ class EventAdapter { bool two_part_execute = false; //!< flag if the event has two parts bool partB_turn = false; //!< if we need to execute the second part only bool partB_only = false; //!< flag indicating we only run when partB runs - coreTime m_period; //!< the period of the event; - coreTime m_nextTime; //!< the next time the event is scheduled to execute - coreTime partBdelay = timeZero; //!< the delay between the first and second parts + CoreTime m_period; //!< the period of the event; + CoreTime m_nextTime; //!< the next time the event is scheduled to execute + CoreTime partBdelay = timeZero; //!< the delay between the first and second parts private: static std::atomic eventCounter; //!< counter for generating the unique event ID public: @@ -45,7 +45,7 @@ class EventAdapter { @param[in] period the period of the event (the event will trigger once per period starting at nextTime */ - EventAdapter(coreTime nextTime = maxTime, coreTime period = timeZero); + EventAdapter(CoreTime nextTime = maxTime, CoreTime period = timeZero); /** @brief destructor*/ virtual ~EventAdapter(); @@ -64,12 +64,12 @@ class EventAdapter { /** Execute the pre-event portion of the event for two part execution events @param[in] cTime the current execution time */ - virtual void executeA(coreTime cTime); + virtual void executeA(CoreTime cTime); /** Execute the event or partB of the event @param[in] cTime the current execution time */ - virtual ChangeCode execute(coreTime cTime); + virtual ChangeCode execute(CoreTime cTime); /** @brief update the next event time*/ virtual void updateTime(); @@ -145,7 +145,7 @@ class EventTypeAdapter: public EventAdapter { { m_eventObj->getObjects(objects); } - virtual ChangeCode execute(coreTime cTime) override + virtual ChangeCode execute(CoreTime cTime) override { ChangeCode retval = ChangeCode::NOT_TRIGGERED; // EVENT_NOT_TRIGGERED int excnt = 0; @@ -229,7 +229,7 @@ class EventTypeAdapter>: public EventAdapter { { m_eventObj->getObjects(objects); } - ChangeCode execute(coreTime cTime) override + ChangeCode execute(CoreTime cTime) override { ChangeCode retval = ChangeCode::NOT_TRIGGERED; // EVENT_NOT_TRIGGERED int excnt = 0; //!< counter for protection against an event not behaving properly @@ -306,12 +306,12 @@ class EventTypeAdapter: public EventAdapter { return newAdapter; } - virtual void executeA(coreTime cTime) override { targetObject->updateA(cTime); } + virtual void executeA(CoreTime cTime) override { targetObject->updateA(cTime); } - virtual ChangeCode execute(coreTime cTime) override + virtual ChangeCode execute(CoreTime cTime) override { targetObject->updateB(); - coreTime time = targetObject->getNextUpdateTime(); + CoreTime time = targetObject->getNextUpdateTime(); if ((time <= cTime) && (time <= m_nextTime)) { m_nextTime = maxTime; } else { @@ -347,13 +347,13 @@ class FunctionEventAdapter: public EventAdapter { @param period if greater than 0 the function will execute with the specified period after triggerTIme */ - FunctionEventAdapter(ccode_function_t fcal, coreTime triggerTime, coreTime period = 0.0); + FunctionEventAdapter(ccode_function_t fcal, CoreTime triggerTime, CoreTime period = 0.0); virtual std::unique_ptr clone() const override; virtual void cloneTo(EventAdapter* ea) const override; - virtual ChangeCode execute(coreTime cTime) override; + virtual ChangeCode execute(CoreTime cTime) override; /** @brief set the function of the event adapter *@param[in] nfptr a std::function which returns a change code and takes 0 arguments*/ diff --git a/src/griddyn/events/EventInterface.hpp b/src/griddyn/events/EventInterface.hpp index 758993d9d..abe5d2fc2 100644 --- a/src/griddyn/events/EventInterface.hpp +++ b/src/griddyn/events/EventInterface.hpp @@ -24,7 +24,7 @@ class EventInterface { public: virtual ~EventInterface() = default; /** get the next trigger time */ - virtual coreTime nextTriggerTime() const = 0; + virtual CoreTime nextTriggerTime() const = 0; /** get the events execution mode normal mean it run immediately delayed means it should run after other normal events @@ -34,7 +34,7 @@ class EventInterface { /** run the event if time >triggerTime @return a change code corresponding to what the event did */ - virtual ChangeCode trigger(coreTime ctime) = 0; + virtual ChangeCode trigger(CoreTime ctime) = 0; /** answer the question if the event is ready to triggered*/ virtual bool isArmed() const { return true; } /** do any event initialization that may be required before an event is ready to execute*/ diff --git a/src/griddyn/events/EventQueue.cpp b/src/griddyn/events/EventQueue.cpp index 286a43978..0e2b93139 100644 --- a/src/griddyn/events/EventQueue.cpp +++ b/src/griddyn/events/EventQueue.cpp @@ -23,12 +23,12 @@ EventQueue::EventQueue() } EventQueue::~EventQueue() = default; -coreTime EventQueue::getNextTime() const +CoreTime EventQueue::getNextTime() const { return events.front()->m_nextTime; } -coreTime EventQueue::getNextTime(int eventCode) const +CoreTime EventQueue::getNextTime(int eventCode) const { std::lock_guard lock(queuelock_); for (auto& ev : events) { @@ -39,7 +39,7 @@ coreTime EventQueue::getNextTime(int eventCode) const return maxTime; } -void EventQueue::nullEventTime(coreTime time, coreTime period) +void EventQueue::nullEventTime(CoreTime time, CoreTime period) { nullEvent->m_nextTime = time; if (period != kNullVal) { @@ -48,7 +48,7 @@ void EventQueue::nullEventTime(coreTime time, coreTime period) sort(); } -coreTime EventQueue::getNullEventTime() const +CoreTime EventQueue::getNullEventTime() const { return nullEvent->m_nextTime; } @@ -80,7 +80,7 @@ void EventQueue::mapObjectsOnto(CoreObject* newRootObject) } } -ChangeCode EventQueue::executeEvents(coreTime cTime) +ChangeCode EventQueue::executeEvents(CoreTime cTime) { if (events.front()->m_nextTime > cTime + timeTols) { return ChangeCode::NO_CHANGE; @@ -102,7 +102,7 @@ ChangeCode EventQueue::executeEvents(coreTime cTime) return ret; } -ChangeCode EventQueue::executeEventsAonly(coreTime cTime) +ChangeCode EventQueue::executeEventsAonly(CoreTime cTime) { if (events.front()->m_nextTime > cTime + timeTols) { return ChangeCode::NO_CHANGE; diff --git a/src/griddyn/events/EventQueue.h b/src/griddyn/events/EventQueue.h index c67095b10..4b4cb4eac 100644 --- a/src/griddyn/events/EventQueue.h +++ b/src/griddyn/events/EventQueue.h @@ -25,7 +25,7 @@ nothing but can be called periodically. */ class EventQueue { private: - coreTime timeTols = kSmallTime; //!< the temporal tolerance on events + CoreTime timeTols = kSmallTime; //!< the temporal tolerance on events std::vector> events; //!< storage location for events std::vector> partB_list; //!< container for immediate events awaiting part B execution @@ -89,12 +89,12 @@ class EventQueue { /** @brief get the next event time @return the next Event time */ - virtual coreTime getNextTime() const; + virtual CoreTime getNextTime() const; /** @brief get the next event time of a specific type of event @param[in] eventCode a specific code corresponding to a specific type of event @return the next Event time */ - virtual coreTime getNextTime(int eventCode) const; + virtual CoreTime getNextTime(int eventCode) const; /** @brief clone the entire queue to a new queue @return a unique_ptr to the updated Queue @@ -112,13 +112,13 @@ class EventQueue { @param[in] cTime the current Time @return code describing the effect of the executed events */ - virtual ChangeCode executeEvents(coreTime cTime); + virtual ChangeCode executeEvents(CoreTime cTime); /** @brief Execute the first part of the events only @param[in] cTime the current Time @return code describing the effect of the executed events */ - virtual ChangeCode executeEventsAonly(coreTime cTime); + virtual ChangeCode executeEventsAonly(CoreTime cTime); /** @brief Execute second portion of any events where the A portion (could be skipped) was executed by a call to execute A Events only @@ -155,10 +155,10 @@ class EventQueue { @param[in] time the time for the null event @param[in] period the period of the null event */ - void nullEventTime(coreTime time, coreTime period = negTime); + void nullEventTime(CoreTime time, CoreTime period = negTime); /** @brief get the time for the next Null Event*/ - coreTime getNullEventTime() const; + CoreTime getNullEventTime() const; private: /** @brief check for duplicate events and remove the duplicate diff --git a/src/griddyn/events/InterpolatingPlayer.cpp b/src/griddyn/events/InterpolatingPlayer.cpp index d20467b67..12110d8d0 100644 --- a/src/griddyn/events/InterpolatingPlayer.cpp +++ b/src/griddyn/events/InterpolatingPlayer.cpp @@ -17,7 +17,7 @@ namespace griddyn::events { InterpolatingPlayer::InterpolatingPlayer(const std::string& eventName): Player(eventName) {} -InterpolatingPlayer::InterpolatingPlayer(coreTime time0, double loopPeriod): +InterpolatingPlayer::InterpolatingPlayer(CoreTime time0, double loopPeriod): Player(time0, loopPeriod) { } @@ -168,7 +168,7 @@ ChangeCode InterpolatingPlayer::trigger() } } -ChangeCode InterpolatingPlayer::trigger(coreTime time) +ChangeCode InterpolatingPlayer::trigger(CoreTime time) { ChangeCode ret = ChangeCode::NOT_TRIGGERED; if (time + kSmallTime >= triggerTime) { diff --git a/src/griddyn/events/InterpolatingPlayer.h b/src/griddyn/events/InterpolatingPlayer.h index d8373b36b..679da8ed2 100644 --- a/src/griddyn/events/InterpolatingPlayer.h +++ b/src/griddyn/events/InterpolatingPlayer.h @@ -29,7 +29,7 @@ class InterpolatingPlayer: public Player { /** construct with a name*/ explicit InterpolatingPlayer(const std::string& eventName); /** construct with a time and looping period*/ - InterpolatingPlayer(coreTime time0 = 0.0, double loopPeriod = 0.0); + InterpolatingPlayer(CoreTime time0 = 0.0, double loopPeriod = 0.0); /** construct from an event Info structure and root object*/ InterpolatingPlayer(const EventInfo& gdEI, CoreObject* rootObject); virtual std::unique_ptr clone() const override; @@ -38,7 +38,7 @@ class InterpolatingPlayer: public Player { // virtual void updateEvent(EventInfo &gdEI, CoreObject *rootObject) override; virtual ChangeCode trigger() override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; virtual void set(std::string_view param, double val) override; virtual void set(std::string_view param, std::string_view val) override; diff --git a/src/griddyn/events/Player.cpp b/src/griddyn/events/Player.cpp index ebb712ed9..29434cc0f 100644 --- a/src/griddyn/events/Player.cpp +++ b/src/griddyn/events/Player.cpp @@ -17,7 +17,7 @@ namespace griddyn::events { Player::Player(const std::string& eventName): Event(eventName) {} -Player::Player(coreTime time0, double loopPeriod): Event(time0), period(loopPeriod) {} +Player::Player(CoreTime time0, double loopPeriod): Event(time0), period(loopPeriod) {} Player::Player(const EventInfo& gdEI, CoreObject* rootObject): Event(gdEI, rootObject), period(gdEI.period) @@ -89,18 +89,18 @@ void Player::set(std::string_view param, std::string_view val) } } -void Player::setTime(coreTime time) +void Player::setTime(CoreTime time) { triggerTime = time; } -void Player::setTimeValue(coreTime time, double val) +void Player::setTimeValue(CoreTime time, double val) { triggerTime = time; value = val; } -void Player::setTimeValue(const std::vector& time, const std::vector& val) +void Player::setTimeValue(const std::vector& time, const std::vector& val) { ts.reserve(static_cast(time.size())); @@ -118,7 +118,7 @@ void Player::setNextValue() } } -void Player::updateTrigger(coreTime time) +void Player::updateTrigger(CoreTime time) { if (time >= triggerTime) { if (time >= ts.time(currIndex) + timeOffset) { @@ -198,7 +198,7 @@ ChangeCode Player::trigger() } } -ChangeCode Player::trigger(coreTime time) +ChangeCode Player::trigger(CoreTime time) { ChangeCode ret = ChangeCode::NOT_TRIGGERED; if (time + kSmallTime >= triggerTime) { diff --git a/src/griddyn/events/Player.h b/src/griddyn/events/Player.h index c35029125..a9070bdeb 100644 --- a/src/griddyn/events/Player.h +++ b/src/griddyn/events/Player.h @@ -22,12 +22,12 @@ namespace events { // the bool is first to take advantage of the empty space in event there will still be a 3 // byte gap bool loadFileProcess = false; //!< flag indicating that the files need to be loaded yet - coreTime period = maxTime; //!< period of the player - gmlc::utilities::TimeSeries + CoreTime period = maxTime; //!< period of the player + gmlc::utilities::TimeSeries ts; //!< the time series containing the data for the player index_t currIndex = kNullLocation; //!< the current index of the player index_t column = 0; //!< the column in the file to use as the value set - coreTime timeOffset = timeZero; //!< an offset to the time series time + CoreTime timeOffset = timeZero; //!< an offset to the time series time std::string eFile; //!< the file name std::future fileLoaded; //!< future indicating that the file operations have completed @@ -36,7 +36,7 @@ namespace events { /** constructor taking the object name*/ explicit Player(const std::string& eventName); /** constructor taking a trigger time and period default constructor*/ - Player(coreTime time0 = 0.0, double loopPeriod = 0.0); + Player(CoreTime time0 = 0.0, double loopPeriod = 0.0); /** constructor from an event Info structure and rootobject*/ Player(const EventInfo& gdEI, CoreObject* rootObject); virtual std::unique_ptr clone() const override; @@ -45,21 +45,21 @@ namespace events { virtual void updateEvent(const EventInfo& gdEI, CoreObject* rootObject) override; virtual ChangeCode trigger() override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; virtual void set(std::string_view param, double val) override; virtual void set(std::string_view param, std::string_view val) override; - void setTime(coreTime time) override; + void setTime(CoreTime time) override; /** set a time and value pair as part of the player @param[in] time the time associated with the value @param[in] val the value to set at the given time */ - void setTimeValue(coreTime time, double val); + void setTimeValue(CoreTime time, double val); /** set a time and value set as part of the player @param[in] time the times associated with the value @param[in] val the values to set at the given times */ - void setTimeValue(const std::vector& time, const std::vector& val); + void setTimeValue(const std::vector& time, const std::vector& val); /** load a file containing the time/value data for the player @param[in] fileName the file to load */ @@ -72,7 +72,7 @@ namespace events { // friendly helper functions for sorting protected: /** update the trigger time*/ - virtual void updateTrigger(coreTime time); + virtual void updateTrigger(CoreTime time); /** queue up the next value to set when the event is triggered*/ virtual void setNextValue(); }; diff --git a/src/griddyn/events/ReversibleEvent.cpp b/src/griddyn/events/ReversibleEvent.cpp index c9540d831..b9795d5a6 100644 --- a/src/griddyn/events/ReversibleEvent.cpp +++ b/src/griddyn/events/ReversibleEvent.cpp @@ -13,7 +13,7 @@ namespace griddyn::events { ReversibleEvent::ReversibleEvent(const std::string& eventName): Event(eventName) {} -ReversibleEvent::ReversibleEvent(coreTime time0): Event(time0) {} +ReversibleEvent::ReversibleEvent(CoreTime time0): Event(time0) {} ReversibleEvent::ReversibleEvent(const EventInfo& gdEI, CoreObject* rootObject): Event(gdEI, rootObject) { @@ -76,7 +76,7 @@ ChangeCode ReversibleEvent::trigger() } } -ChangeCode ReversibleEvent::trigger(coreTime time) +ChangeCode ReversibleEvent::trigger(CoreTime time) { if (canUndo) { undoValue = grabber->grabData(); diff --git a/src/griddyn/events/ReversibleEvent.h b/src/griddyn/events/ReversibleEvent.h index 5e4df1143..4d5add9b1 100644 --- a/src/griddyn/events/ReversibleEvent.h +++ b/src/griddyn/events/ReversibleEvent.h @@ -25,7 +25,7 @@ namespace events { std::string newStringValue; //!< the new value to set for a string public: explicit ReversibleEvent(const std::string& eventName); - explicit ReversibleEvent(coreTime time0 = 0.0); + explicit ReversibleEvent(CoreTime time0 = 0.0); ReversibleEvent(const EventInfo& gdEI, CoreObject* rootObject); virtual void updateEvent(const EventInfo& gdEI, CoreObject* rootObject) override; virtual ~ReversibleEvent(); @@ -35,7 +35,7 @@ namespace events { // virtual void updateEvent(EventInfo &gdEI, CoreObject *rootObject) override; virtual ChangeCode trigger() override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; virtual bool setTarget(CoreObject* gdo, std::string_view var = {}) override; diff --git a/src/griddyn/exciters/Exciter.cpp b/src/griddyn/exciters/Exciter.cpp index 884372075..6fb9a8c48 100644 --- a/src/griddyn/exciters/Exciter.cpp +++ b/src/griddyn/exciters/Exciter.cpp @@ -21,7 +21,7 @@ #include "core/coreDefinitions.hpp" #include "solvers/SolverMode.hpp" #include "units/units.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -66,7 +66,7 @@ CoreObject* Exciter::clone(CoreObject* obj) const return gdE; } -void Exciter::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void Exciter::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 1; offsets.local().local.jacSize = 4; @@ -137,7 +137,7 @@ void Exciter::derivative(const IOdata& inputs, void Exciter::jacobianElements(const IOdata& /*inputs*/, const StateData& stateData, - matrixData& matrix, + MatrixData& matrix, const IOlocs& inputLocs, const SolverMode& solverMode) { @@ -173,7 +173,7 @@ void Exciter::rootTest(const IOdata& inputs, } } -void Exciter::rootTrigger(coreTime time, +void Exciter::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& solverMode) diff --git a/src/griddyn/exciters/ExciterDC1A.cpp b/src/griddyn/exciters/ExciterDC1A.cpp index 282af3db4..7e892dbfd 100644 --- a/src/griddyn/exciters/ExciterDC1A.cpp +++ b/src/griddyn/exciters/ExciterDC1A.cpp @@ -8,7 +8,7 @@ #include "../Generator.h" #include "../GridBus.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -47,7 +47,7 @@ CoreObject* ExciterDC1A::clone(CoreObject* obj) const return gdE; } -void ExciterDC1A::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void ExciterDC1A::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 4; offsets.local().local.jacSize = 19; @@ -121,7 +121,7 @@ void ExciterDC1A::derivative(const IOdata& inputs, // Jacobian void ExciterDC1A::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -176,7 +176,7 @@ void ExciterDC1A::limitJacobian(double /*V*/, int /*Vloc*/, int refLoc, double cjValue, - matrixData& matrixDataValue) + MatrixData& matrixDataValue) { matrixDataValue.assign(refLoc, refLoc, cjValue); } diff --git a/src/griddyn/exciters/ExciterDC1A.h b/src/griddyn/exciters/ExciterDC1A.h index 623076c37..8e6a28d3d 100644 --- a/src/griddyn/exciters/ExciterDC1A.h +++ b/src/griddyn/exciters/ExciterDC1A.h @@ -20,7 +20,7 @@ class ExciterDC1A: public ExciterIEEEtype1 { explicit ExciterDC1A(const std::string& objName = "exciterDC1A_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -41,7 +41,7 @@ class ExciterDC1A: public ExciterIEEEtype1 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; @@ -53,7 +53,7 @@ class ExciterDC1A: public ExciterIEEEtype1 { const StateData& sD, const SolverMode& sMode, CheckLevel level) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; protected: /** @brief the Jacobian entries for the limiter @param[in] V the voltage @@ -66,6 +66,6 @@ class ExciterDC1A: public ExciterIEEEtype1 { int Vloc, int refLoc, double cj, - matrixData& matrixDataValue); + MatrixData& matrixDataValue); }; } // namespace griddyn::exciters diff --git a/src/griddyn/exciters/ExciterDC2A.cpp b/src/griddyn/exciters/ExciterDC2A.cpp index 422dc33ce..bba88373a 100644 --- a/src/griddyn/exciters/ExciterDC2A.cpp +++ b/src/griddyn/exciters/ExciterDC2A.cpp @@ -9,7 +9,7 @@ #include "../Generator.h" #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -86,7 +86,7 @@ void ExciterDC2A::limitJacobian(double /*V*/, int voltageLoc, int refLoc, double cjValue, - matrixData& matrixDataValue) + MatrixData& matrixDataValue) { matrixDataValue.assign(refLoc, refLoc, 1); matrixDataValue.assign(refLoc, voltageLoc, cjValue); diff --git a/src/griddyn/exciters/ExciterDC2A.h b/src/griddyn/exciters/ExciterDC2A.h index c39ca958d..7f5edbae3 100644 --- a/src/griddyn/exciters/ExciterDC2A.h +++ b/src/griddyn/exciters/ExciterDC2A.h @@ -39,7 +39,7 @@ class ExciterDC2A: public ExciterDC1A { int voltageLoc, int refLoc, double cj, - matrixData& matrixDataValue) override; + MatrixData& matrixDataValue) override; }; } // namespace griddyn::exciters diff --git a/src/griddyn/exciters/ExciterIEEEtype1.cpp b/src/griddyn/exciters/ExciterIEEEtype1.cpp index 1088bf5d3..5537e41da 100644 --- a/src/griddyn/exciters/ExciterIEEEtype1.cpp +++ b/src/griddyn/exciters/ExciterIEEEtype1.cpp @@ -9,7 +9,7 @@ #include "../Generator.h" #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -40,7 +40,7 @@ CoreObject* ExciterIEEEtype1::clone(CoreObject* obj) const return gdE; } -void ExciterIEEEtype1::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void ExciterIEEEtype1::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 3; offsets.local().local.jacSize = 14; @@ -94,10 +94,10 @@ void ExciterIEEEtype1::residual(const IOdata& inputs, rv[2] = (-es[2] + es[0] * Kf / Tf) / Tf - esp[2]; } -void ExciterIEEEtype1::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void ExciterIEEEtype1::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { derivative(inputs, emptyStateData, m_dstate_dt.data(), cLocalSolverMode); - double dt = time - prevTime; // convert from a coreTime + double dt = time - prevTime; // convert from a CoreTime m_state[0] += dt * m_dstate_dt[0]; m_state[1] += dt * m_dstate_dt[1]; m_state[2] += dt * m_dstate_dt[2]; @@ -126,7 +126,7 @@ void ExciterIEEEtype1::derivative(const IOdata& inputs, // Jacobian void ExciterIEEEtype1::jacobianElements(const IOdata& /*inputs*/, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/exciters/ExciterIEEEtype1.h b/src/griddyn/exciters/ExciterIEEEtype1.h index ac1e6d68e..2df0632d0 100644 --- a/src/griddyn/exciters/ExciterIEEEtype1.h +++ b/src/griddyn/exciters/ExciterIEEEtype1.h @@ -24,7 +24,7 @@ class ExciterIEEEtype1: public Exciter { explicit ExciterIEEEtype1(const std::string& objName = "exciterIEEEtype1_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -34,7 +34,7 @@ class ExciterIEEEtype1: public Exciter { virtual stringVec localStateNames() const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void residual(const IOdata& inputs, const StateData& sD, double resid[], @@ -46,7 +46,7 @@ class ExciterIEEEtype1: public Exciter { // only called if the genModel is not present virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; diff --git a/src/griddyn/exciters/ExciterIEEEtype2.cpp b/src/griddyn/exciters/ExciterIEEEtype2.cpp index 546a3c1ca..b7ec3a7eb 100644 --- a/src/griddyn/exciters/ExciterIEEEtype2.cpp +++ b/src/griddyn/exciters/ExciterIEEEtype2.cpp @@ -9,7 +9,7 @@ #include "../Generator.h" #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -29,7 +29,7 @@ CoreObject* ExciterIEEEtype2::clone(CoreObject* obj) const return gdE; } -void ExciterIEEEtype2::dynObjectInitializeA(coreTime /*time*/, std::uint32_t /*flags*/) +void ExciterIEEEtype2::dynObjectInitializeA(CoreTime /*time*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 4; offsets.local().local.jacSize = 16; @@ -104,7 +104,7 @@ void ExciterIEEEtype2::derivative(const IOdata& inputs, // Jacobian void ExciterIEEEtype2::jacobianElements(const IOdata& /*inputs*/, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/exciters/ExciterIEEEtype2.h b/src/griddyn/exciters/ExciterIEEEtype2.h index f7604cce1..23c7b47b7 100644 --- a/src/griddyn/exciters/ExciterIEEEtype2.h +++ b/src/griddyn/exciters/ExciterIEEEtype2.h @@ -18,7 +18,7 @@ class ExciterIEEEtype2: public ExciterIEEEtype1 { public: explicit ExciterIEEEtype2(const std::string& objName = "exciterIEEEtype2_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -39,7 +39,7 @@ class ExciterIEEEtype2: public ExciterIEEEtype1 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; @@ -51,7 +51,7 @@ class ExciterIEEEtype2: public ExciterIEEEtype1 { const StateData& sD, const SolverMode& sMode, CheckLevel level) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn::exciters diff --git a/src/griddyn/exciters/ExciterSEXS.cpp b/src/griddyn/exciters/ExciterSEXS.cpp index 602c4c5bf..0323a716d 100644 --- a/src/griddyn/exciters/ExciterSEXS.cpp +++ b/src/griddyn/exciters/ExciterSEXS.cpp @@ -14,7 +14,7 @@ #include "core/CoreObjectTemplates.hpp" #include "core/coreDefinitions.hpp" #include "solvers/SolverMode.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -43,7 +43,7 @@ CoreObject* ExciterSEXS::clone(CoreObject* obj) const return gdE; } -void ExciterSEXS::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void ExciterSEXS::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 2; offsets.local().local.jacSize = 6; @@ -138,7 +138,7 @@ void ExciterSEXS::derivative(const IOdata& inputs, void ExciterSEXS::jacobianElements(const IOdata& /*inputs*/, const StateData& stateData, - matrixData& matrix, + MatrixData& matrix, const IOlocs& inputLocs, const SolverMode& SolverMode) { @@ -182,7 +182,7 @@ void ExciterSEXS::rootTest(const IOdata& inputs, } } -void ExciterSEXS::rootTrigger(coreTime time, +void ExciterSEXS::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& SolverMode) diff --git a/src/griddyn/exciters/ExciterSEXS.h b/src/griddyn/exciters/ExciterSEXS.h index b60dafbca..3d6250c95 100644 --- a/src/griddyn/exciters/ExciterSEXS.h +++ b/src/griddyn/exciters/ExciterSEXS.h @@ -29,7 +29,7 @@ class ExciterSEXS: public Exciter { explicit ExciterSEXS(const std::string& objName = "exciterSEXS_#"); CoreObject* clone(CoreObject* obj = nullptr) const override; - void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -49,7 +49,7 @@ class ExciterSEXS: public Exciter { const SolverMode& SolverMode) override; void jacobianElements(const IOdata& inputs, const StateData& stateData, - matrixData& matrix, + MatrixData& matrix, const IOlocs& inputLocs, const SolverMode& SolverMode) override; @@ -57,7 +57,7 @@ class ExciterSEXS: public Exciter { const StateData& stateData, double root[], const SolverMode& SolverMode) override; - void rootTrigger(coreTime time, + void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& SolverMode) override; diff --git a/src/griddyn/generators/DynamicGenerator.cpp b/src/griddyn/generators/DynamicGenerator.cpp index f14f16909..d30f3e177 100644 --- a/src/griddyn/generators/DynamicGenerator.cpp +++ b/src/griddyn/generators/DynamicGenerator.cpp @@ -21,7 +21,7 @@ #include "gmlc/containers/mapOps.hpp" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixDataScale.hpp" +#include "utilities/MatrixDataScale.hpp" #include #include #include @@ -200,7 +200,7 @@ void DynamicGenerator::buildDynModel(DynModel dynModel) } } -void DynamicGenerator::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void DynamicGenerator::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (machineBasePower < 0) { machineBasePower = systemBasePower; @@ -218,7 +218,7 @@ void DynamicGenerator::dynObjectInitializeA(coreTime time0, std::uint32_t flags) bus->setFlag("compute_frequency", true); // opFlags.set(uses_bus_frequency); } - gridSecondary::dynObjectInitializeA(time0, flags); // NOLINT + GridSecondary::dynObjectInitializeA(time0, flags); // NOLINT } // initial conditions of dynamic states @@ -317,7 +317,7 @@ void DynamicGenerator::dynObjectInitializeB(const IOdata& inputs, } // save an external state to the internal one -void DynamicGenerator::setState(coreTime time, +void DynamicGenerator::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -367,7 +367,7 @@ void DynamicGenerator::updateLocalCache(const IOdata& inputs, } // copy the current state to a vector -void DynamicGenerator::guessState(coreTime time, +void DynamicGenerator::guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) @@ -487,7 +487,7 @@ void DynamicGenerator::set(std::string_view param, std::string_view val) } } -void DynamicGenerator::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void DynamicGenerator::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { Generator::timestep(time, inputs, sMode); if (isDynamic(sMode)) { @@ -698,7 +698,7 @@ void DynamicGenerator::set(std::string_view param, double val, unit unitType) void DynamicGenerator::outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (!isDynamic(sMode)) { // the bus is managing a remote bus voltage @@ -708,8 +708,8 @@ void DynamicGenerator::outputPartialDerivatives(const IOdata& inputs, return; } const double scale = machineBasePower / systemBasePower; - // matrixDataSparse d; - matrixDataScale scaledMatrixData(matrixDataValue, scale); + // MatrixDataSparse d; + MatrixDataScale scaledMatrixData(matrixDataValue, scale); // compute the Jacobian genModel->outputPartialDerivatives(subInputs.inputs[GEN_MODEL_LOC], @@ -743,13 +743,13 @@ count_t DynamicGenerator::outputDependencyCount(index_t num, const SolverMode& s void DynamicGenerator::ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { if (isDynamic(sMode)) { const double scale = machineBasePower / systemBasePower; - matrixDataScale scaledMatrixData(matrixDataValue, scale); + MatrixDataScale scaledMatrixData(matrixDataValue, scale); auto gmLocs = subInputLocs.genModelInputLocsExternal; gmLocs[voltageInLocation] = inputLocs[voltageInLocation]; gmLocs[angleInLocation] = inputLocs[angleInLocation]; @@ -845,7 +845,7 @@ void DynamicGenerator::derivative(const IOdata& inputs, void DynamicGenerator::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -913,7 +913,7 @@ ChangeCode DynamicGenerator::rootCheck(const IOdata& inputs, return ret; } -void DynamicGenerator::rootTrigger(coreTime time, +void DynamicGenerator::rootTrigger(CoreTime time, const IOdata& /*inputs*/, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/generators/DynamicGenerator.h b/src/griddyn/generators/DynamicGenerator.h index 181edc534..3d142b8d1 100644 --- a/src/griddyn/generators/DynamicGenerator.h +++ b/src/griddyn/generators/DynamicGenerator.h @@ -20,7 +20,7 @@ class Source; /** @ brief class describing a generator intended for dynamic simulations a generator is a power production unit in GridDyn. the base generator class implements methods set -forth in the gridSecondary class and inherits from that class it has mechanics and interfaces for +forth in the GridSecondary class and inherits from that class it has mechanics and interfaces for handling any and all of 4 different components, namely and exciter, governor, generator model, and a power system stabilizer. as well as control for the power set point and voltage set point */ @@ -75,16 +75,16 @@ class DynamicGenerator: public Generator { explicit DynamicGenerator(const std::string& objName = "gen_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; // for saving the state - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; // for initial setting of the state @@ -124,31 +124,31 @@ class DynamicGenerator: public Generator { virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void getStateName(stringVec& stNames, const SolverMode& sMode, const std::string& prefix) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; diff --git a/src/griddyn/generators/Generator.cpp b/src/griddyn/generators/Generator.cpp index 503a39548..3afdf808b 100644 --- a/src/griddyn/generators/Generator.cpp +++ b/src/griddyn/generators/Generator.cpp @@ -14,8 +14,8 @@ #include "core/ObjectInterpreter.h" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" +#include "utilities/MatrixData.hpp" #include "utilities/OperatingBoundary.h" -#include "utilities/matrixData.hpp" #include #include #include @@ -56,7 +56,7 @@ using units::unit; std::atomic Generator::genCount(0); // default bus object -Generator::Generator(const std::string& objName): gridSecondary(objName) +Generator::Generator(const std::string& objName): GridSecondary(objName) { setUserID(++genCount); updateName(); @@ -70,7 +70,7 @@ Generator::~Generator() = default; CoreObject* Generator::clone(CoreObject* obj) const { - auto* gen = cloneBaseFactory(this, obj, &gGeneratorFactory); + auto* gen = cloneBaseFactory(this, obj, &gGeneratorFactory); if (gen == nullptr) { return obj; } @@ -93,7 +93,7 @@ CoreObject* Generator::clone(CoreObject* obj) const return gen; } -void Generator::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void Generator::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (isConnected() && isEnabled()) { if (opFlags[local_voltage_control]) { @@ -134,16 +134,16 @@ void Generator::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) Q = 0.0; } - gridSecondary::pFlowObjectInitializeA(time0, flags); + GridSecondary::pFlowObjectInitializeA(time0, flags); } -void Generator::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Generator::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (machineBasePower < 0.0) { machineBasePower = systemBasePower; } - gridSecondary::dynObjectInitializeA(time0, flags); + GridSecondary::dynObjectInitializeA(time0, flags); } StateSizes Generator::localStateSizes(const SolverMode& sMode) const @@ -205,7 +205,7 @@ void Generator::dynObjectInitializeB(const IOdata& /*inputs*/, } // save an external state to the internal one -void Generator::setState(coreTime time, +void Generator::setState(CoreTime time, const double state[], const double /*dstate_dt*/[], const SolverMode& sMode) @@ -221,7 +221,7 @@ void Generator::setState(coreTime time, } // copy the current state to a vector -void Generator::guessState(coreTime /*time*/, +void Generator::guessState(CoreTime /*time*/, double state[], double /*dstate_dt*/[], const SolverMode& sMode) @@ -316,7 +316,7 @@ void Generator::set(std::string_view param, std::string_view val) throw(InvalidParameterValue(val)); } } else { - gridSecondary::set(param, val); + GridSecondary::set(param, val); } } @@ -344,12 +344,12 @@ double Generator::get(std::string_view param, unit unitType) const CoreObject* tobj = const_cast(this); ret = convert(fptr(tobj), unit, unitType, systemBasePower, localBaseVoltage); } else { - ret = gridSecondary::get(param, unitType); + ret = GridSecondary::get(param, unitType); } return ret; } -void Generator::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void Generator::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { if (Pset < -kHalfBigNum) { Pset = P; @@ -442,7 +442,7 @@ void Generator::setFlag(std::string_view flag, bool val) } else if ((flag == "isoc") || (flag == "isochronous")) { opFlags.set(isochronousOperation, val); } else { - gridSecondary::setFlag(flag, val); + GridSecondary::setFlag(flag, val); } } @@ -513,7 +513,7 @@ void Generator::set(std::string_view param, double val, unit unitType) const CoreObject* root = getRoot(); setRemoteBus(root->findByUserID("bus", static_cast(val))); } else { - gridSecondary::set(param, val, unitType); + GridSecondary::set(param, val, unitType); } } @@ -532,7 +532,7 @@ void Generator::setCapabilityCurve(const std::vector& ppts, void Generator::outputPartialDerivatives(const IOdata& /*inputs*/, const StateData& /*stateDataValue*/, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (!isDynamic(sMode)) { // the bus is managing a remote bus voltage @@ -556,7 +556,7 @@ count_t Generator::outputDependencyCount(index_t num, const SolverMode& sMode) c void Generator::ioPartialDerivatives(const IOdata& inputs, const StateData& /*stateDataValue*/, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -695,7 +695,7 @@ void Generator::residual(const IOdata& /*inputs*/, void Generator::jacobianElements(const IOdata& /*inputs*/, const StateData& /*stateDataValue*/, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { @@ -739,7 +739,7 @@ CoreObject* Generator::find(std::string_view object) const return GridComponent::find(object); } -double Generator::getAdjustableCapacityUp(coreTime time) const +double Generator::getAdjustableCapacityUp(CoreTime time) const { if (sched != nullptr) { return (sched->getMax(time) - Pset); @@ -747,7 +747,7 @@ double Generator::getAdjustableCapacityUp(coreTime time) const return Pmax - Pset; } -double Generator::getAdjustableCapacityDown(coreTime time) const +double Generator::getAdjustableCapacityDown(CoreTime time) const { if (sched != nullptr) { return (Pset - sched->getMin(time)); @@ -755,7 +755,7 @@ double Generator::getAdjustableCapacityDown(coreTime time) const return (Pset - Pmin); } -IOdata Generator::predictOutputs(coreTime predictionTime, +IOdata Generator::predictOutputs(CoreTime predictionTime, const IOdata& /*inputs*/, const StateData& /*sD*/, const SolverMode& /*sMode*/) const @@ -773,7 +773,7 @@ IOdata Generator::predictOutputs(coreTime predictionTime, return out; } -double Generator::getPmax(const coreTime time) const +double Generator::getPmax(const CoreTime time) const { if (sched != nullptr) { return sched->getMax(time); @@ -781,7 +781,7 @@ double Generator::getPmax(const coreTime time) const return Pmax; } -double Generator::getQmax(const coreTime /*time*/, double ptest) const +double Generator::getQmax(const CoreTime /*time*/, double ptest) const { if (opFlags[useCapabilityCurve]) { return bounds->getMax((ptest == kNullVal) ? P : ptest); @@ -789,14 +789,14 @@ double Generator::getQmax(const coreTime /*time*/, double ptest) const return Qmax; } -double Generator::getPmin(const coreTime time) const +double Generator::getPmin(const CoreTime time) const { if (sched != nullptr) { return sched->getMin(time); } return Pmin; } -double Generator::getQmin(const coreTime /*time*/, double ptest) const +double Generator::getQmin(const CoreTime /*time*/, double ptest) const { if (opFlags[useCapabilityCurve]) { return bounds->getMin((ptest == kNullVal) ? P : ptest); diff --git a/src/griddyn/generators/IsocController.cpp b/src/griddyn/generators/IsocController.cpp index eee79a3f4..6c717d070 100644 --- a/src/griddyn/generators/IsocController.cpp +++ b/src/griddyn/generators/IsocController.cpp @@ -33,7 +33,7 @@ CoreObject* IsocController::clone(CoreObject* obj) const return nobj; } -void IsocController::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void IsocController::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { gen = dynamic_cast(getParent()); updatePeriod = upPeriod; @@ -65,7 +65,7 @@ void IsocController::setLimits(double minV, double maxV) m_output = gmlc::utilities::valLimit(m_output, minLevel, maxLevel); } -void IsocController::updateA(coreTime time) +void IsocController::updateA(CoreTime time) { if (time < nextUpdateTime) { assert(false); @@ -91,7 +91,7 @@ void IsocController::updateA(coreTime time) // printf("t=%f,output=%f\n", time, m_output); } -void IsocController::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void IsocController::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { prevTime = time; lastFreq = inputs[0]; @@ -142,7 +142,7 @@ void IsocController::deactivate() nextUpdateTime = maxTime; } -void IsocController::activate(coreTime time) +void IsocController::activate(CoreTime time) { nextUpdateTime = time + upPeriod; } diff --git a/src/griddyn/generators/IsocController.h b/src/griddyn/generators/IsocController.h index f0d12158e..e97a918f9 100644 --- a/src/griddyn/generators/IsocController.h +++ b/src/griddyn/generators/IsocController.h @@ -28,15 +28,15 @@ class IsocController: public GridSubModel { public: explicit IsocController(const std::string& objName = "ISOC_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; - virtual void updateA(coreTime time) override; + virtual void updateA(CoreTime time) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void set(std::string_view param, std::string_view val) override; virtual void @@ -53,7 +53,7 @@ class IsocController: public GridSubModel { void setFreq(double freq); void deactivate(); - void activate(coreTime time); + void activate(CoreTime time); }; } // namespace griddyn diff --git a/src/griddyn/generators/VariableGenerator.cpp b/src/griddyn/generators/VariableGenerator.cpp index 821458113..6665576f6 100644 --- a/src/griddyn/generators/VariableGenerator.cpp +++ b/src/griddyn/generators/VariableGenerator.cpp @@ -136,7 +136,7 @@ void VariableGenerator::residual(const IOdata& inputs, } void VariableGenerator::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/generators/VariableGenerator.h b/src/griddyn/generators/VariableGenerator.h index 7d0fcdace..f5a00eb59 100644 --- a/src/griddyn/generators/VariableGenerator.h +++ b/src/griddyn/generators/VariableGenerator.h @@ -32,7 +32,7 @@ class VariableGenerator: public DynamicGenerator { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - // virtual void pFlowObjectInitializeA (coreTime time0, std::uint32_t flags) override; + // virtual void pFlowObjectInitializeA (CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, @@ -54,15 +54,15 @@ class VariableGenerator: public DynamicGenerator { virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual double getAdjustableCapacityUp(coreTime /*time*/ = maxTime) const override + virtual double getAdjustableCapacityUp(CoreTime /*time*/ = maxTime) const override { return 0.0; } // get the available adjustment Up within the specified timeframe - virtual double getAdjustableCapacityDown(coreTime /*time*/ = maxTime) const override + virtual double getAdjustableCapacityDown(CoreTime /*time*/ = maxTime) const override { return 0.0; } // get the available adjustment Up within the specified timeframe diff --git a/src/griddyn/genmodels/GenModel.cpp b/src/griddyn/genmodels/GenModel.cpp index b2bd232e7..5b244f07c 100644 --- a/src/griddyn/genmodels/GenModel.cpp +++ b/src/griddyn/genmodels/GenModel.cpp @@ -11,7 +11,7 @@ #include "core/ObjectFactoryTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" #include "otherGenModels.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include @@ -187,7 +187,7 @@ double GenModel::getOutput(index_t /*numOut*/) const void GenModel::ioPartialDerivatives(const IOdata& inputs, const StateData& /*stateDataValue*/, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& /*sMode*/) { diff --git a/src/griddyn/genmodels/GenModel3.cpp b/src/griddyn/genmodels/GenModel3.cpp index b1ae62ce6..05c489fa6 100644 --- a/src/griddyn/genmodels/GenModel3.cpp +++ b/src/griddyn/genmodels/GenModel3.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::genmodels { @@ -35,7 +35,7 @@ CoreObject* GenModel3::clone(CoreObject* obj) const return gd; } -void GenModel3::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel3::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 3; offsets.local().local.algSize = 2; @@ -145,7 +145,7 @@ void GenModel3::residual(const IOdata& inputs, void GenModel3::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel3.h b/src/griddyn/genmodels/GenModel3.h index 1670cee6d..d23e3554f 100644 --- a/src/griddyn/genmodels/GenModel3.h +++ b/src/griddyn/genmodels/GenModel3.h @@ -22,7 +22,7 @@ class GenModel3: public GenModelClassical { public: explicit GenModel3(const std::string& objName = "genModel3_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -43,7 +43,7 @@ class GenModel3: public GenModelClassical { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void algebraicUpdate(const IOdata& inputs, diff --git a/src/griddyn/genmodels/GenModel4.cpp b/src/griddyn/genmodels/GenModel4.cpp index 50082b06f..6c5f8752d 100644 --- a/src/griddyn/genmodels/GenModel4.cpp +++ b/src/griddyn/genmodels/GenModel4.cpp @@ -9,7 +9,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::genmodels { @@ -27,7 +27,7 @@ CoreObject* GenModel4::clone(CoreObject* obj) const return gd; } -void GenModel4::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel4::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 4; offsets.local().local.algSize = 2; @@ -100,7 +100,7 @@ void GenModel4::residual(const IOdata& inputs, // } } -void GenModel4::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void GenModel4::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { StateData sD(time, m_state.data()); derivative(inputs, sD, m_dstate_dt.data(), cLocalSolverMode); @@ -160,7 +160,7 @@ void GenModel4::derivative(const IOdata& inputs, void GenModel4::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel4.h b/src/griddyn/genmodels/GenModel4.h index f2fea2aac..d5b203b34 100644 --- a/src/griddyn/genmodels/GenModel4.h +++ b/src/griddyn/genmodels/GenModel4.h @@ -7,7 +7,7 @@ #pragma once #include "GenModel3.h" -#include "utilities/saturation.h" +#include "utilities/Saturation.h" #include namespace griddyn::genmodels { class GenModel4: public GenModel3 { @@ -16,11 +16,11 @@ class GenModel4: public GenModel3 { double Tqop = 1.0; //!< [s] q-axis time constant double S10 = 1.0; //!< the saturation S (1.0) const double S12 = 1.0; //!< the saturation S(1.2) - utilities::saturation sat; //!< saturation function object + utilities::Saturation sat; //!< saturation function object public: explicit GenModel4(const std::string& objName = "genModel4_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -31,7 +31,7 @@ class GenModel4: public GenModel3 { virtual stringVec localStateNames() const override; // dynamics - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void residual(const IOdata& inputs, const StateData& sD, double resid[], @@ -42,7 +42,7 @@ class GenModel4: public GenModel3 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; diff --git a/src/griddyn/genmodels/GenModel5.cpp b/src/griddyn/genmodels/GenModel5.cpp index b78541e41..f8d034ba5 100644 --- a/src/griddyn/genmodels/GenModel5.cpp +++ b/src/griddyn/genmodels/GenModel5.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -31,7 +31,7 @@ CoreObject* GenModel5::clone(CoreObject* obj) const return gd; } -void GenModel5::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel5::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 5; offsets.local().local.algSize = 2; @@ -148,7 +148,7 @@ void GenModel5::derivative(const IOdata& inputs, void GenModel5::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel5.h b/src/griddyn/genmodels/GenModel5.h index 4d1491ce4..ea0d2d7a8 100644 --- a/src/griddyn/genmodels/GenModel5.h +++ b/src/griddyn/genmodels/GenModel5.h @@ -22,7 +22,7 @@ class GenModel5: public GenModel4 { public: explicit GenModel5(const std::string& objName = "genModel5_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -43,7 +43,7 @@ class GenModel5: public GenModel4 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void algebraicUpdate(const IOdata& inputs, diff --git a/src/griddyn/genmodels/GenModel5type2.cpp b/src/griddyn/genmodels/GenModel5type2.cpp index 10ab6b006..ee620a53b 100644 --- a/src/griddyn/genmodels/GenModel5type2.cpp +++ b/src/griddyn/genmodels/GenModel5type2.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -26,7 +26,7 @@ CoreObject* GenModel5type2::clone(CoreObject* obj) const return gd; } -void GenModel5type2::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel5type2::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 5; offsets.local().local.algSize = 2; @@ -145,7 +145,7 @@ void GenModel5type2::residual(const IOdata& inputs, void GenModel5type2::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel5type2.h b/src/griddyn/genmodels/GenModel5type2.h index a7d26a928..b9c51c99b 100644 --- a/src/griddyn/genmodels/GenModel5type2.h +++ b/src/griddyn/genmodels/GenModel5type2.h @@ -16,7 +16,7 @@ class GenModel5type2: public GenModel5 { public: explicit GenModel5type2(const std::string& objName = "genModel5type2_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -33,7 +33,7 @@ class GenModel5type2: public GenModel5 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void algebraicUpdate(const IOdata& inputs, diff --git a/src/griddyn/genmodels/GenModel5type3.cpp b/src/griddyn/genmodels/GenModel5type3.cpp index cee78ab0f..4f25c04bf 100644 --- a/src/griddyn/genmodels/GenModel5type3.cpp +++ b/src/griddyn/genmodels/GenModel5type3.cpp @@ -9,7 +9,7 @@ #include "../Generator.h" #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::genmodels { @@ -23,7 +23,7 @@ CoreObject* GenModel5type3::clone(CoreObject* obj) const return gd; } -void GenModel5type3::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel5type3::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 5; offsets.local().local.algSize = 2; @@ -118,7 +118,7 @@ void GenModel5type3::residual(const IOdata& inputs, void GenModel5type3::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel5type3.h b/src/griddyn/genmodels/GenModel5type3.h index 3751a33a2..f04ad9c73 100644 --- a/src/griddyn/genmodels/GenModel5type3.h +++ b/src/griddyn/genmodels/GenModel5type3.h @@ -16,7 +16,7 @@ class GenModel5type3: public GenModel3 { public: explicit GenModel5type3(const std::string& objName = "genModel5type3_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -33,7 +33,7 @@ class GenModel5type3: public GenModel3 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; }; diff --git a/src/griddyn/genmodels/GenModel6.cpp b/src/griddyn/genmodels/GenModel6.cpp index b031d661f..33be0c921 100644 --- a/src/griddyn/genmodels/GenModel6.cpp +++ b/src/griddyn/genmodels/GenModel6.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -32,7 +32,7 @@ CoreObject* GenModel6::clone(CoreObject* obj) const return gd; } -void GenModel6::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel6::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 6; offsets.local().local.algSize = 2; @@ -173,7 +173,7 @@ void GenModel6::residual(const IOdata& inputs, void GenModel6::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel6.h b/src/griddyn/genmodels/GenModel6.h index 04d66b8f7..27019c18b 100644 --- a/src/griddyn/genmodels/GenModel6.h +++ b/src/griddyn/genmodels/GenModel6.h @@ -16,7 +16,7 @@ class GenModel6: public GenModel5 { public: explicit GenModel6(const std::string& objName = "genModel6_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -33,7 +33,7 @@ class GenModel6: public GenModel5 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void algebraicUpdate(const IOdata& inputs, diff --git a/src/griddyn/genmodels/GenModel6type2.cpp b/src/griddyn/genmodels/GenModel6type2.cpp index b461804f6..1c46b514b 100644 --- a/src/griddyn/genmodels/GenModel6type2.cpp +++ b/src/griddyn/genmodels/GenModel6type2.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include @@ -25,7 +25,7 @@ CoreObject* GenModel6type2::clone(CoreObject* obj) const return gd; } -void GenModel6type2::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel6type2::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 6; offsets.local().local.algSize = 2; @@ -154,7 +154,7 @@ void GenModel6type2::residual(const IOdata& inputs, void GenModel6type2::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel6type2.h b/src/griddyn/genmodels/GenModel6type2.h index b951eb429..7d732023a 100644 --- a/src/griddyn/genmodels/GenModel6type2.h +++ b/src/griddyn/genmodels/GenModel6type2.h @@ -16,7 +16,7 @@ class GenModel6type2: public GenModel5type2 { public: explicit GenModel6type2(const std::string& objName = "genModel6type2_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -33,7 +33,7 @@ class GenModel6type2: public GenModel5type2 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void algebraicUpdate(const IOdata& inputs, diff --git a/src/griddyn/genmodels/GenModel8.cpp b/src/griddyn/genmodels/GenModel8.cpp index e0193d601..b0115ebca 100644 --- a/src/griddyn/genmodels/GenModel8.cpp +++ b/src/griddyn/genmodels/GenModel8.cpp @@ -9,7 +9,7 @@ #include "../Generator.h" #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::genmodels { @@ -23,7 +23,7 @@ CoreObject* GenModel8::clone(CoreObject* obj) const return gd; } -void GenModel8::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModel8::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 8; offsets.local().local.algSize = 2; @@ -139,7 +139,7 @@ void GenModel8::residual(const IOdata& inputs, void GenModel8::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModel8.h b/src/griddyn/genmodels/GenModel8.h index e0db1729f..7eab03b2d 100644 --- a/src/griddyn/genmodels/GenModel8.h +++ b/src/griddyn/genmodels/GenModel8.h @@ -16,7 +16,7 @@ class GenModel8: public GenModel6 { public: explicit GenModel8(const std::string& objName = "genModel8_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -33,7 +33,7 @@ class GenModel8: public GenModel6 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; }; diff --git a/src/griddyn/genmodels/GenModelClassical.cpp b/src/griddyn/genmodels/GenModelClassical.cpp index 9850b62fd..257ec097b 100644 --- a/src/griddyn/genmodels/GenModelClassical.cpp +++ b/src/griddyn/genmodels/GenModelClassical.cpp @@ -12,7 +12,7 @@ #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactory.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -37,7 +37,7 @@ CoreObject* GenModelClassical::clone(CoreObject* obj) const return gd; } -void GenModelClassical::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModelClassical::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 2; offsets.local().local.algSize = 2; @@ -301,7 +301,7 @@ double GenModelClassical::getOutput(const IOdata& inputs, void GenModelClassical::ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -324,7 +324,7 @@ void GenModelClassical::ioPartialDerivatives(const IOdata& inputs, void GenModelClassical::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -400,7 +400,7 @@ rv[1] = Vq + Rs*gm[1] - (Xdp - Xl)*gm[0]; void GenModelClassical::outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) { auto Loc = offsets.getLocations(sD, sMode, this); diff --git a/src/griddyn/genmodels/GenModelClassical.h b/src/griddyn/genmodels/GenModelClassical.h index 7705f4ffa..7f3485a6f 100644 --- a/src/griddyn/genmodels/GenModelClassical.h +++ b/src/griddyn/genmodels/GenModelClassical.h @@ -27,7 +27,7 @@ class GenModelClassical: public GenModel { explicit GenModelClassical(const std::string& objName = "genModelClassic_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -59,18 +59,18 @@ class GenModelClassical: public GenModel { virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; diff --git a/src/griddyn/genmodels/GenModelGENROU.cpp b/src/griddyn/genmodels/GenModelGENROU.cpp index c4051addf..5f3bc41ce 100644 --- a/src/griddyn/genmodels/GenModelGENROU.cpp +++ b/src/griddyn/genmodels/GenModelGENROU.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -35,7 +35,7 @@ CoreObject* GenModelGENROU::clone(CoreObject* obj) const return gd; } -void GenModelGENROU::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModelGENROU::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.diffSize = 6; offsets.local().local.algSize = 2; @@ -197,7 +197,7 @@ void GenModelGENROU::residual(const IOdata& inputs, void GenModelGENROU::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/genmodels/GenModelGENROU.h b/src/griddyn/genmodels/GenModelGENROU.h index cbabce9b3..569c10387 100644 --- a/src/griddyn/genmodels/GenModelGENROU.h +++ b/src/griddyn/genmodels/GenModelGENROU.h @@ -15,7 +15,7 @@ class GenModelGENROU: public GenModel5 { public: explicit GenModelGENROU(const std::string& objName = "genrou_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -32,7 +32,7 @@ class GenModelGENROU: public GenModel5 { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void algebraicUpdate(const IOdata& inputs, diff --git a/src/griddyn/genmodels/GenModelInverter.cpp b/src/griddyn/genmodels/GenModelInverter.cpp index 9c97106e5..4cd5ccc7b 100644 --- a/src/griddyn/genmodels/GenModelInverter.cpp +++ b/src/griddyn/genmodels/GenModelInverter.cpp @@ -11,7 +11,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -33,7 +33,7 @@ CoreObject* GenModelInverter::clone(CoreObject* obj) const return genModelClone; } -void GenModelInverter::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GenModelInverter::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { offsets.local().local.algSize = 1; offsets.local().local.jacSize = 4; @@ -236,7 +236,7 @@ double GenModelInverter::getOutput(const IOdata& inputs, void GenModelInverter::ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -274,7 +274,7 @@ void GenModelInverter::ioPartialDerivatives(const IOdata& inputs, void GenModelInverter::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -315,7 +315,7 @@ void GenModelInverter::jacobianElements(const IOdata& inputs, void GenModelInverter::outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (!hasAlgebraic(sMode)) { @@ -426,7 +426,7 @@ void GenModelInverter::rootTest(const IOdata& inputs, } } -void GenModelInverter::rootTrigger(coreTime /*time*/, +void GenModelInverter::rootTrigger(CoreTime /*time*/, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/genmodels/GenModelInverter.h b/src/griddyn/genmodels/GenModelInverter.h index 3cccc77e5..b289e0872 100644 --- a/src/griddyn/genmodels/GenModelInverter.h +++ b/src/griddyn/genmodels/GenModelInverter.h @@ -25,7 +25,7 @@ class GenModelInverter: public GenModel { explicit GenModelInverter(const std::string& objName = "genModel_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -54,17 +54,17 @@ class GenModelInverter: public GenModel { virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; @@ -85,7 +85,7 @@ class GenModelInverter: public GenModel { const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; diff --git a/src/griddyn/governors/Governor.cpp b/src/griddyn/governors/Governor.cpp index cc4d97fef..66880ad43 100644 --- a/src/griddyn/governors/Governor.cpp +++ b/src/griddyn/governors/Governor.cpp @@ -10,7 +10,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactoryTemplates.hpp" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/MatrixDataSparse.hpp" #include #include @@ -86,7 +86,7 @@ CoreObject* Governor::clone(CoreObject* obj) const // destructor Governor::~Governor() = default; -void Governor::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Governor::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { prevTime = time0; if (Wref < 0) { @@ -145,7 +145,7 @@ void Governor::residual(const IOdata& inputs, dbb.getBlockOutput(sD, sMode) + inputs[govpSetInLocation], 0, sD, resid, sMode); } -void Governor::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void Governor::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { double out = cb.step(time, inputs[govOmegaInLocation]); @@ -166,14 +166,14 @@ void Governor::derivative(const IOdata& inputs, void Governor::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { cb.blockJacobianElements( inputs[govOmegaInLocation], 0, sD, md, inputLocs[govOmegaInLocation], sMode); - matrixDataSparse kp; + MatrixDataSparse kp; index_t wloc = cb.getOutputLoc(sMode); double out = cb.getOutput(kNullVec, sD, sMode); dbb.blockJacobianElements(out, 0, sD, md, wloc, sMode); @@ -204,7 +204,7 @@ void Governor::jacobianElements(const IOdata& inputs, } /* - copyReplicate(matrixDataSparse *a2, index_t origCol, std::vector + copyReplicate(MatrixDataSparse *a2, index_t origCol, std::vector newIndices, std::vector mult) auto res = a2->dVec.begin(); auto term = a2->dVec.end(); diff --git a/src/griddyn/governors/GovernorHydro.cpp b/src/griddyn/governors/GovernorHydro.cpp index 29e94d498..73882dff3 100644 --- a/src/griddyn/governors/GovernorHydro.cpp +++ b/src/griddyn/governors/GovernorHydro.cpp @@ -9,7 +9,7 @@ #include "../Generator.h" #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include namespace griddyn::governors { @@ -77,7 +77,7 @@ void GovernorHydro::residual(const IOdata& /*inputs*/, void GovernorHydro::jacobianElements(const IOdata& /*inputs*/, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { diff --git a/src/griddyn/governors/GovernorHydro.h b/src/griddyn/governors/GovernorHydro.h index dae3cecf4..de88a8ddc 100644 --- a/src/griddyn/governors/GovernorHydro.h +++ b/src/griddyn/governors/GovernorHydro.h @@ -36,7 +36,7 @@ class GovernorHydro: public GovernorIeeeSimple { virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; }; diff --git a/src/griddyn/governors/GovernorIeeeSimple.cpp b/src/griddyn/governors/GovernorIeeeSimple.cpp index af2b7f5ce..9b42721fd 100644 --- a/src/griddyn/governors/GovernorIeeeSimple.cpp +++ b/src/griddyn/governors/GovernorIeeeSimple.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactory.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -48,7 +48,7 @@ CoreObject* GovernorIeeeSimple::clone(CoreObject* obj) const // destructor GovernorIeeeSimple::~GovernorIeeeSimple() = default; -void GovernorIeeeSimple::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void GovernorIeeeSimple::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { Governor::dynObjectInitializeA(time0, flags); if ((Pmax < 5000) || (Pmin > -5000)) { @@ -106,7 +106,7 @@ void GovernorIeeeSimple::derivative(const IOdata& inputs, Loc.destDiffLoc[1] = (-gs[1] + (1 - T2 / T1) * (omega - 1.0)) / T1; } -void GovernorIeeeSimple::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void GovernorIeeeSimple::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { GovernorIeeeSimple::derivative(inputs, emptyStateData, m_dstate_dt.data(), cLocalSolverMode); double dt = time - prevTime; @@ -126,7 +126,7 @@ void GovernorIeeeSimple::timestep(coreTime time, const IOdata& inputs, const Sol void GovernorIeeeSimple::jacobianElements(const IOdata& /*inputs*/, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -214,7 +214,7 @@ void GovernorIeeeSimple::rootTest(const IOdata& inputs, } } -void GovernorIeeeSimple::rootTrigger(coreTime /*time*/, +void GovernorIeeeSimple::rootTrigger(CoreTime /*time*/, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/governors/GovernorIeeeSimple.h b/src/griddyn/governors/GovernorIeeeSimple.h index 18f89d883..703dc2cd1 100644 --- a/src/griddyn/governors/GovernorIeeeSimple.h +++ b/src/griddyn/governors/GovernorIeeeSimple.h @@ -24,7 +24,7 @@ class GovernorIeeeSimple: public Governor { explicit GovernorIeeeSimple(const std::string& objName = "govIeeeSimple_#"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; virtual ~GovernorIeeeSimple(); - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -43,19 +43,19 @@ class GovernorIeeeSimple: public Governor { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; - // virtual void setTime(coreTime time){prevTime=time;}; + // virtual void setTime(CoreTime time){prevTime=time;}; }; } // namespace griddyn::governors diff --git a/src/griddyn/governors/GovernorReheat.cpp b/src/griddyn/governors/GovernorReheat.cpp index 41f8740eb..96bd52776 100644 --- a/src/griddyn/governors/GovernorReheat.cpp +++ b/src/griddyn/governors/GovernorReheat.cpp @@ -10,7 +10,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactory.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include namespace griddyn::governors { @@ -125,7 +125,7 @@ void GovernorReheat::derivative(const IOdata& inputs, void GovernorReheat::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/governors/GovernorReheat.h b/src/griddyn/governors/GovernorReheat.h index 354b342ef..f3b2dc00f 100644 --- a/src/griddyn/governors/GovernorReheat.h +++ b/src/griddyn/governors/GovernorReheat.h @@ -37,11 +37,11 @@ class GovernorReheat: public Governor { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - // virtual void setTime (coreTime time) const{prevTime=time;}; + // virtual void setTime (CoreTime time) const{prevTime=time;}; }; } // namespace griddyn::governors diff --git a/src/griddyn/governors/GovernorSteamNR.cpp b/src/griddyn/governors/GovernorSteamNR.cpp index fdbf1ed9e..797b7da58 100644 --- a/src/griddyn/governors/GovernorSteamNR.cpp +++ b/src/griddyn/governors/GovernorSteamNR.cpp @@ -8,7 +8,7 @@ #include "../Generator.h" #include "../GridBus.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include namespace griddyn::governors { @@ -81,7 +81,7 @@ void GovernorSteamNR::residual(const IOdata& /*inputs*/, void GovernorSteamNR::jacobianElements(const IOdata& /*inputs*/, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { diff --git a/src/griddyn/governors/GovernorSteamNR.h b/src/griddyn/governors/GovernorSteamNR.h index 5413cd795..2076e994f 100644 --- a/src/griddyn/governors/GovernorSteamNR.h +++ b/src/griddyn/governors/GovernorSteamNR.h @@ -34,7 +34,7 @@ class GovernorSteamNR: public GovernorIeeeSimple { // only called if the genModel is not present virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; }; diff --git a/src/griddyn/governors/GovernorSteamTCSR.cpp b/src/griddyn/governors/GovernorSteamTCSR.cpp index 66f662c46..73176e631 100644 --- a/src/griddyn/governors/GovernorSteamTCSR.cpp +++ b/src/griddyn/governors/GovernorSteamTCSR.cpp @@ -8,7 +8,7 @@ #include "../Generator.h" #include "../GridBus.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include namespace griddyn::governors { GovernorSteamTCSR::GovernorSteamTCSR(const std::string& objName): GovernorSteamNR(objName) @@ -78,7 +78,7 @@ void GovernorSteamTCSR::residual(const IOdata& /*inputs*/, void GovernorSteamTCSR::jacobianElements(const IOdata& /*inputs*/, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { diff --git a/src/griddyn/governors/GovernorSteamTCSR.h b/src/griddyn/governors/GovernorSteamTCSR.h index a5e12b220..37a9f5e14 100644 --- a/src/griddyn/governors/GovernorSteamTCSR.h +++ b/src/griddyn/governors/GovernorSteamTCSR.h @@ -39,7 +39,7 @@ class GovernorSteamTCSR: public GovernorSteamNR { virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; }; diff --git a/src/griddyn/governors/GovernorTgov1.cpp b/src/griddyn/governors/GovernorTgov1.cpp index 89dafd7be..52e549b60 100644 --- a/src/griddyn/governors/GovernorTgov1.cpp +++ b/src/griddyn/governors/GovernorTgov1.cpp @@ -9,7 +9,7 @@ #include "../Generator.h" #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -99,7 +99,7 @@ void GovernorTgov1::derivative(const IOdata& inputs, Loc.destDiffLoc[0] = (Loc.diffStateLoc[1] - Loc.diffStateLoc[0] - T2 * Loc.destDiffLoc[1]) / T3; } -void GovernorTgov1::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void GovernorTgov1::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { GovernorTgov1::derivative(inputs, emptyStateData, m_dstate_dt.data(), cLocalSolverMode); double dt = time - prevTime; @@ -114,7 +114,7 @@ void GovernorTgov1::timestep(coreTime time, const IOdata& inputs, const SolverMo void GovernorTgov1::jacobianElements(const IOdata& /*inputs*/, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -202,7 +202,7 @@ void GovernorTgov1::rootTest(const IOdata& inputs, } } -void GovernorTgov1::rootTrigger(coreTime /*time*/, +void GovernorTgov1::rootTrigger(CoreTime /*time*/, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/governors/GovernorTgov1.h b/src/griddyn/governors/GovernorTgov1.h index 4735b2be2..339e8e381 100644 --- a/src/griddyn/governors/GovernorTgov1.h +++ b/src/griddyn/governors/GovernorTgov1.h @@ -38,15 +38,15 @@ class GovernorTgov1: public GovernorIeeeSimple { const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; diff --git a/src/griddyn/links/AcDcConverter.cpp b/src/griddyn/links/AcDcConverter.cpp index 59d096004..d43529333 100644 --- a/src/griddyn/links/AcDcConverter.cpp +++ b/src/griddyn/links/AcDcConverter.cpp @@ -13,7 +13,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/MatrixDataSparse.hpp" #include #include #include @@ -110,7 +110,7 @@ CoreObject* AcDcConverter::clone(CoreObject* obj) const return nobj; } -void AcDcConverter::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void AcDcConverter::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { // TODO(phlpt): This function is incorrect. if (!isEnabled()) { @@ -242,7 +242,7 @@ void AcDcConverter::set(std::string_view param, double val, unit unitType) } } -void AcDcConverter::pFlowObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void AcDcConverter::pFlowObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { const double voltage1 = B1->getVoltage(); const double voltage2 = B2->getVoltage(); @@ -257,7 +257,7 @@ void AcDcConverter::pFlowObjectInitializeA(coreTime /*time0*/, std::uint32_t /*f offsets.local().local.jacSize = 4; } -void AcDcConverter::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void AcDcConverter::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { updateLocalCache(); if (opFlags[FIXED_TARGET_POWER]) { @@ -299,7 +299,7 @@ void AcDcConverter::dynObjectInitializeB(const IOdata& /*inputs*/, void AcDcConverter::ioPartialDerivatives(id_type_t busId, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -364,7 +364,7 @@ linkInfo.Q1 = -std::sqrt(sr*sr - linkInfo.P1*linkInfo.P1); void AcDcConverter::outputPartialDerivatives(const IOdata& /*inputs*/, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (!(isEnabled())) { @@ -387,7 +387,7 @@ void AcDcConverter::outputPartialDerivatives(const IOdata& /*inputs*/, } void AcDcConverter::outputPartialDerivatives(id_type_t busId, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (!(isEnabled())) { @@ -470,7 +470,7 @@ count_t AcDcConverter::outputDependencyCount(index_t /*num*/, const SolverMode& void AcDcConverter::jacobianElements(const IOdata& /*inputs*/, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { @@ -486,8 +486,8 @@ void AcDcConverter::jacobianElements(const IOdata& /*inputs*/, IOdata controlSignalInput{linkInfo.v2 - vTarget}; index_t refLoc; - matrixDataSparse translatedAngleJacobian; - matrixDataSparse translatedInputJacobian; + MatrixDataSparse translatedAngleJacobian; + MatrixDataSparse translatedInputJacobian; if (refAlg != kNullLocation) { if (controlMode == ControlMode::VOLTAGE) { @@ -604,7 +604,7 @@ void AcDcConverter::residual(const IOdata& inputs, } } -void AcDcConverter::setState(coreTime time, +void AcDcConverter::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -630,7 +630,7 @@ void AcDcConverter::setState(coreTime time, updateLocalCache(); } -void AcDcConverter::guessState(coreTime time, +void AcDcConverter::guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) diff --git a/src/griddyn/links/AcDcConverter.h b/src/griddyn/links/AcDcConverter.h index 37fb95aed..72398f01e 100644 --- a/src/griddyn/links/AcDcConverter.h +++ b/src/griddyn/links/AcDcConverter.h @@ -75,14 +75,14 @@ namespace links { virtual void updateLocalCache(const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode) override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; virtual void - timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual double quickupdateP() override { return 0; } @@ -91,39 +91,39 @@ namespace links { set(std::string_view param, double val, units::unit unitType = units::defunit) override; // dynInitializeB dynamics - // virtual void dynObjectInitializeA (coreTime time0, std::uint32_t flags); + // virtual void dynObjectInitializeA (CoreTime time0, std::uint32_t flags); using Link::ioPartialDerivatives; virtual void ioPartialDerivatives(id_type_t busId, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual void outputPartialDerivatives(id_type_t busId, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void residual(const IOdata& inputs, const StateData& stateDataValue, double resid[], const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; diff --git a/src/griddyn/links/AcLine.cpp b/src/griddyn/links/AcLine.cpp index 48e9267a8..f968b6a1c 100644 --- a/src/griddyn/links/AcLine.cpp +++ b/src/griddyn/links/AcLine.cpp @@ -16,7 +16,7 @@ #include "core/ObjectInterpreter.h" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixDataCompact.hpp" +#include "utilities/MatrixDataCompact.hpp" #include #include #include @@ -139,7 +139,7 @@ double AcLine::quickupdateP() return linkFlows.P1; } -void AcLine::timestep(const coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void AcLine::timestep(const CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { if (!isEnabled()) { return; @@ -453,7 +453,7 @@ int AcLine::fixPower(double rPower, (std::abs(linkFlows.P2 - valp) + std::abs(linkFlows.Q2 - valq)); double pErr = err; - matrixDataCompact<2, 2> md; + MatrixDataCompact<2, 2> md; double dP; double dQ; double dA; @@ -575,7 +575,7 @@ int AcLine::fixPower(double rPower, void AcLine::ioPartialDerivatives(id_type_t busId, const StateData& /*sD*/, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -624,7 +624,7 @@ void AcLine::ioPartialDerivatives(id_type_t busId, void AcLine::outputPartialDerivatives(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const SolverMode& /*sMode*/) { // there are theoretically 4 outputs for a standard ac line, but no internal states therefore @@ -633,7 +633,7 @@ void AcLine::outputPartialDerivatives(const IOdata& /*inputs*/, void AcLine::outputPartialDerivatives(id_type_t busId, const StateData& /*sD*/, - matrixData& md, + MatrixData& md, const SolverMode& sMode) { if (!isConnected()) { // if there is no connection there is no coupling @@ -727,7 +727,7 @@ double AcLine::getMaxTransfer() const return (std::abs(b / tap)); } -void AcLine::setState(coreTime time, +void AcLine::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) diff --git a/src/griddyn/links/AcLine.h b/src/griddyn/links/AcLine.h index 64d0ea008..4c015228b 100644 --- a/src/griddyn/links/AcLine.h +++ b/src/griddyn/links/AcLine.h @@ -155,7 +155,7 @@ class AcLine: public Link { const StateData& sD, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** @brief do a quick update (may be deprecated) * @return the power transfer */ @@ -179,23 +179,23 @@ class AcLine: public Link { using Link::ioPartialDerivatives; virtual void ioPartialDerivatives(id_type_t busId, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual void outputPartialDerivatives(id_type_t busId, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual double getMaxTransfer() const override; // virtual void busResidual(index_t busId, const StateData&sD, double *Fp, double *Fq, const // SolverMode &sMode); - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; diff --git a/src/griddyn/links/AdjustableTransformer.cpp b/src/griddyn/links/AdjustableTransformer.cpp index 80708ace2..881dc5220 100644 --- a/src/griddyn/links/AdjustableTransformer.cpp +++ b/src/griddyn/links/AdjustableTransformer.cpp @@ -14,8 +14,8 @@ #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" #include "griddyn/griddyn-config.h" -#include "utilities/matrixData.hpp" -#include "utilities/matrixDataTranslate.hpp" +#include "utilities/MatrixData.hpp" +#include "utilities/MatrixDataTranslate.hpp" #include #include #include @@ -408,7 +408,7 @@ void AdjustableTransformer::followNetwork(int network, std::queue& stk } } -void AdjustableTransformer::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void AdjustableTransformer::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (cMode != ControlMode::MANUAL_CONTROL) { if (cMode == ControlMode::VOLTAGE_CONTROL) { @@ -769,7 +769,7 @@ ChangeCode AdjustableTransformer::powerFlowAdjust(const IOdata& /*inputs*/, return ret; } -void AdjustableTransformer::guessState(coreTime /*time*/, +void AdjustableTransformer::guessState(CoreTime /*time*/, double state[], double dstateDt[], const SolverMode& sMode) @@ -790,7 +790,7 @@ void AdjustableTransformer::guessState(coreTime /*time*/, void AdjustableTransformer::ioPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -808,13 +808,13 @@ void AdjustableTransformer::ioPartialDerivatives(id_type_t busId, void AdjustableTransformer::outputPartialDerivatives(const IOdata& inputs, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) { // if the terminal is not specified assume there are 4 outputs if ((!(isDynamic(sMode))) && (opFlags[has_pflow_states])) { auto offset = offsets.getAlgOffset(sMode); - matrixDataTranslate<2> mtrans(matrixDataRef); + MatrixDataTranslate<2> mtrans(matrixDataRef); mtrans.setTranslation(0, 2); mtrans.setTranslation(1, 3); if (cMode == ControlMode::MW_CONTROL) { @@ -833,7 +833,7 @@ void AdjustableTransformer::outputPartialDerivatives(const IOdata& inputs, void AdjustableTransformer::outputPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) { if ((!(isDynamic(sMode))) && (opFlags[has_pflow_states])) { @@ -852,7 +852,7 @@ void AdjustableTransformer::outputPartialDerivatives(id_type_t busId, void AdjustableTransformer::jacobianElements(const IOdata& /*inputs*/, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { @@ -936,7 +936,7 @@ void AdjustableTransformer::residual(const IOdata& /*inputs*/, } } -void AdjustableTransformer::setState(coreTime time, +void AdjustableTransformer::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -959,7 +959,7 @@ void AdjustableTransformer::setState(coreTime time, AcLine::setState(time, state, dstateDt, sMode); } -void AdjustableTransformer::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void AdjustableTransformer::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { AcLine::dynObjectInitializeA(time0, flags); } @@ -1023,7 +1023,7 @@ void AdjustableTransformer::rootTest(const IOdata& /*inputs*/, } } -void AdjustableTransformer::rootTrigger(coreTime /*time*/, +void AdjustableTransformer::rootTrigger(CoreTime /*time*/, const IOdata& /*inputs*/, const std::vector& /*rootMask*/, const SolverMode& /*sMode*/) @@ -1056,7 +1056,7 @@ void AdjustableTransformer::rootTrigger(coreTime /*time*/, void AdjustableTransformer::tapAnglePartial(index_t busId, const StateData& /*sD*/, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) { if (!(isEnabled())) { @@ -1095,7 +1095,7 @@ void AdjustableTransformer::tapAnglePartial(index_t busId, void AdjustableTransformer::tapPartial(index_t busId, const StateData& /*sD*/, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) { if (!(isEnabled())) { @@ -1143,7 +1143,7 @@ void AdjustableTransformer::tapPartial(index_t busId, } void AdjustableTransformer::MWJac(const StateData& /*sD*/, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) { if (!(isEnabled())) { @@ -1187,7 +1187,7 @@ void AdjustableTransformer::MWJac(const StateData& /*sD*/, } void AdjustableTransformer::MVarJac(const StateData& /*sD*/, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) { if (!(isEnabled())) { diff --git a/src/griddyn/links/AdjustableTransformer.h b/src/griddyn/links/AdjustableTransformer.h index c58f84722..c7bbd9985 100644 --- a/src/griddyn/links/AdjustableTransformer.h +++ b/src/griddyn/links/AdjustableTransformer.h @@ -122,7 +122,7 @@ which cases the parent of the link is searched for the bus*/ void jacobianElements(const IOdata& inputs, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const IOlocs& inputLocs, const SolverMode& sMode) override; // for computing all the Jacobian elements at once @@ -130,16 +130,16 @@ which cases the parent of the link is searched for the bus*/ using AcLine::ioPartialDerivatives; virtual void ioPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) override; virtual void outputPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; @@ -147,11 +147,11 @@ which cases the parent of the link is searched for the bus*/ const StateData& stateData, double resid[], const SolverMode& sMode) override; - void setState(coreTime time, + void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; - void guessState(coreTime time, + void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; @@ -159,15 +159,15 @@ which cases the parent of the link is searched for the bus*/ virtual count_t localJacobianCount(const SolverMode& sMode) const override; protected: - void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; public: void rootTest(const IOdata& inputs, const StateData& stateData, double roots[], const SolverMode& sMode) override; - void rootTrigger(coreTime time, + void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -178,36 +178,36 @@ which cases the parent of the link is searched for the bus*/ protected: /** @brief compute the Jacobian elements based on the MW control -@param[in] StateData the StateData of the current state of the system -@param[out] matrixDataRef the matrixData object to store the Jacobian information +@param[in] stateData the StateData of the current state of the system +@param[out] matrixDataRef the MatrixData object to store the Jacobian information @param[in] sMode the SolverMode corresponding to the StateData*/ void MWJac(const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode); /** @brief compute the Jacobian elements based on the MVar control -@param[in] StateData the StateData of the current state of the system -@param[out] matrixDataRef the matrixData object to store the Jacobian information +@param[in] stateData the StateData of the current state of the system +@param[out] matrixDataRef the MatrixData object to store the Jacobian information @param[in] sMode the SolverMode corresponding to the StateData*/ void MVarJac(const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode); /** @brief compute the partial derivatives of the power flows based on the tap angle @param[in] busId the id of the calling bus either 1 or 2 or a busID of one of the attached buses -@param[in] StateData the StateData of the current state of the system -@param[out] matrixDataRef the matrixData object to store the Jacobian information +@param[in] stateData the StateData of the current state of the system +@param[out] matrixDataRef the MatrixData object to store the Jacobian information @param[in] sMode the SolverMode corresponding to the StateData*/ void tapAnglePartial(index_t busId, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode); /** @brief compute the partial derivatives of the power flows based on the tap setting @param[in] busId the id of the calling bus either 1 or 2 or a busID of one of the attached buses -@param[in] StateData the StateData of the current state of the system -@param[out] matrixDataRef the matrixData object to store the Jacobian information +@param[in] stateData the StateData of the current state of the system +@param[out] matrixDataRef the MatrixData object to store the Jacobian information @param[in] sMode the SolverMode corresponding to the StateData*/ void tapPartial(index_t busId, const StateData& stateData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode); /** @brief do any stepped adjustments based on voltage control from the power flow calculations diff --git a/src/griddyn/links/DcLink.cpp b/src/griddyn/links/DcLink.cpp index 281c9d996..38dee8b6e 100644 --- a/src/griddyn/links/DcLink.cpp +++ b/src/griddyn/links/DcLink.cpp @@ -45,7 +45,7 @@ CoreObject* DcLink::clone(CoreObject* obj) const return nobj; } -void DcLink::timestep(coreTime /*time*/, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void DcLink::timestep(CoreTime /*time*/, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { if (!isEnabled()) { return; @@ -101,7 +101,7 @@ void DcLink::set(std::string_view param, double val, unit unitType) } } -void DcLink::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void DcLink::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { Link::pFlowObjectInitializeA(time0, flags); if (isEnabled()) { @@ -121,7 +121,7 @@ void DcLink::pFlowObjectInitializeB() } } -void DcLink::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void DcLink::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { m_dstate_dt.resize(1); m_state.resize(1); @@ -165,7 +165,7 @@ count_t DcLink::localJacobianCount(const SolverMode& sMode) const void DcLink::ioPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -184,7 +184,7 @@ void DcLink::ioPartialDerivatives(id_type_t busId, void DcLink::outputPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const SolverMode& sMode) { if (!(isEnabled())) { @@ -234,7 +234,7 @@ count_t DcLink::outputDependencyCount(index_t num, const SolverMode& /*sMode*/) void DcLink::jacobianElements(const IOdata& /*inputs*/, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { @@ -284,7 +284,7 @@ void DcLink::residual(const IOdata& inputs, } } -void DcLink::setState(coreTime time, +void DcLink::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -303,7 +303,7 @@ void DcLink::setState(coreTime time, prevTime = time; } -void DcLink::guessState(const coreTime /*time*/, +void DcLink::guessState(const CoreTime /*time*/, double state[], double dstateDt[], const SolverMode& sMode) diff --git a/src/griddyn/links/DcLink.h b/src/griddyn/links/DcLink.h index 276d6f4a4..d2731875e 100644 --- a/src/griddyn/links/DcLink.h +++ b/src/griddyn/links/DcLink.h @@ -37,15 +37,15 @@ class DcLink: public Link { const SolverMode& sMode) override; virtual double getMaxTransfer() const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual StateSizes localStateSizes(const SolverMode& sMode) const override; virtual count_t localJacobianCount(const SolverMode& sMode) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual double quickupdateP() override { return 0; } @@ -54,34 +54,34 @@ class DcLink: public Link { set(std::string_view param, double val, units::unit unitType = units::defunit) override; // dynInitializeB dynamics - // virtual void dynObjectInitializeA (coreTime time0, std::uint32_t flags); + // virtual void dynObjectInitializeA (CoreTime time0, std::uint32_t flags); using Link::ioPartialDerivatives; virtual void ioPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& inputLocs, const SolverMode& sMode) override; using Link::outputPartialDerivatives; virtual void outputPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void residual(const IOdata& inputs, const StateData& stateData, double resid[], const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; diff --git a/src/griddyn/links/Link.cpp b/src/griddyn/links/Link.cpp index 977ae3be0..29aaf59c9 100644 --- a/src/griddyn/links/Link.cpp +++ b/src/griddyn/links/Link.cpp @@ -18,7 +18,7 @@ #include "core/ObjectInterpreter.h" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixDataCompact.hpp" +#include "utilities/MatrixDataCompact.hpp" #include #include #include @@ -163,7 +163,7 @@ double Link::quickupdateP() { return Pset; } -void Link::timestep(const coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void Link::timestep(const CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { if (!isEnabled()) { return; @@ -417,7 +417,7 @@ double Link::get(std::string_view param, unit unitType) const return val; } -void Link::pFlowObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void Link::pFlowObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { if (B1 == nullptr) { opFlags.set(SWITCH1_OPEN_FLAG); @@ -456,7 +456,7 @@ int Link::fixPower(double rPower, return fixRealPower(rPower, measureTerminal, fixedTerminal, unitType); } -void Link::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void Link::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { if ((B1 == nullptr || !B1->isEnabled()) || (B2 == nullptr || !B2->isEnabled())) { disable(); @@ -476,7 +476,7 @@ void Link::computePowers() void Link::ioPartialDerivatives(id_type_t /*busId*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const IOlocs& /*inputLocs*/, const SolverMode& /*sMode*/) { @@ -484,7 +484,7 @@ void Link::ioPartialDerivatives(id_type_t /*busId*/, void Link::outputPartialDerivatives(id_type_t /*busId*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const SolverMode& /*sMode*/) { } @@ -613,7 +613,7 @@ double Link::getVoltage(id_type_t busId) const return B1->getVoltage(); } -void Link::setState(coreTime time, +void Link::setState(CoreTime time, const double /*state*/[], const double /*dstate_dt*/[], const SolverMode& /*sMode*/) diff --git a/src/griddyn/links/LongLine.cpp b/src/griddyn/links/LongLine.cpp index 2f41737b2..f121f37dc 100644 --- a/src/griddyn/links/LongLine.cpp +++ b/src/griddyn/links/LongLine.cpp @@ -33,7 +33,7 @@ void LongLine::add(CoreObject* /*obj*/) } // remove components void LongLine::remove(CoreObject* /*obj*/) {} -void LongLine::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void LongLine::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { generateIntermediateLinks(); Subsystem::pFlowObjectInitializeA(time0, flags); diff --git a/src/griddyn/links/LongLine.h b/src/griddyn/links/LongLine.h index 4244bf8bd..ae1c5728e 100644 --- a/src/griddyn/links/LongLine.h +++ b/src/griddyn/links/LongLine.h @@ -35,7 +35,7 @@ class LongLine: public Subsystem { virtual void remove(CoreObject* obj) override final; // there shouldn't be any removes all models are controlled internally - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void set(std::string_view param, std::string_view val) override; virtual void diff --git a/src/griddyn/links/Subsystem.cpp b/src/griddyn/links/Subsystem.cpp index 46b76caa2..625fc15c1 100644 --- a/src/griddyn/links/Subsystem.cpp +++ b/src/griddyn/links/Subsystem.cpp @@ -134,7 +134,7 @@ void Subsystem::reset(ResetLevels level) subarea.reset(level); } // dynInitializeB states -void Subsystem::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void Subsystem::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // make sure the buses are set to the right terminal for (index_t ii = 0; ii < m_terminals; ++ii) { @@ -167,12 +167,12 @@ void Subsystem::pFlowCheck(std::vector& violationVector) subarea.pFlowCheck(violationVector); } // dynInitializeB states for dynamic solution -void Subsystem::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Subsystem::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { subarea.dynInitializeA(time0, flags); } -void Subsystem::converge(coreTime time, +void Subsystem::converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -304,7 +304,7 @@ double Subsystem::get(std::string_view param, unit unitType) const return val; } -void Subsystem::timestep(const coreTime time, const IOdata& inputs, const SolverMode& sMode) +void Subsystem::timestep(const CoreTime time, const IOdata& inputs, const SolverMode& sMode) { subarea.timestep(time, inputs, sMode); prevTime = time; @@ -323,7 +323,7 @@ double Subsystem::getLoss() const // -------------------- Power Flow -------------------- // pass the solution -void Subsystem::setState(const coreTime time, +void Subsystem::setState(const CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -567,7 +567,7 @@ double Subsystem::getMaxTransfer() const // for computing all the Jacobian elements at once void Subsystem::ioPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -585,7 +585,7 @@ void Subsystem::ioPartialDerivatives(id_type_t busId, void Subsystem::outputPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const SolverMode& sMode) { if (busId <= 0) { diff --git a/src/griddyn/links/Subsystem.h b/src/griddyn/links/Subsystem.h index c667a8a0a..788e4be3c 100644 --- a/src/griddyn/links/Subsystem.h +++ b/src/griddyn/links/Subsystem.h @@ -57,16 +57,16 @@ class Subsystem: public Link { GridArea* getGridArea(index_t num) const; // dynInitializeB - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowCheck(std::vector& violationVector) override; // dynInitializeB dynamics - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** @brief relic of something not used to my knowledge*/ - virtual void updateTheta(coreTime /*time*/) {} + virtual void updateTheta(CoreTime /*time*/) {} // parameter set functions virtual void set(std::string_view param, std::string_view val) override; @@ -89,7 +89,7 @@ class Subsystem: public Link { virtual ChangeCode powerFlowAdjust(const IOdata& inputs, std::uint32_t flags, CheckLevel level) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; @@ -103,7 +103,7 @@ class Subsystem: public Link { @param[in] tol the tolerance to do the convergence @param[in] mode the mode of convergence */ - virtual void converge(coreTime time, + virtual void converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -171,13 +171,13 @@ class Subsystem: public Link { using Link::ioPartialDerivatives; virtual void ioPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& inputLocs, const SolverMode& sMode) override; using Link::outputPartialDerivatives; virtual void outputPartialDerivatives(id_type_t busId, const StateData& stateData, - matrixData& jacobian, + MatrixData& jacobian, const SolverMode& sMode) override; // virtual void busResidual(index_t busId, const StateData&sD, double *Fp, double *Fq, const diff --git a/src/griddyn/links/ZBreaker.cpp b/src/griddyn/links/ZBreaker.cpp index 77ce3ee8c..bf31a0c77 100644 --- a/src/griddyn/links/ZBreaker.cpp +++ b/src/griddyn/links/ZBreaker.cpp @@ -54,11 +54,11 @@ void ZBreaker::switchChange(int /*switchNum*/) { coordinateMergeStatus(); } -void ZBreaker::pFlowObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void ZBreaker::pFlowObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { coordinateMergeStatus(); } -void ZBreaker::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void ZBreaker::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { coordinateMergeStatus(); } diff --git a/src/griddyn/links/ZBreaker.h b/src/griddyn/links/ZBreaker.h index 44d1d72cc..906f727d7 100644 --- a/src/griddyn/links/ZBreaker.h +++ b/src/griddyn/links/ZBreaker.h @@ -27,8 +27,8 @@ class ZBreaker: public Link { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void switchMode(index_t num, bool mode) override; virtual void updateLocalCache() override; diff --git a/src/griddyn/loads/AggregateLoad.cpp b/src/griddyn/loads/AggregateLoad.cpp index afa5ba2ad..bd1f7f8d6 100644 --- a/src/griddyn/loads/AggregateLoad.cpp +++ b/src/griddyn/loads/AggregateLoad.cpp @@ -66,7 +66,7 @@ void AggregateLoad::add(CoreObject* obj) throw(UnrecognizedObjectException(this)); } -void AggregateLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void AggregateLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // TODO(phlpt): Need to rethink this object. ZipLoad::pFlowInitializeA(time0, flags); @@ -152,7 +152,7 @@ void AggregateLoad::pFlowObjectInitializeB() } } -void AggregateLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void AggregateLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { for (auto& ld : subLoads) { ld->dynInitializeA(time0, flags); @@ -289,7 +289,7 @@ void AggregateLoad::derivative(const IOdata& inputs, void AggregateLoad::outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) { for (auto& ld : subLoads) { @@ -301,7 +301,7 @@ void AggregateLoad::outputPartialDerivatives(const IOdata& inputs, void AggregateLoad::ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -312,7 +312,7 @@ void AggregateLoad::ioPartialDerivatives(const IOdata& inputs, void AggregateLoad::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -323,7 +323,7 @@ void AggregateLoad::jacobianElements(const IOdata& inputs, } } -void AggregateLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void AggregateLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { for (auto& ld : subLoads) { ld->timestep(time, inputs, sMode); diff --git a/src/griddyn/loads/AggregateLoad.h b/src/griddyn/loads/AggregateLoad.h index 0dfa88236..2191d564e 100644 --- a/src/griddyn/loads/AggregateLoad.h +++ b/src/griddyn/loads/AggregateLoad.h @@ -25,9 +25,9 @@ class AggregateLoad: public ZipLoad { AggregateLoad(const std::string& objName = "compositeLoad_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -52,20 +52,20 @@ class AggregateLoad: public ZipLoad { virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual double getRealPower(const IOdata& inputs, const StateData& sD, diff --git a/src/griddyn/loads/ApproximatingLoad.cpp b/src/griddyn/loads/ApproximatingLoad.cpp index 19dd100d4..ecb36a497 100644 --- a/src/griddyn/loads/ApproximatingLoad.cpp +++ b/src/griddyn/loads/ApproximatingLoad.cpp @@ -52,7 +52,7 @@ void ApproximatingLoad::add(CoreObject* obj) { if (dynamic_cast(obj) != nullptr) { if (subLoad != nullptr) { - gridSecondary::remove(subLoad); + GridSecondary::remove(subLoad); } subLoad = static_cast(obj); addSubObject(subLoad); @@ -61,7 +61,7 @@ void ApproximatingLoad::add(CoreObject* obj) } } -void ApproximatingLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void ApproximatingLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { m_lastCallTime = time0; @@ -76,7 +76,7 @@ void ApproximatingLoad::pFlowObjectInitializeB() RampLoad::pFlowObjectInitializeB(); } -void ApproximatingLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void ApproximatingLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { switch (dynCoupling) { case CouplingMode::none: @@ -109,7 +109,7 @@ void ApproximatingLoad::dynObjectInitializeB(const IOdata& /*inputs*/, } } -void ApproximatingLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void ApproximatingLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { const double voltage = inputs[voltageInLocation]; const double angle = inputs[angleInLocation]; @@ -129,7 +129,7 @@ void ApproximatingLoad::timestep(coreTime time, const IOdata& inputs, const Solv prevTime = time; } -void ApproximatingLoad::updateA(coreTime time) +void ApproximatingLoad::updateA(CoreTime time) { const double voltage = bus->getVoltage(); const double angle = bus->getAngle(); @@ -155,7 +155,7 @@ void ApproximatingLoad::updateA(coreTime time) prevTime = time; } -coreTime ApproximatingLoad::updateB() +CoreTime ApproximatingLoad::updateB() { switch (cDetail) { case CouplingDetail::single: { @@ -304,7 +304,7 @@ std::vector> return res; } -void ApproximatingLoad::run1ApproxA(coreTime /*time*/, const IOdata& inputs) +void ApproximatingLoad::run1ApproxA(CoreTime /*time*/, const IOdata& inputs) { using gmlc::containers::make_workBlock; assert(!opFlags[waiting_flag]); // this should not happen; @@ -328,7 +328,7 @@ std::vector ApproximatingLoad::run1ApproxB() return {std::get<1>(res[0]), std::get<2>(res[0])}; } -void ApproximatingLoad::run2ApproxA(coreTime /*time*/, const IOdata& inputs) +void ApproximatingLoad::run2ApproxA(CoreTime /*time*/, const IOdata& inputs) { using gmlc::containers::make_workBlock; assert(!opFlags[waiting_flag]); // this should not happen; @@ -367,7 +367,7 @@ std::vector ApproximatingLoad::run2ApproxB() return retP; } -void ApproximatingLoad::run3ApproxA(coreTime /*time*/, const IOdata& inputs) +void ApproximatingLoad::run3ApproxA(CoreTime /*time*/, const IOdata& inputs) { using gmlc::containers::make_workBlock; assert(!opFlags[waiting_flag]); // this should not happen; @@ -562,7 +562,7 @@ void ApproximatingLoad::rootTest(const IOdata& inputs, // printf("time=%f root =%12.10f\n", time,roots[rootOffset]); } -void ApproximatingLoad::rootTrigger(coreTime time, +void ApproximatingLoad::rootTrigger(CoreTime time, const IOdata& /*inputs*/, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/loads/ApproximatingLoad.h b/src/griddyn/loads/ApproximatingLoad.h index cf9af229a..d39469fc0 100644 --- a/src/griddyn/loads/ApproximatingLoad.h +++ b/src/griddyn/loads/ApproximatingLoad.h @@ -30,23 +30,23 @@ namespace loads { virtual ~ApproximatingLoad(); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; virtual void - timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void preEx(const IOdata& inputs, const StateData& sD, const SolverMode& sMode) override; - virtual void updateA(coreTime time) override; - virtual coreTime updateB() override; + virtual void updateA(CoreTime time) override; + virtual CoreTime updateB() override; virtual void set(std::string_view param, std::string_view val) override; virtual void @@ -57,7 +57,7 @@ namespace loads { const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -80,13 +80,13 @@ namespace loads { double Thprev = 0.0; //!< storage for recent phase call (phase is not really used yet) double triggerBound = 1.5; //!< the bounds on the voltage in terms of the spread //!< determining when to generate a new calculation - coreTime m_lastCallTime = negTime; + CoreTime m_lastCallTime = negTime; - void run1ApproxA(coreTime time, const IOdata& inputs); + void run1ApproxA(CoreTime time, const IOdata& inputs); std::vector run1ApproxB(); - void run2ApproxA(coreTime time, const IOdata& inputs); + void run2ApproxA(CoreTime time, const IOdata& inputs); std::vector run2ApproxB(); - void run3ApproxA(coreTime time, const IOdata& inputs); + void run3ApproxA(CoreTime time, const IOdata& inputs); std::vector run3ApproxB(); std::vector> diff --git a/src/griddyn/loads/ExponentialLoad.cpp b/src/griddyn/loads/ExponentialLoad.cpp index 0165f79b1..9c88d57d3 100644 --- a/src/griddyn/loads/ExponentialLoad.cpp +++ b/src/griddyn/loads/ExponentialLoad.cpp @@ -9,7 +9,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/stringOps.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::loads { @@ -50,7 +50,7 @@ void ExponentialLoad::set(std::string_view param, double val, units::unit unitTy void ExponentialLoad::ioPartialDerivatives(const IOdata& inputs, const StateData& /*sD*/, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& /*sMode*/) { diff --git a/src/griddyn/loads/ExponentialLoad.h b/src/griddyn/loads/ExponentialLoad.h index 1b522016d..9f380f36a 100644 --- a/src/griddyn/loads/ExponentialLoad.h +++ b/src/griddyn/loads/ExponentialLoad.h @@ -34,7 +34,7 @@ class ExponentialLoad: public GridLoad { virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual double getRealPower(const IOdata& inputs, diff --git a/src/griddyn/loads/FDepLoad.cpp b/src/griddyn/loads/FDepLoad.cpp index e4cced4f6..8c6d8291c 100644 --- a/src/griddyn/loads/FDepLoad.cpp +++ b/src/griddyn/loads/FDepLoad.cpp @@ -9,7 +9,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/stringOps.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include namespace griddyn::loads { @@ -18,7 +18,7 @@ FDepLoad::FDepLoad(double rP, double qP, const std::string& objName): ExponentialLoad(rP, qP, objName) { } -void FDepLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void FDepLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if ((betaP != 0.0) || (betaQ != 0.0)) { opFlags.set(uses_bus_frequency); @@ -102,7 +102,7 @@ void FDepLoad::set(std::string_view param, double val, units::unit unitType) void FDepLoad::ioPartialDerivatives(const IOdata& inputs, const StateData& /*sD*/, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& /*sMode*/) { diff --git a/src/griddyn/loads/FDepLoad.h b/src/griddyn/loads/FDepLoad.h index bb5ec966f..3cc3fe210 100644 --- a/src/griddyn/loads/FDepLoad.h +++ b/src/griddyn/loads/FDepLoad.h @@ -28,7 +28,7 @@ class FDepLoad: public ExponentialLoad { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void set(std::string_view param, std::string_view val) override; virtual void @@ -36,7 +36,7 @@ class FDepLoad: public ExponentialLoad { virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual double getRealPower(const IOdata& inputs, diff --git a/src/griddyn/loads/FileLoad.cpp b/src/griddyn/loads/FileLoad.cpp index 4ff305230..f0ecc5791 100644 --- a/src/griddyn/loads/FileLoad.cpp +++ b/src/griddyn/loads/FileLoad.cpp @@ -40,7 +40,7 @@ CoreObject* FileLoad::clone(CoreObject* obj) const return nobj; } -void FileLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void FileLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { currIndex = 0; count = loadFile(); @@ -61,7 +61,7 @@ void FileLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) updateA(time0); } -void FileLoad::updateA(coreTime time) +void FileLoad::updateA(CoreTime time) { while (time >= schedLoad.time(currIndex)) { ++currIndex; @@ -152,7 +152,7 @@ void FileLoad::updateA(coreTime time) nextUpdateTime = (currIndex == count - 1) ? maxTime : schedLoad.time(currIndex + 1); } -void FileLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void FileLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { if (time >= nextUpdateTime) { updateA(time); diff --git a/src/griddyn/loads/FileLoad.h b/src/griddyn/loads/FileLoad.h index 7e5f72786..87acb896f 100644 --- a/src/griddyn/loads/FileLoad.h +++ b/src/griddyn/loads/FileLoad.h @@ -22,7 +22,7 @@ class FileLoad: public RampLoad { protected: std::string fileName_; //!< the name of the file - gmlc::utilities::TimeSeriesMulti + gmlc::utilities::TimeSeriesMulti schedLoad; //!< time series containing the load information units::unit inputUnits = units::defunit; double scaleFactor = 1.0; //!< scaling factor on the load @@ -35,11 +35,11 @@ class FileLoad: public RampLoad { explicit FileLoad(const std::string& objName = "fileLoad_$"); FileLoad(const std::string& objName, std::string fileName); CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void updateA(coreTime time) override; + virtual void updateA(CoreTime time) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void setFlag(std::string_view flag, bool val = true) override; virtual void set(std::string_view param, std::string_view val) override; diff --git a/src/griddyn/loads/FrequencySensitiveLoad.cpp b/src/griddyn/loads/FrequencySensitiveLoad.cpp index 62eebe2cb..e903e3fe9 100644 --- a/src/griddyn/loads/FrequencySensitiveLoad.cpp +++ b/src/griddyn/loads/FrequencySensitiveLoad.cpp @@ -10,7 +10,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactoryTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -36,19 +36,19 @@ CoreObject* FrequencySensitiveLoad::clone(CoreObject* obj) const return nobj; } -void FrequencySensitiveLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void FrequencySensitiveLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridLoad::pFlowObjectInitializeA(time0, flags); auto Psched = subLoad->getRealPower(); dPdf = -H / 30.0 * Psched; } -void FrequencySensitiveLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void FrequencySensitiveLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridLoad::dynObjectInitializeA(time0, flags); } -void FrequencySensitiveLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void FrequencySensitiveLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { subLoad->timestep(time, inputs, sMode); double freq = (inputs.size() > 2) ? inputs[frequencyInLocation] : 1.0; @@ -127,7 +127,7 @@ void FrequencySensitiveLoad::updateLocalCache(const IOdata& inputs, updateOutputs(freq); } -void FrequencySensitiveLoad::setState(coreTime time, +void FrequencySensitiveLoad::setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) @@ -183,7 +183,7 @@ double FrequencySensitiveLoad::getReactivePower(double voltage) const void FrequencySensitiveLoad::outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) { if (inputs.empty()) // we only have output derivatives if the input arguments are not counted @@ -201,7 +201,7 @@ count_t FrequencySensitiveLoad::outputDependencyCount(index_t num, const SolverM void FrequencySensitiveLoad::ioPartialDerivatives(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const IOlocs& /*inputLocs*/, const SolverMode& /*sMode*/) { diff --git a/src/griddyn/loads/FrequencySensitiveLoad.h b/src/griddyn/loads/FrequencySensitiveLoad.h index 3a86ece33..2dd2a6611 100644 --- a/src/griddyn/loads/FrequencySensitiveLoad.h +++ b/src/griddyn/loads/FrequencySensitiveLoad.h @@ -26,11 +26,11 @@ class FrequencySensitiveLoad: public GridLoad { explicit FrequencySensitiveLoad(const std::string& objName = "load_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void getParameterStrings(stringVec& pstr, ParamStringType pstype) const override; virtual void set(std::string_view param, std::string_view val) override; @@ -46,19 +46,19 @@ class FrequencySensitiveLoad: public GridLoad { const SolverMode& sMode) override; /** update the actual outputs with a frequency related calculation*/ virtual void updateOutputs(double frequency); - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; diff --git a/src/griddyn/loads/GridLabDLoad.cpp b/src/griddyn/loads/GridLabDLoad.cpp index 700f24223..f16f27a40 100644 --- a/src/griddyn/loads/GridLabDLoad.cpp +++ b/src/griddyn/loads/GridLabDLoad.cpp @@ -148,7 +148,7 @@ void GridLabDLoad::add(CoreObject* obj) } } -void GridLabDLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridLabDLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (!opFlags[file_sent_flag]) { gridLabDInitialize(); @@ -163,7 +163,7 @@ void GridLabDLoad::pFlowObjectInitializeB() { updateB(); } -void GridLabDLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridLabDLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { switch (dynCoupling) { case CouplingMode::none: @@ -196,7 +196,7 @@ void GridLabDLoad::dynObjectInitializeB(const IOdata& /*inputs*/, } } -void GridLabDLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void GridLabDLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { double V = inputs[voltageInLocation]; double th = inputs[angleInLocation]; @@ -233,7 +233,7 @@ void GridLabDLoad::timestep(coreTime time, const IOdata& inputs, const SolverMod prevTime = time; } -void GridLabDLoad::updateA(coreTime time) +void GridLabDLoad::updateA(CoreTime time) { double V = bus->getVoltage(); double th = bus->getAngle(); @@ -271,7 +271,7 @@ void GridLabDLoad::updateA(coreTime time) prevTime = time; } -coreTime GridLabDLoad::updateB() +CoreTime GridLabDLoad::updateB() { switch (cDetail) { case CouplingDetail::single: { @@ -397,7 +397,7 @@ void GridLabDLoad::updateLocalCache(const IOdata& inputs, RampLoad::updateLocalCache(inputs, sD, sMode); } -void GridLabDLoad::runGridLabA(coreTime time, const IOdata& inputs) +void GridLabDLoad::runGridLabA(CoreTime time, const IOdata& inputs) { assert(!opFlags[waiting_flag]); // this should not happen; logging::trace(this, "calling gridlab load 1A"); @@ -502,7 +502,7 @@ std::vector GridLabDLoad::runGridLabB(bool unbalancedAlert) return {retP, retQ}; } -void GridLabDLoad::run2GridLabA(coreTime time, const IOdata& inputs) +void GridLabDLoad::run2GridLabA(CoreTime time, const IOdata& inputs) { assert(opFlags[waiting_flag] == false); // this should not happen; logging::trace(this, "calling gridlab load 2A"); @@ -623,7 +623,7 @@ std::vector GridLabDLoad::run2GridLabB(bool unbalancedAlert) return retP; } -void GridLabDLoad::run3GridLabA(coreTime time, const IOdata& inputs) +void GridLabDLoad::run3GridLabA(CoreTime time, const IOdata& inputs) { assert(!opFlags[waiting_flag]); // this should not happen; logging::trace(this, "calling gridLab-d load 3A"); @@ -988,7 +988,7 @@ void GridLabDLoad::rootTest(const IOdata& inputs, // printf("time=%f root =%12.10f\n", time,roots[rootOffset]); } -void GridLabDLoad::rootTrigger(coreTime time, +void GridLabDLoad::rootTrigger(CoreTime time, const IOdata& /*inputs*/, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/loads/GridLabDLoad.h b/src/griddyn/loads/GridLabDLoad.h index 3b5714ae2..0205f6cf6 100644 --- a/src/griddyn/loads/GridLabDLoad.h +++ b/src/griddyn/loads/GridLabDLoad.h @@ -29,23 +29,23 @@ namespace loads { virtual ~GridLabDLoad(); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; virtual void - timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void preEx(const IOdata& inputs, const StateData& sD, const SolverMode& sMode) override; - virtual void updateA(coreTime time) override; - virtual coreTime updateB() override; + virtual void updateA(CoreTime time) override; + virtual CoreTime updateB() override; virtual void set(std::string_view param, std::string_view val) override; virtual void @@ -56,7 +56,7 @@ namespace loads { const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -80,13 +80,13 @@ namespace loads { double Thprev = 0.0; //!< storage for recent phase call (phase is not really used yet) double triggerBound = 1.5; //!< the bounds on the voltage in terms of the spread //!< determining when to generate a new calculation - coreTime m_lastCallTime = negTime; + CoreTime m_lastCallTime = negTime; void gridLabDInitialize(void); - void runGridLabA(coreTime time, const IOdata& inputs); + void runGridLabA(CoreTime time, const IOdata& inputs); std::vector runGridLabB(bool unbalancedAlert); - void run2GridLabA(coreTime time, const IOdata& inputs); + void run2GridLabA(CoreTime time, const IOdata& inputs); std::vector run2GridLabB(bool unbalancedAlert); - void run3GridLabA(coreTime time, const IOdata& inputs); + void run3GridLabA(CoreTime time, const IOdata& inputs); std::vector run3GridLabB(bool unbalancedAlert); stringVec gridlabDfile; //!< the file to run in gridlabd diff --git a/src/griddyn/loads/Load.cpp b/src/griddyn/loads/Load.cpp index b43dc8ce2..fda62dd6b 100644 --- a/src/griddyn/loads/Load.cpp +++ b/src/griddyn/loads/Load.cpp @@ -10,7 +10,7 @@ #include "../measurement/ObjectGrabbers.h" #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -22,12 +22,12 @@ using units::puMW; using units::unit; std::atomic GridLoad::loadCount(0); -GridLoad::GridLoad(const std::string& objName): gridSecondary(objName) +GridLoad::GridLoad(const std::string& objName): GridSecondary(objName) { constructionHelper(); } GridLoad::GridLoad(double rP, double rQ, const std::string& objName): - gridSecondary(objName), P(rP), Q(rQ) + GridSecondary(objName), P(rP), Q(rQ) { constructionHelper(); } @@ -41,7 +41,7 @@ void GridLoad::constructionHelper() CoreObject* GridLoad::clone(CoreObject* obj) const { - auto nobj = cloneBase(this, obj); + auto nobj = cloneBase(this, obj); if (nobj == nullptr) { return obj; } @@ -89,7 +89,7 @@ void GridLoad::setFlag(std::string_view flag, bool val) opFlags.reset(use_power_factor_flag); } } else { - gridSecondary::setFlag(flag, val); + GridSecondary::setFlag(flag, val); } } @@ -98,7 +98,7 @@ void GridLoad::set(std::string_view param, std::string_view val) { if (param.empty() || param[0] == '#') { } else { - gridSecondary::set(param, val); + GridSecondary::set(param, val); } } @@ -126,7 +126,7 @@ double GridLoad::get(std::string_view param, unit unitType) const CoreObject* tobj = const_cast(this); val = convert(fptr(tobj), unit, unitType, systemBasePower, localBaseVoltage); } else { - val = gridSecondary::get(param, unitType); + val = GridSecondary::get(param, unitType); } return val; } @@ -163,7 +163,7 @@ void GridLoad::set(std::string_view param, double val, unit unitType) Q += convert(val, unitType, puMW, systemBasePower, localBaseVoltage); updatepfq(); } else { - gridSecondary::set(param, val, unitType); + GridSecondary::set(param, val, unitType); } } else if (param.back() == '*') { // load increments allows a delta on the load through the set functions @@ -174,7 +174,7 @@ void GridLoad::set(std::string_view param, double val, unit unitType) Q *= val; updatepfq(); } else { - gridSecondary::set(param, val, unitType); + GridSecondary::set(param, val, unitType); } } else if (param == "load p") { setP(convert(val, unitType, puMW, systemBasePower, localBaseVoltage)); @@ -195,7 +195,7 @@ void GridLoad::set(std::string_view param, double val, unit unitType) pfq = val; opFlags.set(use_power_factor_flag); } else { - gridSecondary::set(param, val, unitType); + GridSecondary::set(param, val, unitType); } } diff --git a/src/griddyn/loads/MotorLoad.cpp b/src/griddyn/loads/MotorLoad.cpp index 2549da2b7..0b7b5e651 100644 --- a/src/griddyn/loads/MotorLoad.cpp +++ b/src/griddyn/loads/MotorLoad.cpp @@ -11,7 +11,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactoryTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -60,7 +60,7 @@ CoreObject* MotorLoad::clone(CoreObject* obj) const return clonedLoad; } -void MotorLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void MotorLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { m_state.resize(1); if (opFlags[init_transient]) { @@ -78,7 +78,7 @@ void MotorLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) GridLoad::pFlowObjectInitializeA(time0, flags); } -void MotorLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void MotorLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { opFlags.set(has_roots); GridLoad::dynObjectInitializeA(time0, flags); @@ -221,7 +221,7 @@ void MotorLoad::set(std::string_view param, double val, units::unit unitType) } } -void MotorLoad::setState(coreTime time, +void MotorLoad::setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) @@ -241,7 +241,7 @@ void MotorLoad::setState(coreTime time, prevTime = time; } -void MotorLoad::guessState(coreTime /*time*/, +void MotorLoad::guessState(CoreTime /*time*/, double state[], double dstate_dt[], const SolverMode& sMode) @@ -297,7 +297,7 @@ void MotorLoad::getStateName(stringVec& stNames, return; } } -void MotorLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void MotorLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { const double timeDelta = time - prevTime; MotorLoad::derivative(inputs, emptyStateData, m_dstate_dt.data(), cLocalSolverMode); @@ -319,7 +319,7 @@ void MotorLoad::derivative(const IOdata& inputs, void MotorLoad::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -365,7 +365,7 @@ void MotorLoad::jacobianElements(const IOdata& inputs, void MotorLoad::outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (isDynamic(sMode)) { @@ -415,7 +415,7 @@ count_t MotorLoad::outputDependencyCount(index_t /*num*/, const SolverMode& /*sM } void MotorLoad::ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -460,7 +460,7 @@ void MotorLoad::rootTest(const IOdata& inputs, } } -void MotorLoad::rootTrigger(coreTime /*time*/, +void MotorLoad::rootTrigger(CoreTime /*time*/, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/loads/MotorLoad.h b/src/griddyn/loads/MotorLoad.h index 5dbe1983c..472c2cd7a 100644 --- a/src/griddyn/loads/MotorLoad.h +++ b/src/griddyn/loads/MotorLoad.h @@ -53,8 +53,8 @@ class MotorLoad: public GridLoad { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -65,11 +65,11 @@ class MotorLoad: public GridLoad { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; // for saving the state - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstate_dt[], const SolverMode& sMode) override; @@ -92,17 +92,17 @@ class MotorLoad: public GridLoad { virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void getStateName(stringVec& stNames, @@ -113,7 +113,7 @@ class MotorLoad: public GridLoad { const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -134,7 +134,7 @@ class MotorLoad: public GridLoad { double dmechds(double slip) const; virtual index_t findIndex(std::string_view field, const SolverMode& sMode) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual double getRealPower(const IOdata& inputs, const StateData& stateDataValue, diff --git a/src/griddyn/loads/MotorLoad3.cpp b/src/griddyn/loads/MotorLoad3.cpp index 46de90382..b06e34274 100644 --- a/src/griddyn/loads/MotorLoad3.cpp +++ b/src/griddyn/loads/MotorLoad3.cpp @@ -9,7 +9,7 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -28,7 +28,7 @@ CoreObject* MotorLoad3::clone(CoreObject* obj) const return ld; } -void MotorLoad3::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void MotorLoad3::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // setup the parameters x0 = x + xm; @@ -102,7 +102,7 @@ void MotorLoad3::converge() } } -void MotorLoad3::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) {} +void MotorLoad3::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) {} void MotorLoad3::dynObjectInitializeB(const IOdata& inputs, const IOdata& /*desiredOutput*/, IOdata& /*fieldSet*/) @@ -162,7 +162,7 @@ void MotorLoad3::set(std::string_view param, double val, units::unit unitType) } } -void MotorLoad3::setState(coreTime time, +void MotorLoad3::setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) @@ -171,7 +171,7 @@ void MotorLoad3::setState(coreTime time, GridComponent::setState(time, state, dstate_dt, sMode); } -void MotorLoad3::guessState(coreTime time, +void MotorLoad3::guessState(CoreTime time, double state[], double dstate_dt[], const SolverMode& sMode) @@ -277,7 +277,7 @@ void MotorLoad3::getStateName(stringVec& stNames, } } -void MotorLoad3::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void MotorLoad3::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { StateData sD(time, m_state.data()); derivative(inputs, sD, m_dstate_dt.data(), cLocalSolverMode); @@ -340,7 +340,7 @@ void MotorLoad3::derivative(const IOdata& /*inputs*/, void MotorLoad3::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -443,7 +443,7 @@ void MotorLoad3::jacobianElements(const IOdata& inputs, void MotorLoad3::outputPartialDerivatives(const IOdata& inputs, const StateData& /*sD*/, - matrixData& md, + MatrixData& md, const SolverMode& sMode) { auto refAlg = offsets.getAlgOffset(sMode); @@ -471,7 +471,7 @@ count_t MotorLoad3::outputDependencyCount(index_t /*num*/, const SolverMode& /*s } void MotorLoad3::ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -561,7 +561,7 @@ void MotorLoad3::rootTest(const IOdata& /*inputs*/, } } -void MotorLoad3::rootTrigger(coreTime /*time*/, +void MotorLoad3::rootTrigger(CoreTime /*time*/, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/loads/MotorLoad3.h b/src/griddyn/loads/MotorLoad3.h index 7be416088..096c88ae2 100644 --- a/src/griddyn/loads/MotorLoad3.h +++ b/src/griddyn/loads/MotorLoad3.h @@ -26,8 +26,8 @@ class MotorLoad3: public MotorLoad { MotorLoad3(const std::string& objName = "motor3_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, @@ -37,11 +37,11 @@ class MotorLoad3: public MotorLoad { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; // for saving the state - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstate_dt[], const SolverMode& sMode) override; @@ -63,7 +63,7 @@ class MotorLoad3: public MotorLoad { const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -74,25 +74,25 @@ class MotorLoad3: public MotorLoad { virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void getStateName(stringVec& stNames, const SolverMode& sMode, const std::string& prefix) const override; virtual index_t findIndex(std::string_view field, const SolverMode& sMode) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual double getRealPower(const IOdata& inputs, const StateData& sD, diff --git a/src/griddyn/loads/MotorLoad5.cpp b/src/griddyn/loads/MotorLoad5.cpp index df07e6062..520bd0ac4 100644 --- a/src/griddyn/loads/MotorLoad5.cpp +++ b/src/griddyn/loads/MotorLoad5.cpp @@ -10,7 +10,7 @@ #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactory.hpp" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -35,7 +35,7 @@ CoreObject* MotorLoad5::clone(CoreObject* obj) const return ld; } -void MotorLoad5::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void MotorLoad5::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // setup the parameters x0 = x + xm; @@ -127,7 +127,7 @@ void MotorLoad5::converge() } } -void MotorLoad5::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) {} +void MotorLoad5::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) {} void MotorLoad5::dynObjectInitializeB(const IOdata& inputs, const IOdata& /*desiredOutput*/, IOdata& /*fieldSet*/) @@ -291,7 +291,7 @@ void MotorLoad5::getStateName(stringVec& stNames, stNames[offset + 6] = prefix2 + ":empp"; } } -void MotorLoad5::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void MotorLoad5::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { StateData sD(time, m_state.data()); @@ -361,7 +361,7 @@ void MotorLoad5::derivative(const IOdata& /*inputs*/, void MotorLoad5::jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -529,7 +529,7 @@ void MotorLoad5::rootTest(const IOdata& /*inputs*/, } } -void MotorLoad5::rootTrigger(coreTime /*time*/, +void MotorLoad5::rootTrigger(CoreTime /*time*/, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/loads/MotorLoad5.h b/src/griddyn/loads/MotorLoad5.h index 497895bc4..816760973 100644 --- a/src/griddyn/loads/MotorLoad5.h +++ b/src/griddyn/loads/MotorLoad5.h @@ -33,8 +33,8 @@ class MotorLoad5: public MotorLoad3 { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -61,7 +61,7 @@ class MotorLoad5: public MotorLoad3 { const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; @@ -72,7 +72,7 @@ class MotorLoad5: public MotorLoad3 { virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void getStateName(stringVec& stNames, @@ -80,7 +80,7 @@ class MotorLoad5: public MotorLoad3 { const std::string& prefix) const override; virtual index_t findIndex(std::string_view field, const SolverMode& sMode) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; // TODO(phlpt): Change to algebraic update. virtual void diff --git a/src/griddyn/loads/SourceLoad.cpp b/src/griddyn/loads/SourceLoad.cpp index 35ebaeb6f..c8ac0c8b7 100644 --- a/src/griddyn/loads/SourceLoad.cpp +++ b/src/griddyn/loads/SourceLoad.cpp @@ -134,7 +134,7 @@ void SourceLoad::remove(CoreObject* obj) if (dynamic_cast(obj) != nullptr) { remove(static_cast(obj)); } else { - gridSecondary::remove(obj); + GridSecondary::remove(obj); } } @@ -152,7 +152,7 @@ void SourceLoad::remove(Source* src) lnk = -1; } } - gridSecondary::remove(src); + GridSecondary::remove(src); } } } @@ -218,7 +218,7 @@ void SourceLoad::set(std::string_view param, std::string_view val) } } -void SourceLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void SourceLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { for (const auto& src : getSubObjects()) { static_cast(src)->timestep(time, noInputs, sMode); @@ -228,7 +228,7 @@ void SourceLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& ZipLoad::timestep(time, inputs, sMode); } -void SourceLoad::setState(coreTime time, +void SourceLoad::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -278,7 +278,7 @@ void SourceLoad::set(std::string_view param, double val, units::unit unitType) } } -void SourceLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void SourceLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // Do a check on the sources; for (auto& sourceLocation : sourceLink) { @@ -295,7 +295,7 @@ void SourceLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) getSourceLoads(); } -void SourceLoad::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void SourceLoad::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { ZipLoad::dynObjectInitializeA(time0, flags); getSourceLoads(); diff --git a/src/griddyn/loads/SourceLoad.h b/src/griddyn/loads/SourceLoad.h index ca719cd9d..a70c24978 100644 --- a/src/griddyn/loads/SourceLoad.h +++ b/src/griddyn/loads/SourceLoad.h @@ -55,19 +55,19 @@ eventually will replace most of the shaped loads*/ set(std::string_view param, double val, units::unit unitType = units::defunit) override; virtual void setFlag(std::string_view flag, bool val = true) override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void updateLocalCache(const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; virtual void - timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; CoreObject* find(std::string_view obj) const override; diff --git a/src/griddyn/loads/Svd.cpp b/src/griddyn/loads/Svd.cpp index 506c84d8c..052d754d5 100644 --- a/src/griddyn/loads/Svd.cpp +++ b/src/griddyn/loads/Svd.cpp @@ -176,7 +176,7 @@ void Svd::updateSetting(int step) } } -void Svd::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void Svd::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (opFlags[continuous_flag]) { if (!opFlags[locked_flag]) { @@ -191,7 +191,7 @@ void Svd::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) return ZipLoad::pFlowObjectInitializeA(time0, flags); } -void Svd::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Svd::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { return ZipLoad::dynObjectInitializeA(time0, flags); } @@ -202,14 +202,14 @@ void Svd::dynObjectInitializeB(const IOdata& /*inputs*/, { } -void Svd::setState(coreTime /*time*/, +void Svd::setState(CoreTime /*time*/, const double /*state*/[], const double /*dstate_dt*/[], const SolverMode& /*sMode*/) { } -void Svd::guessState(coreTime /*time*/, +void Svd::guessState(CoreTime /*time*/, double /*state*/[], double /*dstate_dt*/[], const SolverMode& /*sMode*/) @@ -332,14 +332,14 @@ void Svd::derivative(const IOdata& /*inputs*/, void Svd::outputPartialDerivatives(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const SolverMode& /*sMode*/) { } void Svd::jacobianElements(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const IOlocs& /*inputLocs*/, const SolverMode& /*sMode*/) { @@ -350,7 +350,7 @@ void Svd::getStateName(stringVec& /*stNames*/, { } -void Svd::timestep(coreTime /*time*/, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) {} +void Svd::timestep(CoreTime /*time*/, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) {} void Svd::rootTest(const IOdata& /*inputs*/, const StateData& /*sD*/, double /*roots*/[], @@ -358,7 +358,7 @@ void Svd::rootTest(const IOdata& /*inputs*/, { } -void Svd::rootTrigger(coreTime /*time*/, +void Svd::rootTrigger(CoreTime /*time*/, const IOdata& /*inputs*/, const std::vector& /*rootMask*/, const SolverMode& /*sMode*/) diff --git a/src/griddyn/loads/Svd.h b/src/griddyn/loads/Svd.h index 46d9b68dc..6cf1481ad 100644 --- a/src/griddyn/loads/Svd.h +++ b/src/griddyn/loads/Svd.h @@ -47,8 +47,8 @@ class Svd: public RampLoad { virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, @@ -56,11 +56,11 @@ class Svd: public RampLoad { virtual void setLoad(double level, units::unit unitType = units::defunit) override; virtual void setLoad(double Plevel, double Qlevel, units::unit unitType = units::defunit) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; // for saving the state - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstate_dt[], const SolverMode& sMode) override; // for initial setting of the state @@ -98,25 +98,25 @@ class Svd: public RampLoad { virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void getStateName(stringVec& stNames, const SolverMode& sMode, const std::string& prefix) const override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& sD, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; diff --git a/src/griddyn/loads/ThreePhaseLoad.cpp b/src/griddyn/loads/ThreePhaseLoad.cpp index e53726934..e533f8085 100644 --- a/src/griddyn/loads/ThreePhaseLoad.cpp +++ b/src/griddyn/loads/ThreePhaseLoad.cpp @@ -8,8 +8,8 @@ #include "../GridBus.h" #include "core/CoreObjectTemplates.hpp" +#include "utilities/MatrixData.hpp" #include "utilities/ThreePhaseFunctions.h" -#include "utilities/matrixData.hpp" #include #include #include @@ -33,7 +33,7 @@ ThreePhaseLoad::ThreePhaseLoad(double realPower, double reactivePower, const std Qa = Qb = Qc = reactivePower / 3.0; } -void ThreePhaseLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void ThreePhaseLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (bus->checkFlag(three_phase_only)) { opFlags[three_phase_input] = true; diff --git a/src/griddyn/loads/ThreePhaseLoad.h b/src/griddyn/loads/ThreePhaseLoad.h index 008589829..acec659e6 100644 --- a/src/griddyn/loads/ThreePhaseLoad.h +++ b/src/griddyn/loads/ThreePhaseLoad.h @@ -43,7 +43,7 @@ conversions to positive sequence values. virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void getParameterStrings(stringVec& pstr, ParamStringType pstype) const override; diff --git a/src/griddyn/loads/ZipLoad.cpp b/src/griddyn/loads/ZipLoad.cpp index 647914376..43b0d9459 100644 --- a/src/griddyn/loads/ZipLoad.cpp +++ b/src/griddyn/loads/ZipLoad.cpp @@ -17,7 +17,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "core/ObjectFactoryTemplates.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -83,7 +83,7 @@ CoreObject* ZipLoad::clone(CoreObject* obj) const return nobj; } -void ZipLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void ZipLoad::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridLoad::pFlowObjectInitializeA(time0, flags); // Psched = getRealPower(); @@ -96,7 +96,7 @@ void ZipLoad::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) #endif } -void ZipLoad::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t flags) +void ZipLoad::dynObjectInitializeA(CoreTime /*time0*/, std::uint32_t flags) { if ((opFlags[convert_to_constant_impedance]) || CHECK_CONTROLFLAG(flags, all_loads_to_constant_impedence)) { @@ -120,7 +120,7 @@ void ZipLoad::dynObjectInitializeA(coreTime /*time0*/, std::uint32_t flags) #endif } -void ZipLoad::timestep(coreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) +void ZipLoad::timestep(CoreTime time, const IOdata& inputs, const SolverMode& /*sMode*/) { if (!isConnected()) { Pout = 0; @@ -293,7 +293,7 @@ void ZipLoad::set(std::string_view param, double val, unit unitType) Iq += convert(val, unitType, puA, systemBasePower, localBaseVoltage); checkFaultChange(); } else { - gridSecondary::set(param, val, unitType); // NOLINT + GridSecondary::set(param, val, unitType); // NOLINT } } else if (param.back() == '*') { // load increments allows a delta on the load through the set functions @@ -316,7 +316,7 @@ void ZipLoad::set(std::string_view param, double val, unit unitType) Iq *= val; checkFaultChange(); } else { - gridSecondary::set(param, val, unitType); // NOLINT + GridSecondary::set(param, val, unitType); // NOLINT } } else if (param == "load p") { setP(convert(val, unitType, puMW, systemBasePower, localBaseVoltage)); @@ -459,7 +459,7 @@ void ZipLoad::updateLocalCache(const IOdata& /*inputs*/, lastTime = sD.time; } -void ZipLoad::setState(coreTime time, +void ZipLoad::setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) @@ -540,7 +540,7 @@ double ZipLoad::getReactivePower(double voltage) const void ZipLoad::outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) { if (inputs.empty()) // we only have output derivatives if the input arguments are not counted @@ -557,7 +557,7 @@ count_t ZipLoad::outputDependencyCount(index_t /*num*/, const SolverMode& /*sMod } void ZipLoad::ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/loads/ZipLoad.h b/src/griddyn/loads/ZipLoad.h index b1e487aad..3d757fb5c 100644 --- a/src/griddyn/loads/ZipLoad.h +++ b/src/griddyn/loads/ZipLoad.h @@ -34,7 +34,7 @@ class ZipLoad: public GridLoad { double Vpqmin = 0.7; //!< low voltage at which the PQ powers convert to an impedance type load double Vpqmax = 1.3; //!< upper voltage at which the PQ powers convert to an impedance type load - coreTime lastTime = negTime; + CoreTime lastTime = negTime; private: double trigVVlow = @@ -46,11 +46,11 @@ class ZipLoad: public GridLoad { ZipLoad(double rP, double rQ, const std::string& objName = "zip_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void getParameterStrings(stringVec& pstr, ParamStringType pstype) const override; virtual void set(std::string_view param, std::string_view val) override; @@ -65,19 +65,19 @@ class ZipLoad: public GridLoad { const StateData& sD, const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; virtual void ioPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& sD, - matrixData& md, + MatrixData& md, const SolverMode& sMode) override; virtual count_t outputDependencyCount(index_t num, const SolverMode& sMode) const override; diff --git a/src/griddyn/measurement/Collector.cpp b/src/griddyn/measurement/Collector.cpp index e517e1ff1..8ea401970 100644 --- a/src/griddyn/measurement/Collector.cpp +++ b/src/griddyn/measurement/Collector.cpp @@ -30,7 +30,7 @@ static ClassFactory gCollFac("collector"); static ChildClassFactory gRFac(std::vector{"recorder", "rec", "file"}, "recorder"); -Collector::Collector(coreTime time0, coreTime period): +Collector::Collector(CoreTime time0, CoreTime period): mTimePeriod(period), mRequestedPeriod(period), mTriggerTime(time0) { } @@ -191,7 +191,7 @@ void Collector::setFlag(std::string_view flag, bool val) } } -void Collector::setTime(coreTime time) +void Collector::setTime(CoreTime time) { if (time > mTriggerTime) { mTriggerTime = time; @@ -253,7 +253,7 @@ count_t Collector::grabData(double* outputData, index_t outputCount) return currentCount; } -ChangeCode Collector::trigger(coreTime time) +ChangeCode Collector::trigger(CoreTime time) { std::vector vals; diff --git a/src/griddyn/measurement/Collector.h b/src/griddyn/measurement/Collector.h index 1a32843cd..386277338 100644 --- a/src/griddyn/measurement/Collector.h +++ b/src/griddyn/measurement/Collector.h @@ -42,12 +42,12 @@ class Collector: public HelperObject, public EventInterface, public ObjectOperat count_t mWarningCount = 0; //!< counter for the number of warnings // there is currently a 4 byte gap here std::vector mWarnList; //!< listing for the number of warnings - coreTime mTimePeriod; //!< the actual period of the Collector - coreTime mRequestedPeriod; //!< the requested period of the Collector - coreTime mStartTime = negTime; //!< the time to start collecting - coreTime mStopTime = maxTime; //!< the time to stop collecting - coreTime mTriggerTime = maxTime; //!< the next trigger time for the Collector - coreTime mLastTriggerTime = negTime; //!< the last time the Collector was triggered + CoreTime mTimePeriod; //!< the actual period of the Collector + CoreTime mRequestedPeriod; //!< the requested period of the Collector + CoreTime mStartTime = negTime; //!< the time to start collecting + CoreTime mStopTime = maxTime; //!< the time to stop collecting + CoreTime mTriggerTime = maxTime; //!< the next trigger time for the Collector + CoreTime mLastTriggerTime = negTime; //!< the last time the Collector was triggered /** data structure to capture the grabbers and location for a specific grabber*/ class CollectorPoint { @@ -78,7 +78,7 @@ class Collector: public HelperObject, public EventInterface, public ObjectOperat bool mDelayProcess = true; //!< wait to process recorders until other events have executed bool mVectorName = false; //!< indicator to use vector notation for the name public: - Collector(coreTime time0 = timeZero, coreTime period = timeOneSecond); + Collector(CoreTime time0 = timeZero, CoreTime period = timeOneSecond); explicit Collector(const std::string& collectorName); /** duplicate the Collector @@ -99,10 +99,10 @@ class Collector: public HelperObject, public EventInterface, public ObjectOperat @return the number of data points stored */ count_t grabData(double* outputData, index_t outputCount); - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; /** do a check to check and assign all columns*/ void recheckColumns(); - coreTime nextTriggerTime() const override { return mTriggerTime; } + CoreTime nextTriggerTime() const override { return mTriggerTime; } EventExecutionMode executionMode() const override { return (mDelayProcess) ? EventExecutionMode::delayed : EventExecutionMode::normal; @@ -122,7 +122,7 @@ class Collector: public HelperObject, public EventInterface, public ObjectOperat virtual void set(std::string_view param, std::string_view val) override; virtual void setFlag(std::string_view flag, bool val) override; - virtual void setTime(coreTime time); + virtual void setTime(CoreTime time); virtual CoreObject* getObject() const override; diff --git a/src/griddyn/measurement/compoundCondition.cpp b/src/griddyn/measurement/CompoundCondition.cpp similarity index 88% rename from src/griddyn/measurement/compoundCondition.cpp rename to src/griddyn/measurement/CompoundCondition.cpp index 68f69cda7..59c928370 100644 --- a/src/griddyn/measurement/compoundCondition.cpp +++ b/src/griddyn/measurement/CompoundCondition.cpp @@ -15,15 +15,15 @@ enum class CompoundMode AND, OR, ANY, XOR, ONE_OF, TWO_OF, THREE_OF }; */ -double compoundCondition::evalCondition() +double CompoundCondition::evalCondition() { return 0.0; } -double compoundCondition::evalCondition(const StateData& /*sD*/, const SolverMode& /*sMode*/) +double CompoundCondition::evalCondition(const StateData& /*sD*/, const SolverMode& /*sMode*/) { return 0.0; } -bool compoundCondition::checkCondition() const +bool CompoundCondition::checkCondition() const { unsigned int trueConditionCount = 0; for (const auto& condition : mConditions) { @@ -41,7 +41,7 @@ bool compoundCondition::checkCondition() const return evalCombinations(static_cast(trueConditionCount)); } -bool compoundCondition::checkCondition(const StateData& stateDataValue, +bool CompoundCondition::checkCondition(const StateData& stateDataValue, const SolverMode& sMode) const { unsigned int trueConditionCount = 0; @@ -60,7 +60,7 @@ bool compoundCondition::checkCondition(const StateData& stateDataValue, return evalCombinations(static_cast(trueConditionCount)); } -void compoundCondition::add(std::shared_ptr condition) +void CompoundCondition::add(std::shared_ptr condition) { if (condition) { mConditions.push_back(std::move(condition)); @@ -69,7 +69,7 @@ void compoundCondition::add(std::shared_ptr condition) throw(AddFailureException()); } -void compoundCondition::setMode(CompoundMode newMode) +void CompoundCondition::setMode(CompoundMode newMode) { mMode = newMode; switch (mMode) { @@ -90,7 +90,7 @@ void compoundCondition::setMode(CompoundMode newMode) } } -bool compoundCondition::evalCombinations(count_t trueCount) const +bool CompoundCondition::evalCombinations(count_t trueCount) const { switch (mMode) { case CompoundMode::AND: diff --git a/src/griddyn/measurement/Condition.h b/src/griddyn/measurement/Condition.h index 33cf1ec34..849b1e255 100644 --- a/src/griddyn/measurement/Condition.h +++ b/src/griddyn/measurement/Condition.h @@ -176,7 +176,7 @@ std::unique_ptr makeCondition(std::string_view field, /** evaluate a compound condition consisting of multiple individual conditions */ -class compoundCondition: public Condition { +class CompoundCondition: public Condition { public: /** enumeration of the possible compounding modes*/ enum class CompoundMode { @@ -202,7 +202,7 @@ class compoundCondition: public Condition { std::vector> mConditions; //!< vector of pointers to the conditions CompoundMode mMode = CompoundMode::AND; //!< the compounding mode to use public: - compoundCondition() = default; + CompoundCondition() = default; virtual double evalCondition() override; virtual double evalCondition(const StateData& stateDataValue, const SolverMode& sMode) override; diff --git a/src/griddyn/measurement/GrabberSet.cpp b/src/griddyn/measurement/GrabberSet.cpp index b95a4c4db..d320a296e 100644 --- a/src/griddyn/measurement/GrabberSet.cpp +++ b/src/griddyn/measurement/GrabberSet.cpp @@ -51,7 +51,7 @@ std::unique_ptr GrabberSet::clone() const (mStateGrabber) ? mStateGrabber->clone() : nullptr); if (mPredictor) { gset->mPredictor = - std::make_unique>(*mPredictor); + std::make_unique>(*mPredictor); } return gset; } @@ -61,7 +61,7 @@ void GrabberSet::cloneTo(GrabberSet* gset) const gset->updateGrabbers(mGrabber->clone(), (mStateGrabber) ? mStateGrabber->clone() : nullptr); if (mPredictor) { gset->mPredictor = - std::make_unique>(*mPredictor); + std::make_unique>(*mPredictor); } } @@ -119,7 +119,7 @@ double GrabberSet::grabData(const StateData& stateDataValue, const SolverMode& s } void GrabberSet::outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (mStateGrabber) { diff --git a/src/griddyn/measurement/GrabberSet.h b/src/griddyn/measurement/GrabberSet.h index cb444e5ce..0cd0ce668 100644 --- a/src/griddyn/measurement/GrabberSet.h +++ b/src/griddyn/measurement/GrabberSet.h @@ -13,7 +13,7 @@ #include template -class matrixData; +class MatrixData; namespace utilities { template @@ -33,7 +33,7 @@ class GrabberSet: public ObjectOperatorInterface { private: std::shared_ptr mGrabber; //!< the non state grabber std::shared_ptr mStateGrabber; //!< the state grabber - std::unique_ptr> + std::unique_ptr> mPredictor; //!< pointer to a predictor object public: @@ -83,7 +83,7 @@ class GrabberSet: public ObjectOperatorInterface { virtual void getDesc(std::vector& desc_list) const; virtual double grabData(const StateData& stateDataValue, const SolverMode& sMode); virtual void outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode); // virtual void getDoutDt(const StateData&sD, const SolverMode &sMode) const; /** get a description of the GrabberSet*/ diff --git a/src/griddyn/measurement/GridGrabbers.cpp b/src/griddyn/measurement/GridGrabbers.cpp index 27012e5ed..ed35453c0 100644 --- a/src/griddyn/measurement/GridGrabbers.cpp +++ b/src/griddyn/measurement/GridGrabbers.cpp @@ -148,7 +148,7 @@ void GridGrabber::grabVectorData(std::vector& vdata) } } -coreTime GridGrabber::getTime() const +CoreTime GridGrabber::getTime() const { if (mObject != nullptr) { return mObject->currentTime(); @@ -409,7 +409,7 @@ void FunctionGrabber::grabVectorData(std::vector& vdata) std::transform(mTempArray.begin(), mTempArray.end(), vdata.begin(), mFunctionPtr); } -coreTime FunctionGrabber::getTime() const +CoreTime FunctionGrabber::getTime() const { if (mBaseGrabber) { return mBaseGrabber->getTime(); @@ -596,7 +596,7 @@ void OpGrabber::updateObject(CoreObject* obj, int num) } } -coreTime OpGrabber::getTime() const +CoreTime OpGrabber::getTime() const { if (mBaseGrabber1) { return mBaseGrabber1->getTime(); diff --git a/src/griddyn/measurement/GridGrabbers.h b/src/griddyn/measurement/GridGrabbers.h index 594cc038d..554b7fcd5 100644 --- a/src/griddyn/measurement/GridGrabbers.h +++ b/src/griddyn/measurement/GridGrabbers.h @@ -75,7 +75,7 @@ class GridGrabber: public ObjectOperatorInterface { **/ virtual void getDesc(std::vector& desc_list) const; /** get the current time associated with the grabber*/ - virtual coreTime getTime() const; + virtual CoreTime getTime() const; /** get a single description of the grabber*/ virtual const std::string& getDesc() const; /** set the description text*/ @@ -144,7 +144,7 @@ class FunctionGrabber: public GridGrabber { virtual void updateField(std::string_view fld) override; using GridGrabber::getDesc; virtual void getDesc(std::vector& desc_list) const override; - virtual coreTime getTime() const override; + virtual CoreTime getTime() const override; protected: virtual bool checkIfLoaded() override; @@ -180,7 +180,7 @@ class OpGrabber: public GridGrabber { using GridGrabber::getDesc; virtual void getDesc(std::vector& desc_list) const override; - virtual coreTime getTime() const override; + virtual CoreTime getTime() const override; protected: virtual bool checkIfLoaded() override; diff --git a/src/griddyn/measurement/ObjectGrabbers.cpp b/src/griddyn/measurement/ObjectGrabbers.cpp index 99884ecf2..2caf21bdd 100644 --- a/src/griddyn/measurement/ObjectGrabbers.cpp +++ b/src/griddyn/measurement/ObjectGrabbers.cpp @@ -319,31 +319,31 @@ namespace { static const std::map> secondaryFunctions{ {"real", - {[](CoreObject* obj) { return static_cast(obj)->getRealPower(); }, + {[](CoreObject* obj) { return static_cast(obj)->getRealPower(); }, puMW}}, {"reactive", {[](CoreObject* obj) { - return static_cast(obj)->getReactivePower(); + return static_cast(obj)->getReactivePower(); }, puMW}}, {"voltage", {[](CoreObject* obj) { - return static_cast(obj)->getBus()->getVoltage(); + return static_cast(obj)->getBus()->getVoltage(); }, puV}}, {"busvoltage", {[](CoreObject* obj) { - return static_cast(obj)->getBus()->getVoltage(); + return static_cast(obj)->getBus()->getVoltage(); }, puV}}, {"busangle", {[](CoreObject* obj) { - return static_cast(obj)->getBus()->getAngle(); + return static_cast(obj)->getBus()->getAngle(); }, rad}}, {"busfreq", {[](CoreObject* obj) { - return static_cast(obj)->getBus()->getFreq(); + return static_cast(obj)->getBus()->getFreq(); }, puHz}}, }; diff --git a/src/griddyn/measurement/Recorder.cpp b/src/griddyn/measurement/Recorder.cpp index b3710680d..258f0691e 100644 --- a/src/griddyn/measurement/Recorder.cpp +++ b/src/griddyn/measurement/Recorder.cpp @@ -17,7 +17,7 @@ namespace griddyn { using gmlc::utilities::fsize_t; -Recorder::Recorder(coreTime time0, coreTime period): Collector(time0, period) {} +Recorder::Recorder(CoreTime time0, CoreTime period): Collector(time0, period) {} Recorder::Recorder(const std::string& name): Collector(name) {} Recorder::~Recorder() { @@ -132,13 +132,13 @@ void Recorder::reset() { mDataset.clear(); } -void Recorder::setSpace(coreTime span) +void Recorder::setSpace(CoreTime span) { auto pts = static_cast(std::floor(span / mTimePeriod)); mDataset.reserve(pts + 1); } -void Recorder::addSpace(coreTime span) +void Recorder::addSpace(CoreTime span) { auto pts = static_cast(std::floor(span / mTimePeriod)); mDataset.reserve(static_cast(mDataset.time().capacity()) + pts + 1); @@ -148,7 +148,7 @@ void Recorder::fillDatasetFields() { mDataset.setFields(Collector::getColumnDescriptions()); } -ChangeCode Recorder::trigger(coreTime time) +ChangeCode Recorder::trigger(CoreTime time) { Collector::trigger(time); if (mFirstTrigger) { diff --git a/src/griddyn/measurement/Recorder.h b/src/griddyn/measurement/Recorder.h index 3f79af2a1..e13517bca 100644 --- a/src/griddyn/measurement/Recorder.h +++ b/src/griddyn/measurement/Recorder.h @@ -16,8 +16,8 @@ namespace griddyn { /** class to store and save data from the grid, based on a Collector */ class Recorder: public Collector { protected: - coreTime mLastSaveTime = negTime; //!< the last time the recorder saved to file - gmlc::utilities::TimeSeriesMulti mDataset; //!< the actual time series data + CoreTime mLastSaveTime = negTime; //!< the last time the recorder saved to file + gmlc::utilities::TimeSeriesMulti mDataset; //!< the actual time series data std::string mFileName; //!< the fileName to store the data std::string mDirectory; //!< the directory to generate the specified file @@ -27,7 +27,7 @@ class Recorder: public Collector { count_t mAutosave = 0; //!< flag indicating the recorder should autosave after the given number of points public: - Recorder(coreTime time0 = timeZero, coreTime period = 1.0); + Recorder(CoreTime time0 = timeZero, CoreTime period = 1.0); explicit Recorder(const std::string& name); /** destructor will attempt to save the data*/ ~Recorder(); @@ -38,7 +38,7 @@ class Recorder: public Collector { */ virtual void cloneTo(Collector* col) const override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; /** save the data to a file @param[in] fileName the name of the file to save the data to @@ -47,11 +47,11 @@ class Recorder: public Collector { /** set the total number of points the recorder has allocated space for @param span the total time period the recorder can save space for */ - void setSpace(coreTime span); + void setSpace(CoreTime span); /** tell the recorder to allocate space for an additional period of time @param span the total time period the recorder can save space for */ - void addSpace(coreTime span); + void addSpace(CoreTime span); void set(std::string_view param, double val) override; void set(std::string_view param, std::string_view val) override; @@ -72,7 +72,7 @@ class Recorder: public Collector { /** get the underlying timeSeries object*/ const auto& getTimeSeries() const { return mDataset; } /** get a vector of the time data*/ - const std::vector& getTime() const { return mDataset.time(); } + const std::vector& getTime() const { return mDataset.time(); } /** get a vector of the stored data for a particular column @param[in] col the column of data to request diff --git a/src/griddyn/measurement/StateGrabber.h b/src/griddyn/measurement/StateGrabber.h index f008f1c2a..1acca6d66 100644 --- a/src/griddyn/measurement/StateGrabber.h +++ b/src/griddyn/measurement/StateGrabber.h @@ -22,7 +22,7 @@ namespace griddyn { using objJacFunction = std::function& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode)>; using objStateGrabberFunction = std::function< double(GridComponent* comp, const StateData& stateDataValue, const SolverMode& sMode)>; @@ -82,7 +82,7 @@ class StateGrabber: public ObjectOperatorInterface { @param[in] matrixDataValue the matrix to store the computed Jacobian information into @param[in] sMode the SolverMode associated with the StateData*/ virtual void outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode); virtual void updateObject(CoreObject* obj, ObjectUpdateMode mode = ObjectUpdateMode::DIRECT) override; @@ -98,7 +98,7 @@ class StateGrabber: public ObjectOperatorInterface { void linkLoadInfo(std::string_view fld); /** load relay specific grabber info*/ void relayLoadInfo(std::string_view fld); - /** load gridSecondary specific grabber info*/ + /** load GridSecondary-specific grabber info*/ void secondaryLoadInfo(std::string_view fld); /** load area specific grabber info*/ void areaLoadInfo(std::string_view fld); @@ -154,7 +154,7 @@ class StateFunctionGrabber: public StateGrabber { virtual void cloneTo(StateGrabber* ggb) const override; virtual double grabData(const StateData& stateDataValue, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual void updateObject(CoreObject* obj, ObjectUpdateMode mode = ObjectUpdateMode::DIRECT) override; @@ -181,7 +181,7 @@ class StateOpGrabber: public StateGrabber { virtual void cloneTo(StateGrabber* ggb) const override; virtual double grabData(const StateData& stateDataValue, const SolverMode& sMode) override; virtual void outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual void updateObject(CoreObject* obj, ObjectUpdateMode mode = ObjectUpdateMode::DIRECT) override; diff --git a/src/griddyn/measurement/stateGrabbers.cpp b/src/griddyn/measurement/stateGrabbers.cpp index 38e5944d0..ed8540b40 100644 --- a/src/griddyn/measurement/stateGrabbers.cpp +++ b/src/griddyn/measurement/stateGrabbers.cpp @@ -14,8 +14,8 @@ #include "GrabberInterpreter.hpp" #include "StateGrabber.h" #include "gmlc/containers/mapOps.hpp" -#include "utilities/matrixDataScale.hpp" -#include "utilities/matrixDataTranslate.hpp" +#include "utilities/MatrixDataScale.hpp" +#include "utilities/MatrixDataTranslate.hpp" #include #include #include @@ -40,14 +40,14 @@ namespace { const StateData& stateDataValue, const SolverMode& sMode) { - return static_cast(obj)->getRealPower(noInputs, stateDataValue, sMode); + return static_cast(obj)->getRealPower(noInputs, stateDataValue, sMode); } double secondaryReactivePower(GridComponent* obj, const StateData& stateDataValue, const SolverMode& sMode) { - return static_cast(obj)->getReactivePower(noInputs, stateDataValue, sMode); + return static_cast(obj)->getReactivePower(noInputs, stateDataValue, sMode); } } // namespace @@ -119,7 +119,7 @@ void StateGrabber::updateField(std::string_view fld) busLoadInfo(fieldDescription); } else if (dynamic_cast(cobj) != nullptr) { linkLoadInfo(fieldDescription); - } else if (dynamic_cast(cobj) != nullptr) { + } else if (dynamic_cast(cobj) != nullptr) { secondaryLoadInfo(fieldDescription); } else if (dynamic_cast(cobj) != nullptr) { relayLoadInfo(fieldDescription); @@ -225,12 +225,12 @@ static const std::map STRING_TRANSLATE{ #define JAC_FUNCTION_SIGNATURE \ [](GridComponent * obj, \ const StateData& stateDataValue, \ - matrixData& matrixDataValue, \ + MatrixData& matrixDataValue, \ const SolverMode& sMode) #define JAC_FUNCTION_SIGNATURE_NO_STATE \ [](GridComponent * obj, \ const StateData& /*sD*/, \ - matrixData& matrixDataValue, \ + MatrixData& matrixDataValue, \ const SolverMode& sMode) // clang-format off @@ -281,9 +281,9 @@ static const std::map AREA_FUNCTIONS{ static const std::map SECONDARY_FUNCTIONS{ { "real",{ secondaryRealPower, puMW } }, { "reactive",{ secondaryReactivePower, puMW } }, -{ "busangle",{ FUNCTION_SIGNATURE{ return static_cast(obj)->getBus()->getAngle(stateDataValue, sMode); }, rad } }, -{ "busvoltage",{ FUNCTION_SIGNATURE{ return static_cast(obj)->getBus()->getVoltage(stateDataValue, sMode); }, puV } }, -{ "busfreq",{ FUNCTION_SIGNATURE{ return static_cast(obj)->getBus()->getFreq(stateDataValue, sMode); }, puV } }, +{ "busangle",{ FUNCTION_SIGNATURE{ return static_cast(obj)->getBus()->getAngle(stateDataValue, sMode); }, rad } }, +{ "busvoltage",{ FUNCTION_SIGNATURE{ return static_cast(obj)->getBus()->getVoltage(stateDataValue, sMode); }, puV } }, +{ "busfreq",{ FUNCTION_SIGNATURE{ return static_cast(obj)->getBus()->getFreq(stateDataValue, sMode); }, puV } }, }; static const std::map LOAD_FUNCTIONS{{"loadreal", {secondaryRealPower, puMW}}, @@ -478,16 +478,16 @@ void StateGrabber::secondaryLoadInfo(std::string_view fld) if ((fld == "realpower") || (fld == "power") || (fld == "p")) { cacheUpdateRequired = true; fptr = [](GridComponent* comp, const StateData& stateDataValue, const SolverMode& sMode) { - return static_cast(comp)->getRealPower(noInputs, stateDataValue, sMode); + return static_cast(comp)->getRealPower(noInputs, stateDataValue, sMode); }; jacMode = JacobianMode::COMPUTED; jacIfptr = [](GridComponent* comp, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { - matrixDataTranslate<1, double> translatedMatrix(matrixDataValue); + MatrixDataTranslate<1, double> translatedMatrix(matrixDataValue); translatedMatrix.setTranslation(PoutLocation, 0); - static_cast(comp)->outputPartialDerivatives(noInputs, + static_cast(comp)->outputPartialDerivatives(noInputs, stateDataValue, translatedMatrix, sMode); @@ -495,31 +495,31 @@ void StateGrabber::secondaryLoadInfo(std::string_view fld) } else if ((fld == "reactivepower") || (fld == "reactive") || (fld == "q")) { cacheUpdateRequired = true; fptr = [](GridComponent* comp, const StateData& stateDataValue, const SolverMode& sMode) { - return static_cast(comp)->getReactivePower(noInputs, + return static_cast(comp)->getReactivePower(noInputs, stateDataValue, sMode); }; jacMode = JacobianMode::COMPUTED; jacIfptr = [](GridComponent* comp, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { - matrixDataTranslate<1, double> translatedMatrix(matrixDataValue); + MatrixDataTranslate<1, double> translatedMatrix(matrixDataValue); translatedMatrix.setTranslation(QoutLocation, 0); - static_cast(comp)->outputPartialDerivatives(noInputs, + static_cast(comp)->outputPartialDerivatives(noInputs, stateDataValue, translatedMatrix, sMode); }; } else { - offset = static_cast(cobj)->findIndex(fld, cLocalSolverMode); + offset = static_cast(cobj)->findIndex(fld, cLocalSolverMode); if (offset != kInvalidLocation) { prevIndex = 1; fptr = [this](GridComponent* comp, const StateData& stateDataValue, const SolverMode& sMode) { if (sMode.offsetIndex != prevIndex) { - offset = static_cast(comp)->findIndex(field, sMode); + offset = static_cast(comp)->findIndex(field, sMode); prevIndex = sMode.offsetIndex; } return (offset != kNullLocation) ? stateDataValue.state[offset] : kNullVal; @@ -527,7 +527,7 @@ void StateGrabber::secondaryLoadInfo(std::string_view fld) jacMode = JacobianMode::COMPUTED; jacIfptr = [this](GridComponent* /*comp*/, const StateData& /*sD*/, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& /*sMode*/) { matrixDataValue.assignCheckCol(0, offset, 1.0); }; @@ -569,14 +569,14 @@ void StateGrabber::getObjects(std::vector& objects) const objects.push_back(getObject()); } void StateGrabber::outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (jacMode == JacobianMode::NONE) { return; } if (gain != 1.0) { - matrixDataScale scaledMatrix(matrixDataValue, gain); + MatrixDataScale scaledMatrix(matrixDataValue, gain); jacIfptr(cobj, stateDataValue, scaledMatrix, sMode); } else { jacIfptr(cobj, stateDataValue, matrixDataValue, sMode); @@ -689,7 +689,7 @@ CoreObject* StateFunctionGrabber::getObject() const return (bgrabber) ? bgrabber->getObject() : nullptr; } void StateFunctionGrabber::outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (jacMode == JacobianMode::NONE) { @@ -700,7 +700,7 @@ void StateFunctionGrabber::outputPartialDerivatives(const StateData& stateDataVa const double derivativeOutput = (dopptr != nullptr) ? dopptr(temp) : (opptr(temp + 1e-7) - opptr(temp)) / 1e-7; - matrixDataScale scaledMatrix(matrixDataValue, derivativeOutput * gain); + MatrixDataScale scaledMatrix(matrixDataValue, derivativeOutput * gain); bgrabber->outputPartialDerivatives(stateDataValue, scaledMatrix, sMode); } @@ -815,7 +815,7 @@ CoreObject* StateOpGrabber::getObject() const } void StateOpGrabber::outputPartialDerivatives(const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { if (jacMode == JacobianMode::NONE) { @@ -830,7 +830,7 @@ void StateOpGrabber::outputPartialDerivatives(const StateData& stateDataValue, const double firstDerivativeOutput = (perturbedFirstValue - baseValue) / 1e-7; - matrixDataScale scaledMatrix(matrixDataValue, firstDerivativeOutput * gain); + MatrixDataScale scaledMatrix(matrixDataValue, firstDerivativeOutput * gain); bgrabber1->outputPartialDerivatives(stateDataValue, scaledMatrix, sMode); const double perturbedSecondValue = opptr(grabber1Data, grabber2Data + 1e-7); diff --git a/src/griddyn/primary/AcBus.cpp b/src/griddyn/primary/AcBus.cpp index 692938c96..b4f80ced3 100644 --- a/src/griddyn/primary/AcBus.cpp +++ b/src/griddyn/primary/AcBus.cpp @@ -17,7 +17,7 @@ #include "core/CoreOwningPtr.hpp" #include "core/ObjectFactoryTemplates.hpp" #include "gmlc/utilities/vectorOps.hpp" -// #include "matrixDataSparse.hpp" +// #include "MatrixDataSparse.hpp" #include "gmlc/utilities/stringOps.h" #include #include @@ -206,7 +206,7 @@ void AcBus::alert(CoreObject* obj, int code) } // dynInitializeB states -void AcBus::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void AcBus::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (Vtol < 0) { Vtol = getRoot()->get("voltagetolerance"); @@ -756,7 +756,7 @@ void AcBus::pFlowCheck(std::vector& violations) } // dynInitializeB states for dynamic solution -void AcBus::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void AcBus::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridBus::dynObjectInitializeA(time0, flags); // find a @@ -954,7 +954,7 @@ void AcBus::generationAdjust(double adjustment) } } -void AcBus::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& sMode) +void AcBus::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& sMode) { const double timeDelta = time - prevTime; if (timeDelta < 1.0) { @@ -1469,7 +1469,7 @@ void AcBus::removePowerControl(GridComponent* comp) } // guessState the solution -void AcBus::guessState(coreTime time, double state[], double dstateDt[], const SolverMode& sMode) +void AcBus::guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) { auto voffset = offsets.getVOffset(sMode); auto aoffset = offsets.getAOffset(sMode); @@ -1522,7 +1522,7 @@ void AcBus::getTols(double tols[], const SolverMode& sMode) } // pass the solution -void AcBus::setState(coreTime time, +void AcBus::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -1636,7 +1636,7 @@ void AcBus::derivative(const IOdata& inputs, // Jacobian void AcBus::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -2158,7 +2158,7 @@ bool AcBus::convergeVoltageOnly(const StateData& stateDataValue, return false; } -void AcBus::converge(coreTime time, +void AcBus::converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -2632,12 +2632,12 @@ double AcBus::getMaxGenReactive() const return busController.Qmax; } -double AcBus::getAdjustableCapacityUp(coreTime time) const +double AcBus::getAdjustableCapacityUp(CoreTime time) const { return busController.getAdjustableCapacityUp(time); } -double AcBus::getAdjustableCapacityDown(coreTime time) const +double AcBus::getAdjustableCapacityDown(CoreTime time) const { return busController.getAdjustableCapacityDown(time); } diff --git a/src/griddyn/primary/AcBus.h b/src/griddyn/primary/AcBus.h index a52969e91..02afbdba3 100644 --- a/src/griddyn/primary/AcBus.h +++ b/src/griddyn/primary/AcBus.h @@ -10,8 +10,8 @@ #include "../GridBus.h" #include "BusControls.h" #include "core/CoreOwningPtr.hpp" -#include "utilities/matrixDataCompact.hpp" -#include "utilities/matrixDataTranslate.hpp" +#include "utilities/MatrixDataCompact.hpp" +#include "utilities/MatrixDataTranslate.hpp" #include namespace griddyn { @@ -26,7 +26,7 @@ voltage and angle, PV buses fix the voltage and real power, PQ buses have know generation/load, afix buses fix the angle and reactive power. there are different setting for power flow calculations and dynamic calculations. -Buses act as connection points for links to tie to other buses and gridSecondary components such as +Buses act as connection points for links to tie to other buses and GridSecondary components such as generators and loads. */ @@ -55,7 +55,7 @@ class AcBus: public GridBus { BusType prevType = BusType::PQ; //!< previous type container if the type automatically changes DynBusType prevDynType = DynBusType::normal; //!< previous type container if the type automatically changes - matrixDataCompact<2, 3> partDeriv; //!< structure containing the partial derivatives + MatrixDataCompact<2, 3> partDeriv; //!< structure containing the partial derivatives model_parameter aTarget = 0.0; //!< an angle Target(for SLK and afix bus types) model_parameter vTarget = 1.0; //!< a target voltage model_parameter participation = @@ -67,12 +67,12 @@ class AcBus: public GridBus { model_parameter prevPower = 0.0; //!< previous power level model_parameter Tw = 0.1; //!< time constant for the frequency estimator - coreTime lastSetTime = negTime; //!< last set time + CoreTime lastSetTime = negTime; //!< last set time CoreOwningPtr fblock; //!< pointer to frequency estimator block BusControls busController; //!< pointer to the eControls object // extra blocks and object for remote controlled buses and bus merging - matrixDataTranslate<4> of; + MatrixDataTranslate<4> of; index_t lastSmode = kInvalidLocation; public: @@ -111,7 +111,7 @@ class AcBus: public GridBus { virtual void setRootOffset(index_t roffset, const SolverMode& sMode) override; protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; public: @@ -125,7 +125,7 @@ class AcBus: public GridBus { virtual void reset(ResetLevels level = ResetLevels::minimal) override; // dynInitializeB dynamics protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -148,7 +148,7 @@ class AcBus: public GridBus { // solver functions virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void residual(const IOdata& inputs, @@ -168,7 +168,7 @@ class AcBus: public GridBus { double update[], const SolverMode& sMode, double alpha) override; - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; @@ -180,12 +180,12 @@ class AcBus: public GridBus { mode=3 does it with voltage only @param[in] time the time of the corresponding states @param[in,out] state the states of the system at present and shifted to match the updates - @param[in,out] dstate_dt the derivatives of the state that get updated + @param[in,out] dstateDt the derivatives of the state that get updated @param[in] sMode the solvemode matching the states @param[in] mode the mode of the convergence @param[in] tol the convergence tolerance */ - virtual void converge(coreTime time, + virtual void converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -217,15 +217,15 @@ class AcBus: public GridBus { virtual void computeDerivatives(const StateData& stateDataValue, const SolverMode& sMode); public: - void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; /** @brief a faster function to set the voltage and angle of a bus* - @param[in] Vnew the new voltage - @param[in] Anew the new angle + @param[in] vnew the new voltage + @param[in] anew the new angle */ virtual void setVoltageAngle(double vnew, double anew) override; // for identifying which variables are algebraic vs differential @@ -258,13 +258,13 @@ class AcBus: public GridBus { @param[in] time the time period within which to do the adjustments * @return the reactive link power **/ - virtual double getAdjustableCapacityUp(coreTime time = maxTime) const override; + virtual double getAdjustableCapacityUp(CoreTime time = maxTime) const override; /** @brief get the available controllable upward adjustments within a time period @ details this means power production or load reduction @param[in] time the time period within which to do the adjustments * @return the reactive link power **/ - virtual double getAdjustableCapacityDown(coreTime time = maxTime) const override; + virtual double getAdjustableCapacityDown(CoreTime time = maxTime) const override; /** @brief the dPdf partial derivative (may be deprecated in the future) * @return the $\frac{\partial P}{\partial f}$ **/ diff --git a/src/griddyn/primary/BusControls.cpp b/src/griddyn/primary/BusControls.cpp index 0f3640ca3..cb7d2ed6a 100644 --- a/src/griddyn/primary/BusControls.cpp +++ b/src/griddyn/primary/BusControls.cpp @@ -44,7 +44,7 @@ bool BusControls::hasPowerAdjustments(id_type_t sid) const return false; } -double BusControls::getAdjustableCapacityUp(coreTime time) const +double BusControls::getAdjustableCapacityUp(CoreTime time) const { double cap = 0.0; @@ -62,7 +62,7 @@ double BusControls::getAdjustableCapacityUp(coreTime time) const return cap; } -double BusControls::getAdjustableCapacityDown(coreTime time) const +double BusControls::getAdjustableCapacityDown(CoreTime time) const { double cap = 0.0; @@ -81,14 +81,14 @@ double BusControls::getAdjustableCapacityDown(coreTime time) const void BusControls::addPowerControlObject(GridComponent* comp, bool update) { - if (dynamic_cast(comp) != nullptr) { + if (dynamic_cast(comp) != nullptr) { auto objid = comp->getID(); for (auto& rvc : pControlObjects) { if (objid == rvc->getID()) { return; } } - pControlObjects.push_back(static_cast(comp)); + pControlObjects.push_back(static_cast(comp)); pcfrac.push_back(comp->get("participation")); } else if (dynamic_cast(comp) != nullptr) { auto objid = comp->getID(); @@ -109,14 +109,14 @@ void BusControls::addPowerControlObject(GridComponent* comp, bool update) void BusControls::addVoltageControlObject(GridComponent* comp, bool update) { - if (dynamic_cast(comp) != nullptr) { + if (dynamic_cast(comp) != nullptr) { auto objid = comp->getID(); for (auto& rvc : vControlObjects) { if (objid == rvc->getID()) { return; } } - vControlObjects.push_back(static_cast(comp)); + vControlObjects.push_back(static_cast(comp)); vcfrac.push_back(comp->get("vcontrolfrac")); } else if (dynamic_cast(comp) != nullptr) { auto objid = comp->getID(); diff --git a/src/griddyn/primary/BusControls.h b/src/griddyn/primary/BusControls.h index eae505b24..0652e7ced 100644 --- a/src/griddyn/primary/BusControls.h +++ b/src/griddyn/primary/BusControls.h @@ -11,7 +11,7 @@ namespace griddyn { -class gridSecondary; +class GridSecondary; class AcBus; class GridBus; class Link; @@ -37,7 +37,7 @@ class BusControls { double autogenQact = 0; //!< use an automatic generator to locally match Q load // for managing voltage control objects - std::vector vControlObjects; //!< object which control the voltage of the bus + std::vector vControlObjects; //!< object which control the voltage of the bus std::vector proxyVControlObject; //!< object which act as an interface for remote //!< objects acting on a bus std::vector @@ -49,7 +49,7 @@ class BusControls { //!< a specific controllable link // for managing p control objects - std::vector pControlObjects; //!< object which control the angle of a bus + std::vector pControlObjects; //!< object which control the angle of a bus std::vector proxyPControlObject; //!< object which act as an interface for remote //!< objects acting on a bus std::vector @@ -71,8 +71,8 @@ class BusControls { bool hasVoltageAdjustments(id_type_t sid) const; bool hasPowerAdjustments(id_type_t sid) const; - double getAdjustableCapacityUp(coreTime time) const; - double getAdjustableCapacityDown(coreTime time) const; + double getAdjustableCapacityUp(CoreTime time) const; + double getAdjustableCapacityDown(CoreTime time) const; void addPowerControlObject(GridComponent* comp, bool update); void addVoltageControlObject(GridComponent* comp, bool update); diff --git a/src/griddyn/primary/DcBus.cpp b/src/griddyn/primary/DcBus.cpp index a1eb590fd..1392f017e 100644 --- a/src/griddyn/primary/DcBus.cpp +++ b/src/griddyn/primary/DcBus.cpp @@ -15,7 +15,8 @@ #include "core/ObjectFactoryTemplates.hpp" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixDataCompact.hpp" +#include "utilities/MatrixDataCompact.hpp" +#include #include #include @@ -49,7 +50,7 @@ void DcBus::add(Link* lnk) } // dynInitializeB states -void DcBus::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void DcBus::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridBus::pFlowObjectInitializeA(time0, flags); } @@ -171,7 +172,7 @@ void DcBus::pFlowCheck(std::vector& violationVector) } // dynInitializeB states for dynamic solution -void DcBus::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void DcBus::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { GridBus::dynObjectInitializeA(time0, flags); return; @@ -187,7 +188,7 @@ void DcBus::dynObjectInitializeB(const IOdata& inputs, angle = 0; } -void DcBus::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void DcBus::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { GridBus::timestep(time, inputs, sMode); } @@ -275,7 +276,7 @@ void DcBus::getStateName(stringVec& stNames, } // pass the solution -void DcBus::setState(coreTime time, +void DcBus::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -299,7 +300,7 @@ void DcBus::setState(coreTime time, GridBus::setState(time, state, dstateDt, sMode); } -void DcBus::guessState(coreTime time, double state[], double dstateDt[], const SolverMode& sMode) +void DcBus::guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) { auto voffset = offsets.getVOffset(sMode); @@ -340,7 +341,7 @@ static const IOlocs IN_LOC{0, 1, 2}; void DcBus::computeDerivatives(const StateData& stateDataValue, const SolverMode& sMode) { - matrixDataCompact<2, 3> partDeriv; + MatrixDataCompact<2, 3> partDeriv; if (!isConnected()) { return; } @@ -371,7 +372,7 @@ void DcBus::computeDerivatives(const StateData& stateDataValue, const SolverMode // Jacobian void DcBus::jacobianElements(const IOdata& /*inputs*/, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { @@ -396,7 +397,7 @@ void DcBus::jacobianElements(const IOdata& /*inputs*/, } } - // matrixDataSparse of; + // MatrixDataSparse of; of.setArray(matrixDataValue); of.setTranslation(PoutLocation, useVoltage(sMode) ? inputLocs[voltageInLocation] : kNullLocation); @@ -446,13 +447,13 @@ index_t DcBus::getOutputLoc(const SolverMode& sMode, index_t num) const } // TODO(phlpt): Write this function. -void DcBus::converge(coreTime /*time*/, +void DcBus::converge(CoreTime /*time*/, double /*state*/[], double /*dstate_dt*/[], const SolverMode& /*sMode*/, ConvergeMode /*mode*/, double /*tol*/) -// void DcBus::converge (const coreTime time, double state[], double dstate_dt[], const SolverMode +// void DcBus::converge (const CoreTime time, double state[], double dstate_dt[], const SolverMode // &sMode, double tol, int mode) { } diff --git a/src/griddyn/primary/DcBus.h b/src/griddyn/primary/DcBus.h index aaac293fc..032011586 100644 --- a/src/griddyn/primary/DcBus.h +++ b/src/griddyn/primary/DcBus.h @@ -9,7 +9,7 @@ // headers #include "../GridBus.h" #include "DcBusControls.h" -#include "utilities/matrixDataTranslate.hpp" +#include "utilities/MatrixDataTranslate.hpp" #include namespace griddyn { @@ -37,7 +37,7 @@ class DcBus: public GridBus { DynBusType prevDynType = DynBusType::normal; //!< previous type container if the type automatically changes double dVdP = 0.0; //!< storage for the dVdP terms from all the secondary objects - matrixDataTranslate<1> of; + MatrixDataTranslate<1> of; public: explicit DcBus(const std::string& objName = "dcBus_$"); @@ -54,7 +54,7 @@ class DcBus: public GridBus { virtual count_t localJacobianCount(const SolverMode& sMode) const override; protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void pFlowObjectInitializeB() override; public: @@ -65,7 +65,7 @@ class DcBus: public GridBus { virtual void pFlowCheck(std::vector& violationVector) override; // dynInitializeB dynamics protected: - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -76,17 +76,17 @@ class DcBus: public GridBus { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; @@ -96,14 +96,14 @@ class DcBus: public GridBus { const StateData& stateDataValue, double resid[], const SolverMode& sMode) override; - virtual void converge(coreTime time, + virtual void converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, ConvergeMode mode = ConvergeMode::local_iteration, double tol = 0.01) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual double getVoltage(const double state[], const SolverMode& sMode) const override; diff --git a/src/griddyn/primary/DcBusControls.cpp b/src/griddyn/primary/DcBusControls.cpp index 9c27fb30f..564d6135e 100644 --- a/src/griddyn/primary/DcBusControls.cpp +++ b/src/griddyn/primary/DcBusControls.cpp @@ -33,7 +33,7 @@ bool DcBusControls::hasAdjustments(id_type_t sid) const return false; } -double DcBusControls::getAdjustableCapacityUp(coreTime time) const +double DcBusControls::getAdjustableCapacityUp(CoreTime time) const { double cap = 0.0; @@ -51,7 +51,7 @@ double DcBusControls::getAdjustableCapacityUp(coreTime time) const return cap; } -double DcBusControls::getAdjustableCapacityDown(coreTime time) const +double DcBusControls::getAdjustableCapacityDown(CoreTime time) const { double cap = 0.0; @@ -70,14 +70,14 @@ double DcBusControls::getAdjustableCapacityDown(coreTime time) const void DcBusControls::addControlObject(GridComponent* comp, bool update) { - if (dynamic_cast(comp) != nullptr) { + if (dynamic_cast(comp) != nullptr) { auto objid = comp->getID(); for (auto& rvc : controlObjects) { if (objid == rvc->getID()) { return; } } - controlObjects.push_back(static_cast(comp)); + controlObjects.push_back(static_cast(comp)); cfrac.push_back(comp->get("participation")); } else if (dynamic_cast(comp) != nullptr) { auto objid = comp->getID(); diff --git a/src/griddyn/primary/DcBusControls.h b/src/griddyn/primary/DcBusControls.h index c610b8a55..27d8e073b 100644 --- a/src/griddyn/primary/DcBusControls.h +++ b/src/griddyn/primary/DcBusControls.h @@ -11,7 +11,7 @@ namespace griddyn { -class gridSecondary; +class GridSecondary; class DcBus; class GridBus; class Link; @@ -33,7 +33,7 @@ class DcBusControls { double autogenPact = 0; //!< use an automatic generator to local match P load // for managing voltage control objects - std::vector controlObjects; //!< object which control the voltage of the bus + std::vector controlObjects; //!< object which control the voltage of the bus std::vector proxyControlObject; //!< object which act as an interface for remote objects //!< acting on a bus std::vector controlLinks; //!< set of Link which themselves act as controllable objects; @@ -54,8 +54,8 @@ class DcBusControls { bool hasAdjustments() const; bool hasAdjustments(id_type_t sid) const; - double getAdjustableCapacityUp(coreTime time) const; - double getAdjustableCapacityDown(coreTime time) const; + double getAdjustableCapacityUp(CoreTime time) const; + double getAdjustableCapacityDown(CoreTime time) const; void addControlObject(GridComponent* comp, bool update); diff --git a/src/griddyn/primary/GridArea.cpp b/src/griddyn/primary/GridArea.cpp index 19d833a96..3a748fa66 100644 --- a/src/griddyn/primary/GridArea.cpp +++ b/src/griddyn/primary/GridArea.cpp @@ -568,7 +568,7 @@ void GridArea::reset(ResetLevels level) } // dynInitializeB states -void GridArea::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridArea::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { for (auto* obj : primaryObjects) { obj->pFlowInitializeA(time0, flags); @@ -708,7 +708,7 @@ void GridArea::pFlowCheck(std::vector& Violation_vector) } // dynInitializeB states for dynamic solution -void GridArea::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridArea::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { for (auto* obj : primaryObjects) { if (obj->isEnabled()) { @@ -774,9 +774,9 @@ void GridArea::dynObjectInitializeB(const IOdata& inputs, } // TODO(PT): make this do something or remove it -void GridArea::updateTheta(coreTime /*time*/) {} +void GridArea::updateTheta(CoreTime /*time*/) {} -void GridArea::converge(coreTime time, +void GridArea::converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -910,7 +910,7 @@ double GridArea::get(std::string_view param, unit unitType) const return (vali != 0) ? (static_cast(vali)) : val; } -void GridArea::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void GridArea::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { // update the tie lines first for (auto* gL : m_Links) { @@ -1235,7 +1235,7 @@ count_t GridArea::getLinkBus(stringVec& names, index_t start, int busNumber) con // single value return functions -double GridArea::getAdjustableCapacityUp(coreTime time) const +double GridArea::getAdjustableCapacityUp(CoreTime time) const { double adjUp = 0.0; for (auto* area : m_GridAreas) { @@ -1249,7 +1249,7 @@ double GridArea::getAdjustableCapacityUp(coreTime time) const return adjUp; } -double GridArea::getAdjustableCapacityDown(coreTime time) const +double GridArea::getAdjustableCapacityDown(CoreTime time) const { double adjDown = 0.0; for (auto* area : m_GridAreas) { @@ -1381,7 +1381,7 @@ double GridArea::getAvgFreq() const // -------------------- Power Flow -------------------- // guessState the solution -void GridArea::guessState(coreTime time, double state[], double dstateDt[], const SolverMode& sMode) +void GridArea::guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) { auto cobj = opObjectLists->begin(sMode); auto cend = opObjectLists->end(sMode); @@ -1465,7 +1465,7 @@ ChangeCode GridArea::rootCheck(const IOdata& inputs, return ret; } -void GridArea::rootTrigger(coreTime time, +void GridArea::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) @@ -1510,7 +1510,7 @@ void GridArea::rootTrigger(coreTime time, } // pass the solution -void GridArea::setState(coreTime time, +void GridArea::setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) @@ -1666,7 +1666,7 @@ void GridArea::delayedDerivative(const IOdata& inputs, void GridArea::delayedJacobian(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -1694,7 +1694,7 @@ void GridArea::derivative(const IOdata& inputs, // Jacobian void GridArea::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/primary/GridBus.cpp b/src/griddyn/primary/GridBus.cpp index 10b4dec27..330644d66 100644 --- a/src/griddyn/primary/GridBus.cpp +++ b/src/griddyn/primary/GridBus.cpp @@ -287,7 +287,7 @@ void GridBus::followNetwork(int networkID, std::queue& bstk) } // dynInitializeB states -void GridBus::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridBus::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // run the subObjects if (Vtol < 0) { @@ -372,7 +372,7 @@ ChangeCode GridBus::powerFlowAdjust(const IOdata& /*inputs*/, std::uint32_t flag } // dynInitializeB states for dynamic solution -void GridBus::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void GridBus::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { opFlags[preEx_requested] = false; opFlags[has_constraints] = false; @@ -432,7 +432,7 @@ void GridBus::generationAdjust(double /*adjustment*/) // adjust the real power flow } -void GridBus::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& sMode) +void GridBus::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& sMode) { auto inputs = getOutputs(noInputs, emptyStateData, sMode); GridComponent::timestep(time, inputs, sMode); @@ -920,7 +920,7 @@ static const IOlocs kNullLocations{kNullLocation, kNullLocation, kNullLocation}; // Jacobian void GridBus::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { @@ -981,7 +981,7 @@ void GridBus::algebraicUpdate(const IOdata& inputs, GridComponent::algebraicUpdate(outputs, stateDataValue, update, sMode, alpha); } -void GridBus::converge(coreTime /*time*/, +void GridBus::converge(CoreTime /*time*/, double /*state*/[], double /*dstateDt*/[], const SolverMode& /*sMode*/, @@ -1204,12 +1204,12 @@ double GridBus::getGenerationReactiveNominal() const } return S.genQ; } -double GridBus::getAdjustableCapacityUp(coreTime /*time*/) const +double GridBus::getAdjustableCapacityUp(CoreTime /*time*/) const { return 0.0; } -double GridBus::getAdjustableCapacityDown(coreTime /*time*/) const +double GridBus::getAdjustableCapacityDown(CoreTime /*time*/) const { return 0.0; } @@ -1413,7 +1413,7 @@ void GridBus::rootTest(const IOdata& /*inputs*/, GridComponent::rootTest(inputs, stateDataValue, roots, sMode); } -void GridBus::rootTrigger(coreTime time, +void GridBus::rootTrigger(CoreTime time, const IOdata& /*inputs*/, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/primary/InfiniteBus.cpp b/src/griddyn/primary/InfiniteBus.cpp index 071361b77..2475c7950 100644 --- a/src/griddyn/primary/InfiniteBus.cpp +++ b/src/griddyn/primary/InfiniteBus.cpp @@ -43,7 +43,7 @@ CoreObject* infiniteBus::clone(CoreObject* obj) const return nobj; } -void infiniteBus::updateVoltageAngle(coreTime time) +void infiniteBus::updateVoltageAngle(CoreTime time) { auto dt = static_cast(time - prevTime); @@ -52,13 +52,13 @@ void infiniteBus::updateVoltageAngle(coreTime time) voltage += dvdt * dt; } -void infiniteBus::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void infiniteBus::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { updateVoltageAngle(time); GridBus::timestep(time, inputs, sMode); } -void infiniteBus::setState(coreTime time, +void infiniteBus::setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) diff --git a/src/griddyn/primary/InfiniteBus.h b/src/griddyn/primary/InfiniteBus.h index 60f980e54..f9a23a8a6 100644 --- a/src/griddyn/primary/InfiniteBus.h +++ b/src/griddyn/primary/InfiniteBus.h @@ -34,8 +34,8 @@ class infiniteBus: public GridBus { infiniteBus(double startVoltage, double startAngle, const std::string& objName = "infbus_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; // add components - void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; - void setState(coreTime time, + void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; + void setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) override; @@ -54,7 +54,7 @@ class infiniteBus: public GridBus { protected: /** update the Voltage and Angle based on time using the defined ramp rates*/ - void updateVoltageAngle(coreTime time); + void updateVoltageAngle(CoreTime time); }; } // namespace griddyn diff --git a/src/griddyn/primary/ListMaintainer.cpp b/src/griddyn/primary/ListMaintainer.cpp index b13aafd87..e75a30a65 100644 --- a/src/griddyn/primary/ListMaintainer.cpp +++ b/src/griddyn/primary/ListMaintainer.cpp @@ -88,7 +88,7 @@ void ListMaintainer::preEx(const IOdata& inputs, void ListMaintainer::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -227,7 +227,7 @@ void ListMaintainer::delayedDerivative(const IOdata& inputs, void ListMaintainer::delayedJacobian(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { diff --git a/src/griddyn/primary/ListMaintainer.h b/src/griddyn/primary/ListMaintainer.h index 5d8f39e47..0715ffa60 100644 --- a/src/griddyn/primary/ListMaintainer.h +++ b/src/griddyn/primary/ListMaintainer.h @@ -11,7 +11,7 @@ #include template -class matrixData; +class MatrixData; namespace griddyn { class GridPrimary; @@ -44,7 +44,7 @@ class ListMaintainer { void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode); void preEx(const IOdata& inputs, const StateData& stateDataValue, const SolverMode& sMode); @@ -72,7 +72,7 @@ class ListMaintainer { const SolverMode& sMode); void delayedJacobian(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode); void delayedAlgebraicUpdate(const IOdata& inputs, diff --git a/src/griddyn/relays/Breaker.cpp b/src/griddyn/relays/Breaker.cpp index aad910d6f..94397c45d 100644 --- a/src/griddyn/relays/Breaker.cpp +++ b/src/griddyn/relays/Breaker.cpp @@ -15,7 +15,7 @@ #include "../measurement/GridGrabbers.h" #include "../measurement/StateGrabber.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/MatrixDataSparse.hpp" #include #include #include @@ -100,7 +100,7 @@ void Breaker::set(std::string_view param, double val, units::unit unitType) } } -void Breaker::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Breaker::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { auto tripEvent = std::make_shared(); auto recloseEvent = std::make_shared(); @@ -159,7 +159,7 @@ void Breaker::dynObjectInitializeA(coreTime time0, std::uint32_t flags) Relay::dynObjectInitializeA(time0, flags); } -void Breaker::conditionTriggered(index_t conditionNum, coreTime triggeredTime) +void Breaker::conditionTriggered(index_t conditionNum, CoreTime triggeredTime) { if (conditionNum == 0) { opFlags.set(OVERLIMIT_FLAG); @@ -193,7 +193,7 @@ void Breaker::conditionTriggered(index_t conditionNum, coreTime triggeredTime) } } -void Breaker::updateA(coreTime time) +void Breaker::updateA(CoreTime time) { if (opFlags[BREAKER_TRIPPED_FLAG]) { if (time >= nextUpdateTime) { @@ -231,7 +231,7 @@ count_t Breaker::localJacobianCount(const SolverMode& sMode) const return 0; } -void Breaker::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void Breaker::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { prevTime = time; if (mLimit < kBigNum / 2.0) { @@ -246,18 +246,18 @@ void Breaker::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode void Breaker::jacobianElements(const IOdata& /*inputs*/, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { if (mUseCti) { - matrixDataSparse localJacobian; + MatrixDataSparse localJacobian; IOdata out; auto voltageOffset = mBus->getOutputLoc(sMode, voltageInLocation); auto inputs = mBus->getOutputs(noInputs, stateDataRef, sMode); auto inputLocs = mBus->getOutputLocs(sMode); if (opFlags[NONLINK_SOURCE_FLAG]) { - auto* gridSecondaryObject = static_cast(m_sourceObject); + auto* gridSecondaryObject = static_cast(m_sourceObject); out = gridSecondaryObject->getOutputs(inputs, stateDataRef, sMode); gridSecondaryObject->outputPartialDerivatives(inputs, stateDataRef, @@ -312,7 +312,7 @@ void Breaker::jacobianElements(const IOdata& /*inputs*/, } } -void Breaker::setState(coreTime time, +void Breaker::setState(CoreTime time, const double state[], const double /*dstateDt*/[], const SolverMode& sMode) @@ -353,7 +353,7 @@ void Breaker::residual(const IOdata& /*inputs*/, } } -void Breaker::guessState(const coreTime /*time*/, +void Breaker::guessState(const CoreTime /*time*/, double state[], double dstateDt[], const SolverMode& sMode) @@ -394,7 +394,7 @@ void Breaker::getStateName(stringVec& stNames, } } -void Breaker::tripBreaker(coreTime time) +void Breaker::tripBreaker(CoreTime time) { alert(this, BREAKER_TRIP_CURRENT); logging::normal(this, "breaker {} tripped on {}", m_terminal, m_sourceObject->getName()); @@ -413,7 +413,7 @@ void Breaker::tripBreaker(coreTime time) } } -void Breaker::resetBreaker(coreTime time) +void Breaker::resetBreaker(CoreTime time) { ++mRecloseAttempts; mLastRecloseTime = time; diff --git a/src/griddyn/relays/Breaker.h b/src/griddyn/relays/Breaker.h index a65988750..67d7f283b 100644 --- a/src/griddyn/relays/Breaker.h +++ b/src/griddyn/relays/Breaker.h @@ -23,14 +23,14 @@ class Breaker: public Relay { }; protected: - coreTime mMinClearingTime = timeZero; //!<[s] minimum clearing time for from bus breaker - coreTime mRecloseTime1 = timeOneSecond; //!<[s] first reclose time - coreTime mRecloseTime2 = 5.0; //!<[s] second reclose time + CoreTime mMinClearingTime = timeZero; //!<[s] minimum clearing time for from bus breaker + CoreTime mRecloseTime1 = timeOneSecond; //!<[s] first reclose time + CoreTime mRecloseTime2 = 5.0; //!<[s] second reclose time model_parameter mRecloserTap = 0.0; //!< From side tap multiplier model_parameter mLimit = 1.0; //!<[puA] maximum current in puA - coreTime mLastRecloseTime = negTime; //!<[s] last reclose time - coreTime mRecloserResetTime = - coreTime(60.0); //!<[s] time the breaker has to be on before the recloser count resets + CoreTime mLastRecloseTime = negTime; //!<[s] last reclose time + CoreTime mRecloserResetTime = + CoreTime(60.0); //!<[s] time the breaker has to be on before the recloser count resets std::uint16_t mMaxRecloseAttempts = 0; //!< total number of recloses private: std::uint16_t mRecloseAttempts = 0; //!< reclose attempt counter @@ -52,17 +52,17 @@ class Breaker: public Relay { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void updateA(coreTime time) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void updateA(CoreTime time) override; // dynamic state functions - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; @@ -70,7 +70,7 @@ class Breaker: public Relay { const StateData& stateDataRef, double resid[], const SolverMode& sMode) override; - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; @@ -83,15 +83,15 @@ class Breaker: public Relay { const std::string& prefix) const override; protected: - virtual void conditionTriggered(index_t conditionNum, coreTime triggeredTime) override; + virtual void conditionTriggered(index_t conditionNum, CoreTime triggeredTime) override; /** trip the breaker @param[in] time current time */ - void tripBreaker(coreTime time); + void tripBreaker(CoreTime time); /** reset the breaker @param[in] time current time */ - void resetBreaker(coreTime time); + void resetBreaker(CoreTime time); }; } // namespace griddyn::relays diff --git a/src/griddyn/relays/BusRelay.cpp b/src/griddyn/relays/BusRelay.cpp index 77f4698df..4224bbf8c 100644 --- a/src/griddyn/relays/BusRelay.cpp +++ b/src/griddyn/relays/BusRelay.cpp @@ -88,7 +88,7 @@ void BusRelay::set(std::string_view param, double val, units::unit unitType) } } -void BusRelay::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void BusRelay::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { auto tripEvent = std::make_unique(0.0); @@ -115,7 +115,7 @@ void BusRelay::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) void BusRelay::actionTaken(index_t /*actionNum*/, index_t conditionNum, ChangeCode /*actionReturn*/, - coreTime /*actionTime*/) + CoreTime /*actionTime*/) { if (conditionNum == 0) { alert(m_sourceObject, BUS_UNDER_VOLTAGE); diff --git a/src/griddyn/relays/BusRelay.h b/src/griddyn/relays/BusRelay.h index a2fd1b679..3a6f74e7e 100644 --- a/src/griddyn/relays/BusRelay.h +++ b/src/griddyn/relays/BusRelay.h @@ -21,9 +21,9 @@ class BusRelay: public Relay { protected: model_parameter mCutoutVoltage = 0.0; //!<[puV] low voltage limit model_parameter mCutoutFrequency = 0.0; //!<[puHz] trip on low frequency - coreTime mVoltageDelay = + CoreTime mVoltageDelay = timeZero; //!< [s] period of time the voltage must be below limit to activate - coreTime mFrequencyDelay = + CoreTime mFrequencyDelay = timeZero; //!< [s] period of time the frequency must be below limit to activate public: explicit BusRelay(const std::string& objName = "busrelay_$"); @@ -34,12 +34,12 @@ class BusRelay: public Relay { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; protected: virtual void actionTaken(index_t actionNum, index_t conditionNum, ChangeCode actionReturn, - coreTime actionTime) override; + CoreTime actionTime) override; }; } // namespace griddyn::relays diff --git a/src/griddyn/relays/ControlRelay.cpp b/src/griddyn/relays/ControlRelay.cpp index 8d21bdd3f..8bbd8f98e 100644 --- a/src/griddyn/relays/ControlRelay.cpp +++ b/src/griddyn/relays/ControlRelay.cpp @@ -109,7 +109,7 @@ void ControlRelay::set(std::string_view param, double val, units::unit unitType) } } -void ControlRelay::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void ControlRelay::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { rootSim = dynamic_cast(getRoot()); @@ -125,7 +125,7 @@ void ControlRelay::dynObjectInitializeA(coreTime time0, std::uint32_t flags) void ControlRelay::actionTaken(index_t actionNum, index_t conditionNum, ChangeCode /*actionReturn*/, - coreTime /*actionTime*/) + CoreTime /*actionTime*/) { logging::normal(this, "condition {}-> action {} taken", conditionNum, actionNum); (void)(actionNum); @@ -335,7 +335,7 @@ void ControlRelay::updateObject(CoreObject* obj, ObjectUpdateMode mode) } std::unique_ptr - ControlRelay::generateGetEvent(coreTime eventTime, std::uint64_t sourceID, cm* message) + ControlRelay::generateGetEvent(CoreTime eventTime, std::uint64_t sourceID, cm* message) { auto act = getFreeAction(); actions[act].actionID = (message->m_actionID > 0) ? message->m_actionID : instructionCounter; @@ -356,7 +356,7 @@ std::unique_ptr } std::unique_ptr - ControlRelay::generateSetEvent(coreTime eventTime, std::uint64_t sourceID, cm* message) + ControlRelay::generateSetEvent(CoreTime eventTime, std::uint64_t sourceID, cm* message) { auto act = getFreeAction(); actions[act].actionID = (message->m_actionID > 0) ? message->m_actionID : instructionCounter; diff --git a/src/griddyn/relays/ControlRelay.h b/src/griddyn/relays/ControlRelay.h index 8b4fbfc60..9b3125b68 100644 --- a/src/griddyn/relays/ControlRelay.h +++ b/src/griddyn/relays/ControlRelay.h @@ -31,8 +31,8 @@ namespace relays { std::uint64_t sourceID; //!< the id of the source std::uint64_t actionID; //!< the id of the action itself std::string field; //!< the field to act upon - coreTime triggerTime; //!< the time the delayed action should be triggered - coreTime executionTime; //!< the time it was executed + CoreTime triggerTime; //!< the time the delayed action should be triggered + CoreTime executionTime; //!< the time it was executed double val; //!< the value associated with the change units::unit unitType = units::defunit; //!< the units associated with the action bool executed; //!< flag indicating the action is executed @@ -51,8 +51,8 @@ namespace relays { }; protected: - coreTime actionDelay = timeZero; //!< the delay between comm signal and action - coreTime measureDelay = + CoreTime actionDelay = timeZero; //!< the delay between comm signal and action + CoreTime measureDelay = timeZero; //!< the delay between comm measure request and action measurement extraction count_t instructionCounter = 0; //!< counter for the number of instructions std::int16_t m_terminal = @@ -75,7 +75,7 @@ namespace relays { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void updateObject(CoreObject* obj, ObjectUpdateMode mode = ObjectUpdateMode::DIRECT) override; /** add a measurement point to the relay @@ -93,7 +93,7 @@ namespace relays { virtual void actionTaken(index_t actionNum, index_t conditionNum, ChangeCode actionReturn, - coreTime actionTime) override; + CoreTime actionTime) override; virtual void receiveMessage(std::uint64_t sourceID, std::shared_ptr message) override; @@ -106,11 +106,11 @@ namespace relays { index_t getFreeAction(); std::unique_ptr - generateGetEvent(coreTime eventTime, + generateGetEvent(CoreTime eventTime, std::uint64_t sourceID, comms::ControlMessagePayload* message); std::unique_ptr - generateSetEvent(coreTime eventTime, + generateSetEvent(CoreTime eventTime, std::uint64_t sourceID, comms::ControlMessagePayload* message); }; diff --git a/src/griddyn/relays/DifferentialRelay.cpp b/src/griddyn/relays/DifferentialRelay.cpp index 09e953fb6..55194ac45 100644 --- a/src/griddyn/relays/DifferentialRelay.cpp +++ b/src/griddyn/relays/DifferentialRelay.cpp @@ -88,7 +88,7 @@ void DifferentialRelay::set(std::string_view param, double val, units::unit unit } } -void DifferentialRelay::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void DifferentialRelay::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { // if the target object is a link of some kind if (dynamic_cast(m_sourceObject) != nullptr) { @@ -160,7 +160,7 @@ void DifferentialRelay::pFlowObjectInitializeA(coreTime time0, std::uint32_t fla void DifferentialRelay::actionTaken(index_t actionNum, index_t /*conditionNum*/, ChangeCode /*actionReturn*/, - coreTime /*actionTime*/) + CoreTime /*actionTime*/) { logging::normal(this, "Relay Tripped"); @@ -172,7 +172,7 @@ void DifferentialRelay::actionTaken(index_t actionNum, } } -void DifferentialRelay::conditionTriggered(index_t /*conditionNum*/, coreTime /*triggerTime*/) +void DifferentialRelay::conditionTriggered(index_t /*conditionNum*/, CoreTime /*triggerTime*/) { logging::normal(this, "differential condition met"); if (opFlags.test(USE_COMM_LINK)) { @@ -182,7 +182,7 @@ void DifferentialRelay::conditionTriggered(index_t /*conditionNum*/, coreTime /* } } -void DifferentialRelay::conditionCleared(index_t /*conditionNum*/, coreTime /*triggerTime*/) +void DifferentialRelay::conditionCleared(index_t /*conditionNum*/, CoreTime /*triggerTime*/) { logging::normal(this, "differential condition cleared"); diff --git a/src/griddyn/relays/DifferentialRelay.h b/src/griddyn/relays/DifferentialRelay.h index 66f00b3a3..1f4541e77 100644 --- a/src/griddyn/relays/DifferentialRelay.h +++ b/src/griddyn/relays/DifferentialRelay.h @@ -39,7 +39,7 @@ class DifferentialRelay: public Relay { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; virtual void getParameterStrings(stringVec& pstr, ParamStringType pstype) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void receiveMessage(std::uint64_t sourceID, std::shared_ptr message) override; @@ -48,9 +48,9 @@ class DifferentialRelay: public Relay { virtual void actionTaken(index_t actionNum, index_t conditionNum, ChangeCode actionReturn, - coreTime actionTime) override; - virtual void conditionTriggered(index_t conditionNum, coreTime triggerTime) override; - virtual void conditionCleared(index_t conditionNum, coreTime triggerTime) override; + CoreTime actionTime) override; + virtual void conditionTriggered(index_t conditionNum, CoreTime triggerTime) override; + virtual void conditionCleared(index_t conditionNum, CoreTime triggerTime) override; }; } // namespace griddyn::relays diff --git a/src/griddyn/relays/Fuse.cpp b/src/griddyn/relays/Fuse.cpp index a4be8a50a..43e0df60a 100644 --- a/src/griddyn/relays/Fuse.cpp +++ b/src/griddyn/relays/Fuse.cpp @@ -17,7 +17,7 @@ #include "../measurement/StateGrabber.h" #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/MatrixDataSparse.hpp" #include #include #include @@ -86,7 +86,7 @@ void Fuse::set(std::string_view param, double val, units::unit unitType) } } -void Fuse::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Fuse::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { auto ge = std::make_shared(); @@ -154,7 +154,7 @@ void Fuse::dynObjectInitializeA(coreTime time0, std::uint32_t flags) Relay::dynObjectInitializeA(time0, flags); } -void Fuse::conditionTriggered(index_t conditionNum, coreTime /*triggerTime*/) +void Fuse::conditionTriggered(index_t conditionNum, CoreTime /*triggerTime*/) { if (conditionNum == 2) { assert(opFlags[overlimitFlag]); @@ -223,7 +223,7 @@ count_t Fuse::localJacobianCount(const SolverMode& sMode) const return 0; } -void Fuse::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void Fuse::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { if (limit < kBigNum / 2.0) { double val = getConditionValue(0); @@ -236,7 +236,7 @@ void Fuse::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& / prevTime = time; } -void Fuse::converge(coreTime time, +void Fuse::converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -248,19 +248,19 @@ void Fuse::converge(coreTime time, void Fuse::jacobianElements(const IOdata& /*inputs*/, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { - // TODO(phlpt): Replace matrixDataSparse here with a translation matrix. + // TODO(phlpt): Replace MatrixDataSparse here with a translation matrix. if (useI2T) { - matrixDataSparse localJacobian; + MatrixDataSparse localJacobian; IOdata out; auto voltageOffset = bus->getOutputLoc(sMode, voltageInLocation); auto inputs = bus->getOutputs(noInputs, stateDataRef, sMode); auto inputLocs = bus->getOutputLocs(sMode); if (opFlags[nonlinkSourceFlag]) { - auto* gridSecondaryObject = static_cast(m_sourceObject); + auto* gridSecondaryObject = static_cast(m_sourceObject); out = gridSecondaryObject->getOutputs(inputs, stateDataRef, sMode); gridSecondaryObject->outputPartialDerivatives(inputs, stateDataRef, @@ -304,7 +304,7 @@ void Fuse::jacobianElements(const IOdata& /*inputs*/, } } -void Fuse::setState(coreTime time, +void Fuse::setState(CoreTime time, const double state[], const double /*dstateDt*/[], const SolverMode& sMode) @@ -348,7 +348,7 @@ void Fuse::residual(const IOdata& /*inputs*/, } } -void Fuse::guessState(const coreTime /*time*/, +void Fuse::guessState(const CoreTime /*time*/, double state[], double dstateDt[], const SolverMode& sMode) diff --git a/src/griddyn/relays/Fuse.h b/src/griddyn/relays/Fuse.h index 7ed37cd15..a08d70c74 100644 --- a/src/griddyn/relays/Fuse.h +++ b/src/griddyn/relays/Fuse.h @@ -27,7 +27,7 @@ class Fuse: public Relay { // 4 byte gap here to use for something if need be model_parameter limit = kBigNum; //!<[puA] maximum current model_parameter mp_I2T = 0.0; //!<[puA^2*s] I squared t characteristic of fuse 1 in puA^2*s - coreTime minBlowTime = + CoreTime minBlowTime = 0.001; //!<[s] the minimum time required to for the fuse to blow only used if I2T>0; private: double cI2T = 0.0; //!< calculated I2t value for fuse @@ -43,16 +43,16 @@ class Fuse: public Relay { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; // dynamic functions for evaluation with a limit exceeded - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataRef, - matrixData& jacobian, + MatrixData& jacobian, const IOlocs& inputLocs, const SolverMode& sMode) override; - virtual void setState(coreTime time, + virtual void setState(CoreTime time, const double state[], const double dstateDt[], const SolverMode& sMode) override; @@ -60,11 +60,11 @@ class Fuse: public Relay { const StateData& stateDataRef, double resid[], const SolverMode& sMode) override; - virtual void guessState(coreTime time, + virtual void guessState(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode) override; - virtual void converge(coreTime time, + virtual void converge(CoreTime time, double state[], double dstateDt[], const SolverMode& sMode, @@ -79,7 +79,7 @@ class Fuse: public Relay { const std::string& prefix) const override; protected: - virtual void conditionTriggered(index_t conditionNum, coreTime triggerTime) override; + virtual void conditionTriggered(index_t conditionNum, CoreTime triggerTime) override; /** function to setup the numerical calculations associated with the fuse*/ ChangeCode setupFuseEvaluation(); diff --git a/src/griddyn/relays/LoadRelay.cpp b/src/griddyn/relays/LoadRelay.cpp index fa4100abb..26f66625a 100644 --- a/src/griddyn/relays/LoadRelay.cpp +++ b/src/griddyn/relays/LoadRelay.cpp @@ -76,7 +76,7 @@ void LoadRelay::set(std::string_view param, double val, units::unit unitType) } } -void LoadRelay::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void LoadRelay::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { auto tripEvent = std::make_shared(); @@ -104,7 +104,7 @@ void LoadRelay::dynObjectInitializeA(coreTime time0, std::uint32_t flags) void LoadRelay::actionTaken(index_t actionNum, index_t conditionNum, ChangeCode /*actionReturn*/, - coreTime /*actionTime*/) + CoreTime /*actionTime*/) { logging::normal(this, "condition {} action {}", conditionNum, actionNum); (void)actionNum; @@ -139,7 +139,7 @@ m_condition_level = conditionNum; */ } -void LoadRelay::conditionTriggered(index_t conditionNum, coreTime /*triggerTime*/) +void LoadRelay::conditionTriggered(index_t conditionNum, CoreTime /*triggerTime*/) { logging::normal(this, "condition {} triggered", conditionNum); (void)conditionNum; @@ -180,7 +180,7 @@ commLink->transmit (commDestName, static_cast (P.GetMessageType ()), P.size */ } -void LoadRelay::conditionCleared(index_t conditionNum, coreTime /*triggerTime*/) +void LoadRelay::conditionCleared(index_t conditionNum, CoreTime /*triggerTime*/) { logging::normal(this, "condition {} cleared", conditionNum); (void)conditionNum; diff --git a/src/griddyn/relays/LoadRelay.h b/src/griddyn/relays/LoadRelay.h index af136c89c..2fc6f7b29 100644 --- a/src/griddyn/relays/LoadRelay.h +++ b/src/griddyn/relays/LoadRelay.h @@ -23,9 +23,9 @@ class LoadRelay: public Relay { protected: double mCutoutVoltage = 0.0; //!<[puV] low voltage trigger for load double mCutoutFrequency = 0.0; //!<[puHz] low frequency trigger for load - coreTime mVoltageDelay = timeZero; //!<[s] the delay on the voltage trip - coreTime mFrequencyDelay = timeZero; //!<[s] the delay on the frequency tripping - coreTime mOffTime = maxTime; //!<[s] the time before the load comes back on line if the trip + CoreTime mVoltageDelay = timeZero; //!<[s] the delay on the voltage trip + CoreTime mFrequencyDelay = timeZero; //!<[s] the delay on the frequency tripping + CoreTime mOffTime = maxTime; //!<[s] the time before the load comes back on line if the trip //!< cause has been corrected public: explicit LoadRelay(const std::string& objName = "loadRelay_$"); @@ -36,14 +36,14 @@ class LoadRelay: public Relay { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; protected: virtual void actionTaken(index_t actionNum, index_t conditionNum, ChangeCode actionReturn, - coreTime actionTime) override; - virtual void conditionTriggered(index_t conditionNum, coreTime triggerTime) override; - virtual void conditionCleared(index_t conditionNum, coreTime triggerTime) override; + CoreTime actionTime) override; + virtual void conditionTriggered(index_t conditionNum, CoreTime triggerTime) override; + virtual void conditionCleared(index_t conditionNum, CoreTime triggerTime) override; }; } // namespace griddyn::relays diff --git a/src/griddyn/relays/Pmu.cpp b/src/griddyn/relays/Pmu.cpp index 4e1fbd303..b6c38518a 100644 --- a/src/griddyn/relays/Pmu.cpp +++ b/src/griddyn/relays/Pmu.cpp @@ -126,7 +126,7 @@ double Pmu::get(std::string_view param, units::unit unitType) const return Sensor::get(param, unitType); } -void Pmu::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Pmu::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (m_sourceObject == nullptr) { // we know the parent is most likely an area so find the corresponding bus that matches @@ -260,7 +260,7 @@ void Pmu::createFilterBlocks() } } -void Pmu::updateA(coreTime time) +void Pmu::updateA(CoreTime time) { Sensor::updateA(time); if (time >= mNextTransmitTime) { @@ -272,7 +272,7 @@ void Pmu::updateA(coreTime time) } } -coreTime Pmu::updateB() +CoreTime Pmu::updateB() { Sensor::updateB(); if (nextUpdateTime > mNextTransmitTime) { diff --git a/src/griddyn/relays/Pmu.h b/src/griddyn/relays/Pmu.h index 64e2ce879..9144266f7 100644 --- a/src/griddyn/relays/Pmu.h +++ b/src/griddyn/relays/Pmu.h @@ -24,7 +24,7 @@ class Pmu: public Sensor { }; protected: - coreTime mTransmissionPeriod = 1.0 / 30.0; //!< the rate of data transmission + CoreTime mTransmissionPeriod = 1.0 / 30.0; //!< the rate of data transmission model_parameter mVoltageFilterTime = 0.05; //!< filter time constant for the voltage measurement model_parameter mAngleFilterTime = 0.05; //!< filter time constant for the angle measurement @@ -33,8 +33,8 @@ class Pmu: public Sensor { model_parameter mRocofFilterTime = 0.05; //!< filter time constant for computing the ROCOF model_parameter mSampleRate = 720.0; //!< [Hz] the actual sample time private: - coreTime mNextTransmitTime = maxTime; //!< the time of the next transmission - coreTime mLastTransmitTime = negTime; //!< the time of the last transmission + CoreTime mNextTransmitTime = maxTime; //!< the time of the next transmission + CoreTime mLastTransmitTime = negTime; //!< the time of the last transmission public: Pmu(const std::string& objName = "pmu_$"); CoreObject* clone(CoreObject* obj = nullptr) const override; @@ -47,10 +47,10 @@ class Pmu: public Sensor { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void updateA(coreTime time) override; - virtual coreTime updateB() override; + virtual void updateA(CoreTime time) override; + virtual CoreTime updateB() override; private: /** create the appropriate output names based on the settings*/ diff --git a/src/griddyn/relays/Relay.cpp b/src/griddyn/relays/Relay.cpp index de39587a9..cdb33096a 100644 --- a/src/griddyn/relays/Relay.cpp +++ b/src/griddyn/relays/Relay.cpp @@ -162,7 +162,7 @@ void Relay::setSink(CoreObject* obj) m_sinkObject = obj; } -void Relay::setActionTrigger(index_t actionNumber, index_t conditionNumber, coreTime delayTime) +void Relay::setActionTrigger(index_t actionNumber, index_t conditionNumber, CoreTime delayTime) { if (std::cmp_greater_equal(conditionNumber, conditions.size())) { logging::warning(this, "attempted set of invalid conditonNumber"); @@ -186,7 +186,7 @@ void Relay::setActionTrigger(index_t actionNumber, index_t conditionNumber, core void Relay::setActionMultiTrigger(index_t actionNumber, const IOlocs& multiConditions, - coreTime delayTime) + CoreTime delayTime) { if (std::cmp_greater_equal(actionNumber, actions.size())) { return; @@ -420,7 +420,7 @@ void Relay::setFlag(std::string_view flag, bool val) } } -void Relay::updateA(coreTime time) +void Relay::updateA(CoreTime time) { auto ncond = condChecks; // the condition triggers may change the number of conditions so the // array needs to @@ -477,7 +477,7 @@ std::string Relay::generateCommName() return getName(); } -void Relay::pFlowObjectInitializeA(coreTime time0, std::uint32_t /*flags*/) +void Relay::pFlowObjectInitializeA(CoreTime time0, std::uint32_t /*flags*/) { if ((opFlags[USE_COMM_LINK]) && (!(commLink))) { if (cManager.getName().empty()) { @@ -525,7 +525,7 @@ void Relay::pFlowObjectInitializeA(coreTime time0, std::uint32_t /*flags*/) prevTime = time0; } -void Relay::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Relay::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (opFlags[CONTINUOUS_FLAG]) { updateRootCount(false); @@ -636,7 +636,7 @@ void Relay::rootTest(const IOdata& /*inputs*/, } } -void Relay::rootTrigger(coreTime time, +void Relay::rootTrigger(CoreTime time, const IOdata& /*inputs*/, const std::vector& rootMask, const SolverMode& sMode) @@ -672,7 +672,7 @@ ChangeCode Relay::rootCheck(const IOdata& /*inputs*/, { auto prevTrig = triggerCount; auto prevAct = actionsTakenCount; - const coreTime currentTime = (!stateDataValue.empty()) ? (stateDataValue.time) : prevTime; + const CoreTime currentTime = (!stateDataValue.empty()) ? (stateDataValue.time) : prevTime; updateA(currentTime); if ((triggerCount != prevTrig) || (actionsTakenCount != prevAct)) { alert(this, UPDATE_TIME_CHANGE); @@ -686,7 +686,7 @@ void Relay::clearCondChecks(index_t conditionNumber) { auto condChecksCopy = condChecks; condChecks.resize(0); - coreTime mTime = nextUpdateTime; + CoreTime mTime = nextUpdateTime; for (auto& cond : condChecksCopy) { if (cond.conditionNum != conditionNumber) { condChecks.push_back(cond); @@ -738,8 +738,8 @@ void Relay::sendAlarm(std::uint32_t code) } ChangeCode Relay::triggerCondition(index_t conditionNum, - coreTime conditionTriggerTime, - coreTime minimumDelayTime) + CoreTime conditionTriggerTime, + CoreTime minimumDelayTime) { ChangeCode eventReturn = ChangeCode::NO_CHANGE; cStates[conditionNum] = ConditionStatus::triggered; @@ -773,7 +773,7 @@ ChangeCode Relay::triggerCondition(index_t conditionNum, return eventReturn; } -ChangeCode Relay::executeAction(index_t actionNumber, index_t conditionNumber, coreTime actionTime) +ChangeCode Relay::executeAction(index_t actionNumber, index_t conditionNumber, CoreTime actionTime) { auto eventReturn = actions[actionNumber]->execute(actionTime); ++actionsTakenCount; @@ -782,8 +782,8 @@ ChangeCode Relay::executeAction(index_t actionNumber, index_t conditionNumber, c } ChangeCode Relay::multiConditionCheckExecute(index_t conditionNumber, - coreTime conditionTriggerTime, - coreTime minimumDelayTime) + CoreTime conditionTriggerTime, + CoreTime minimumDelayTime) { ChangeCode eventReturn = ChangeCode::NO_CHANGE; // now check the multiCondition triggers @@ -812,7 +812,7 @@ ChangeCode Relay::multiConditionCheckExecute(index_t conditionNumber, return eventReturn; } -ChangeCode Relay::evaluateCondCheck(condCheckTime& cond, coreTime checkTime) +ChangeCode Relay::evaluateCondCheck(condCheckTime& cond, CoreTime checkTime) { ChangeCode eventReturn = ChangeCode::NO_CHANGE; if (checkTime >= cond.testTime) { @@ -822,7 +822,7 @@ ChangeCode Relay::evaluateCondCheck(condCheckTime& cond, coreTime checkTime) eventReturn = std::max(iret, eventReturn); } else { // it was a multiCondition trigger bool allTriggered = true; - const coreTime trigDelay = + const CoreTime trigDelay = multiConditionTriggers[cond.conditionNum][cond.actionNum].delayTime; for (auto& conditionNum : multiConditionTriggers[cond.conditionNum][cond.actionNum].multiConditions) { @@ -863,7 +863,7 @@ ChangeCode Relay::evaluateCondCheck(condCheckTime& cond, coreTime checkTime) void Relay::actionTaken(index_t actionNum, index_t conditionNum, ChangeCode actionReturn, - coreTime /*actionTime*/) + CoreTime /*actionTime*/) { static_cast(actionNum); static_cast(conditionNum); @@ -874,7 +874,7 @@ void Relay::actionTaken(index_t actionNum, conditionNum, static_cast(actionReturn)); } -void Relay::conditionTriggered(index_t conditionNum, coreTime timeTriggered) +void Relay::conditionTriggered(index_t conditionNum, CoreTime timeTriggered) { static_cast(conditionNum); static_cast(timeTriggered); @@ -890,7 +890,7 @@ void Relay::conditionTriggered(index_t conditionNum, coreTime timeTriggered) static_cast(timeTriggered)); } } -void Relay::conditionCleared(index_t conditionNum, coreTime timeCleared) +void Relay::conditionCleared(index_t conditionNum, CoreTime timeCleared) { static_cast(conditionNum); static_cast(timeCleared); diff --git a/src/griddyn/relays/Sensor.cpp b/src/griddyn/relays/Sensor.cpp index 50752e417..2456b1786 100644 --- a/src/griddyn/relays/Sensor.cpp +++ b/src/griddyn/relays/Sensor.cpp @@ -17,8 +17,8 @@ #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/TimeSeries.hpp" #include "gmlc/utilities/stringConversion.h" -#include "utilities/matrixDataSparse.hpp" -#include "utilities/matrixDataTranslate.hpp" +#include "utilities/MatrixDataSparse.hpp" +#include "utilities/MatrixDataTranslate.hpp" #include #include #include @@ -521,7 +521,7 @@ double Sensor::getInput(const StateData& stateDataValue, return ret; } -void Sensor::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void Sensor::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (dynamic_cast(m_sourceObject) != nullptr) { opFlags.set(LINK_TYPE_SOURCE); @@ -644,7 +644,7 @@ void Sensor::dynObjectInitializeB(const IOdata& inputs, fieldSet = getOutputs(inputs, emptyStateData, cLocalSolverMode); } -void Sensor::updateA(coreTime time) +void Sensor::updateA(CoreTime time) { if (time >= m_nextSampleTime) { auto blks = static_cast(filterBlocks.size()); @@ -659,7 +659,7 @@ void Sensor::updateA(coreTime time) Relay::updateA(time); } -void Sensor::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void Sensor::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { auto blks = static_cast(filterBlocks.size()); for (index_t kk = 0; kk < blks; ++kk) { @@ -672,13 +672,13 @@ void Sensor::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMo void Sensor::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { if (stateSize(sMode) > 0) { - matrixDataSparse sourceDerivatives; - matrixDataSparse processedDerivatives; + MatrixDataSparse sourceDerivatives; + MatrixDataSparse processedDerivatives; auto blks = static_cast(filterBlocks.size()); for (index_t kk = 0; kk < blks; ++kk) { // TODO(phlpt): This needs some help for performance and organization. @@ -855,10 +855,10 @@ index_t Sensor::getOutputLoc(const SolverMode& sMode, index_t outNum) const // TODO(phlpt): Simplify this output-partial-derivatives path. void Sensor::outputPartialDerivatives(const IOdata& /*inputs*/, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) { - matrixDataTranslate<3, double> aDT(matrixDataValue); + MatrixDataTranslate<3, double> aDT(matrixDataValue); for (index_t pp = 0; std::cmp_less(pp, outputs.size()); ++pp) { switch (outputMode[pp]) { case OutputMode::BLOCK: @@ -901,7 +901,7 @@ void Sensor::rootTest(const IOdata& inputs, } } -void Sensor::rootTrigger(coreTime time, +void Sensor::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/relays/Sensor.h b/src/griddyn/relays/Sensor.h index 368b63d4d..26fa1708b 100644 --- a/src/griddyn/relays/Sensor.h +++ b/src/griddyn/relays/Sensor.h @@ -81,7 +81,7 @@ class Sensor: public Relay { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, IOdata& fieldSet) override; @@ -92,12 +92,12 @@ class Sensor: public Relay { */ virtual void add(GridBlock* blk); /** @brief add a shared pointer to a GrabberSet - @param[in] dGr a shared pointer to GrabberSet Object + @param[in] grabberSet a shared pointer to GrabberSet Object */ virtual void add(std::shared_ptr grabberSet); /** @brief add a shared pointer to a GridGrabber object - @param[in] dGr a shared pointer to GrabberSet Object + @param[in] gridGrabber a shared pointer to GridGrabber Object */ virtual void add(std::shared_ptr gridGrabber); @@ -106,10 +106,10 @@ class Sensor: public Relay { std::shared_ptr getGrabberSet(index_t grabberNum); // dynamic functions for evaluation with a limit exceeded - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; @@ -138,7 +138,7 @@ class Sensor: public Relay { const SolverMode& sMode) const override; /** @brief get the block output from the sensor - @param[in] sD the state data to get the output from + @param[in] stateDataValue the state data to get the output from @param[in] sMode the SolverMode corresponding to the data @param[in] blockNumber the number of the block to get the output from @return a double with the requested block output @@ -148,7 +148,7 @@ class Sensor: public Relay { index_t blockNumber) const; /** @brief get the block rate of change from the sensor - @param[in] sD the state data to get the output from + @param[in] stateDataValue the state data to get the output from @param[in] sMode the SolverMode corresponding to the data @param[in] blockNumber the number of the block to get the output from @return a double with the requested block output rate of change @@ -158,7 +158,7 @@ class Sensor: public Relay { index_t blockNumber) const; /** @brief get the raw sensor input - @param[in] sD the state data to get the output from + @param[in] stateDataValue the state data to get the output from @param[in] sMode the SolverMode corresponding to the data @param[in] inputNumber the input of the index to get the value @return a double with the requested raw input @@ -166,17 +166,17 @@ class Sensor: public Relay { double getInput(const StateData& stateDataValue, const SolverMode& sMode, index_t inputNumber = 0) const; - virtual void updateA(coreTime time) override; + virtual void updateA(CoreTime time) override; virtual void outputPartialDerivatives(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; diff --git a/src/griddyn/relays/ZonalRelay.cpp b/src/griddyn/relays/ZonalRelay.cpp index aa04be83e..256595732 100644 --- a/src/griddyn/relays/ZonalRelay.cpp +++ b/src/griddyn/relays/ZonalRelay.cpp @@ -71,7 +71,7 @@ void ZonalRelay::set(std::string_view param, std::string_view val) Relay::set("zones", static_cast(dvals.size()), units::defunit); mZoneLevels = std::move(dvals); } else if (param == "delay") { - auto dvals = gmlc::utilities::str2vector(std::string{val}, negTime); + auto dvals = gmlc::utilities::str2vector(std::string{val}, negTime); if (dvals.size() != mZoneDelays.size()) { throw(InvalidParameterValue(param)); } @@ -152,7 +152,7 @@ double ZonalRelay::get(std::string_view param, units::unit unitType) const return val; } -void ZonalRelay::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void ZonalRelay::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { const double baseImpedance = m_sourceObject->get("impedance"); for (index_t kk = 0; kk < mZoneCount; ++kk) { @@ -204,7 +204,7 @@ void ZonalRelay::dynObjectInitializeA(coreTime time0, std::uint32_t flags) void ZonalRelay::actionTaken(index_t actionNum, index_t conditionNum, ChangeCode /*actionReturn*/, - coreTime /*actionTime*/) + CoreTime /*actionTime*/) { logging::normal( this, "condition {} action {} taken terminal {}", conditionNum, actionNum, m_terminal); @@ -221,7 +221,7 @@ void ZonalRelay::actionTaken(index_t actionNum, mConditionLevel = std::min(conditionNum, mConditionLevel); } -void ZonalRelay::conditionTriggered(index_t conditionNum, coreTime /*triggerTime*/) +void ZonalRelay::conditionTriggered(index_t conditionNum, CoreTime /*triggerTime*/) { logging::normal(this, "condition {} triggered terminal {}", conditionNum, m_terminal); mConditionLevel = std::min(conditionNum, mConditionLevel); @@ -242,7 +242,7 @@ void ZonalRelay::conditionTriggered(index_t conditionNum, coreTime /*triggerTime } } -void ZonalRelay::conditionCleared(index_t conditionNum, coreTime /*triggerTime*/) +void ZonalRelay::conditionCleared(index_t conditionNum, CoreTime /*triggerTime*/) { logging::normal(this, "condition {} cleared terminal {}", conditionNum, m_terminal); for (index_t kk = 0; kk < mZoneCount; ++kk) { diff --git a/src/griddyn/relays/ZonalRelay.h b/src/griddyn/relays/ZonalRelay.h index fc332442e..9436cd391 100644 --- a/src/griddyn/relays/ZonalRelay.h +++ b/src/griddyn/relays/ZonalRelay.h @@ -28,7 +28,7 @@ class ZonalRelay: public Relay { //!< multiterminal devices double mResetMargin = 0.01; //! mZoneLevels; //!< the level of impedance to trigger - std::vector mZoneDelays; //!< the delay upon which to act for the relay + std::vector mZoneDelays; //!< the delay upon which to act for the relay count_t mConditionLevel = kInvalidCount; //!< the level of condition that has been triggered int mAutoName = -1; //!< storage for indicator of the type of autoname to use public: @@ -42,15 +42,15 @@ class ZonalRelay: public Relay { virtual double get(std::string_view param, units::unit unitType = units::defunit) const override; - virtual void dynObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; protected: virtual void actionTaken(index_t actionNum, index_t conditionNum, ChangeCode actionReturn, - coreTime actionTime) override; - virtual void conditionTriggered(index_t conditionNum, coreTime triggerTime) override; - virtual void conditionCleared(index_t conditionNum, coreTime triggerTime) override; + CoreTime actionTime) override; + virtual void conditionTriggered(index_t conditionNum, CoreTime triggerTime) override; + virtual void conditionCleared(index_t conditionNum, CoreTime triggerTime) override; virtual void receiveMessage(std::uint64_t sourceID, std::shared_ptr message) override; /** function to automatically generate the comm system names diff --git a/src/griddyn/simulation/Diagnostics.cpp b/src/griddyn/simulation/Diagnostics.cpp index b6b59ed8c..278d634de 100644 --- a/src/griddyn/simulation/Diagnostics.cpp +++ b/src/griddyn/simulation/Diagnostics.cpp @@ -9,8 +9,8 @@ #include "../GridDynSimulation.h" #include "../solvers/SolverInterface.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/gridRandom.h" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/GridRandom.h" +#include "utilities/MatrixDataSparse.hpp" #include #include #include @@ -23,7 +23,7 @@ // NOLINTBEGIN namespace griddyn { -std::pair checkResid(GridDynSimulation* gds, coreTime time, const SolverMode& sMode) +std::pair checkResid(GridDynSimulation* gds, CoreTime time, const SolverMode& sMode) { return checkResid(gds, time, gds->getSolverInterface(sMode)); } @@ -35,7 +35,7 @@ std::pair checkResid(GridDynSimulation* gds, } std::pair - checkResid(GridDynSimulation* gds, coreTime time, const std::shared_ptr& sd) + checkResid(GridDynSimulation* gds, CoreTime time, const std::shared_ptr& sd) { const SolverMode& sMode = sd->getSolverMode(); std::vector resid; @@ -90,7 +90,7 @@ int jacobianCheck(GridDynSimulation* gds, double* state = sd->stateData(); double* dstate = sd->derivData(); - coreTime timeCurr = gds->getSimulationTime(); + CoreTime timeCurr = gds->getSimulationTime(); if ((gds->currentProcessState() <= GridDynSimulation::GridState::DYNAMIC_INITIALIZED) && (timeCurr <= gds->getStartTime())) { gds->guessState(timeCurr, state, dstate, sd->getSolverMode()); @@ -103,14 +103,14 @@ int jacobianCheck(GridDynSimulation* gds, std::copy(dstate, dstate + nsize, ndstate.data()); } - matrixDataSparse tad, tad2, md; + MatrixDataSparse tad, tad2, md; tad.reserve(gds->jacSize(sMode)); md.reserve(gds->jacSize(sMode)); tad2.reserve(gds->jacSize(sMode)); double delta = 1e-8; double delta2 = 1e-10; - // matrixDataSparse b2; + // MatrixDataSparse b2; if (jacTol < 0) // make sure the tolerance is positive { jacTol = jac_check_tol; @@ -303,7 +303,7 @@ int residualCheck(GridDynSimulation* gds, } int residualCheck(GridDynSimulation* gds, - coreTime time, + CoreTime time, const SolverMode& sMode, double residTol, bool useStateNames) @@ -356,7 +356,7 @@ int residualCheck(GridDynSimulation* gds, } int algebraicCheck(GridDynSimulation* gds, - coreTime time, + CoreTime time, const SolverMode& sMode, double algTol, bool useStateNames) @@ -421,7 +421,7 @@ int algebraicCheck(GridDynSimulation* gds, } int derivativeCheck(GridDynSimulation* gds, - coreTime time, + CoreTime time, const SolverMode& sMode, double derivTol, bool useStateNames) @@ -552,7 +552,7 @@ void dynamicSolverConvergenceTest(GridDynSimulation* gds, break; case 1: // random points { - utilities::gridRandom rng(utilities::gridRandom::DistributionType::UNIFORM, 0.0, 1.51); + utilities::GridRandom rng(utilities::GridRandom::DistributionType::UNIFORM, 0.0, 1.51); std::vector rvals(cvs); for (index_t kk = 0; kk < pts; ++kk) { rng.getNewValues(rvals, static_cast(cvs)); @@ -623,7 +623,7 @@ void dynamicSolverConvergenceTest(GridDynSimulation* gds, std::copy(baseState.begin(), baseState.begin() + ssize, state); } -std::vector getRowCounts(matrixData& md) +std::vector getRowCounts(MatrixData& md) { std::vector rowcnt(md.rowLimit()); auto sz = static_cast(md.size()); @@ -723,7 +723,7 @@ void printObjCountInfo(const objectCountInfo& oi, int clevel, int maxLevel) } } -void jacobianAnalysis(matrixData& md, +void jacobianAnalysis(MatrixData& md, GridDynSimulation* gds, const SolverMode& sMode, int level) diff --git a/src/griddyn/simulation/Diagnostics.h b/src/griddyn/simulation/Diagnostics.h index f646a8813..8a3700506 100644 --- a/src/griddyn/simulation/Diagnostics.h +++ b/src/griddyn/simulation/Diagnostics.h @@ -12,7 +12,7 @@ #include template -class matrixData; +class MatrixData; namespace griddyn { class GridDynSimulation; @@ -64,7 +64,7 @@ on the Jacobian check @return the number of mismatches */ int residualCheck(GridDynSimulation* gds, - coreTime time, + CoreTime time, const SolverMode& sMode, double residTol = resid_check_tol, bool useStateNames = false); @@ -73,18 +73,18 @@ std::pair checkResid(GridDynSimulation* gds, const std::shared_ptr& sd); std::pair - checkResid(GridDynSimulation* gds, coreTime time, const std::shared_ptr& sd); + checkResid(GridDynSimulation* gds, CoreTime time, const std::shared_ptr& sd); -std::pair checkResid(GridDynSimulation* gds, coreTime time, const SolverMode& sMode); +std::pair checkResid(GridDynSimulation* gds, CoreTime time, const SolverMode& sMode); int algebraicCheck(GridDynSimulation* gds, - coreTime time, + CoreTime time, const SolverMode& sMode, double algTol = resid_check_tol, bool useStateNames = false); int derivativeCheck(GridDynSimulation* gds, - coreTime time, + CoreTime time, const SolverMode& sMode, double derivTol = resid_check_tol, bool useStateNames = false); @@ -102,7 +102,7 @@ void dynamicSolverConvergenceTest(GridDynSimulation* gds, @param[in] gds the GridDynSimulation object to work with @param[in] sMode the solver mode in use */ -void jacobianAnalysis(matrixData& md, +void jacobianAnalysis(MatrixData& md, GridDynSimulation* gds, const SolverMode& sMode, int level); diff --git a/src/griddyn/simulation/DynamicInitialConditionRecovery.cpp b/src/griddyn/simulation/DynamicInitialConditionRecovery.cpp index 8c960d4bb..17c835c7c 100644 --- a/src/griddyn/simulation/DynamicInitialConditionRecovery.cpp +++ b/src/griddyn/simulation/DynamicInitialConditionRecovery.cpp @@ -203,7 +203,7 @@ int dynamicInitialConditionRecovery::dynamicFix2() // check for some low voltage conditions and change the low voltage load conditions int dynamicInitialConditionRecovery::dynamicFix3() { - const coreTime timeCurrent = sim->getSimulationTime(); + const CoreTime timeCurrent = sim->getSimulationTime(); sim->timestep(timeCurrent + 0.001, noInputs, solver->getSolverMode()); sim->dynamicCheckAndReset(solver->getSolverMode()); /*if (retval == 4) diff --git a/src/griddyn/simulation/FaultResetRecovery.cpp b/src/griddyn/simulation/FaultResetRecovery.cpp index 115eb6c0c..ede7b91a3 100644 --- a/src/griddyn/simulation/FaultResetRecovery.cpp +++ b/src/griddyn/simulation/FaultResetRecovery.cpp @@ -94,7 +94,7 @@ int faultResetRecovery::faultResetFix1() // auto err = jacobianCheck(sMode, -1, true); // dynamicSolverConvergenceTest(sMode, "convFile.dat",0,3); double* states = solver->stateData(); - coreTime timeCurr = sim->getSimulationTime(); + CoreTime timeCurr = sim->getSimulationTime(); sim->guessState(timeCurr, states, solver->derivData(), solver->getSolverMode()); std::vector vstates(solver->size(), 0); sim->getVoltageStates(vstates.data(), solver->getSolverMode()); @@ -116,7 +116,7 @@ int faultResetRecovery::faultResetFix2(ResetLevels rlevel) if ((retval = sim->handleStateChange(solver->getSolverMode())) != HANDLER_NO_RETURN) { return retval; } - coreTime timeCurr = sim->getSimulationTime(); + CoreTime timeCurr = sim->getSimulationTime(); sim->guessState(timeCurr, solver->stateData(), solver->derivData(), solver->getSolverMode()); // int mmatch = jacobianCheck(sim, solver->getSolverMode()); diff --git a/src/griddyn/simulation/GridDynSimulation.cpp b/src/griddyn/simulation/GridDynSimulation.cpp index ed06d0841..1d4ac8a17 100644 --- a/src/griddyn/simulation/GridDynSimulation.cpp +++ b/src/griddyn/simulation/GridDynSimulation.cpp @@ -21,7 +21,7 @@ #include "core/ObjectInterpreter.h" #include "gmlc/containers/mapOps.hpp" #include "gmlc/utilities/stringOps.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -516,7 +516,7 @@ void GridDynSimulation::setupOffsets(const SolverMode& sMode, OffsetOrdering off // --------------- run the simulation --------------- -int GridDynSimulation::run(coreTime tEnd) +int GridDynSimulation::run(CoreTime tEnd) { if (tEnd == negTime) { tEnd = stopTime; @@ -613,8 +613,8 @@ int GridDynSimulation::execute(const gridDynAction& cmd) out = FUNCTION_EXECUTION_FAILURE; break; case gridDynAction::GdAction::initialize: { - const coreTime startTimeValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : startTime; + const CoreTime startTimeValue = + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : startTime; if (pState == GridState::STARTUP) { out = pFlowInitialize(startTimeValue); @@ -631,17 +631,17 @@ int GridDynSimulation::execute(const gridDynAction& cmd) } } break; case gridDynAction::GdAction::iterate: { - const coreTime timeStepValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : stepTime; - const coreTime endTimeValue = - (cmd.val_double2 != kNullVal) ? coreTime(cmd.val_double2) : stopTime; + const CoreTime timeStepValue = + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : stepTime; + const CoreTime endTimeValue = + (cmd.val_double2 != kNullVal) ? CoreTime(cmd.val_double2) : stopTime; out = eventDrivenPowerflow(endTimeValue, timeStepValue); } break; case gridDynAction::GdAction::eventmode: { - const coreTime endTimeValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : stopTime; + const CoreTime endTimeValue = + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : stopTime; if (cmd.val_double2 != kNullVal) { - const coreTime timeStepValue = cmd.val_double2; + const CoreTime timeStepValue = cmd.val_double2; out = eventDrivenPowerflow(endTimeValue, timeStepValue); } else { out = eventDrivenPowerflow(endTimeValue); @@ -650,8 +650,8 @@ int GridDynSimulation::execute(const gridDynAction& cmd) break; case gridDynAction::GdAction::dynamicDAE: { - const coreTime endTimeValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : stopTime; + const CoreTime endTimeValue = + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : stopTime; if (pState < GridState::DYNAMIC_INITIALIZED) { out = dynInitialize(); if (out != FUNCTION_EXECUTION_SUCCESS) { @@ -667,9 +667,9 @@ int GridDynSimulation::execute(const gridDynAction& cmd) } break; case gridDynAction::GdAction::dynamicPart: { const double endTimeValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : stopTime; + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : stopTime; const double timeStepValue = - (cmd.val_double2 != kNullVal) ? coreTime(cmd.val_double2) : stepTime; + (cmd.val_double2 != kNullVal) ? CoreTime(cmd.val_double2) : stepTime; if (pState < GridState::DYNAMIC_INITIALIZED) { out = dynInitialize(); if (out != FUNCTION_EXECUTION_SUCCESS) { @@ -685,9 +685,9 @@ int GridDynSimulation::execute(const gridDynAction& cmd) } break; case gridDynAction::GdAction::dynamicDecoupled: { const double endTimeValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : stopTime; + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : stopTime; const double timeStepValue = - (cmd.val_double2 != kNullVal) ? coreTime(cmd.val_double2) : stepTime; + (cmd.val_double2 != kNullVal) ? CoreTime(cmd.val_double2) : stepTime; if (pState < GridState::DYNAMIC_INITIALIZED) { out = dynInitialize(); if (out != FUNCTION_EXECUTION_SUCCESS) { @@ -698,10 +698,10 @@ int GridDynSimulation::execute(const gridDynAction& cmd) out = dynamicDecoupled(endTimeValue, timeStepValue); } break; case gridDynAction::GdAction::step: { - const coreTime timeStepValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : stepTime; - coreTime timeActual = - (cmd.val_double2 != kNullVal) ? coreTime(cmd.val_double2) : stopTime; + const CoreTime timeStepValue = + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : stepTime; + CoreTime timeActual = + (cmd.val_double2 != kNullVal) ? CoreTime(cmd.val_double2) : stopTime; if (pState < GridState::DYNAMIC_INITIALIZED) { out = dynInitialize(); if (out != FUNCTION_EXECUTION_SUCCESS) { @@ -717,8 +717,8 @@ int GridDynSimulation::execute(const gridDynAction& cmd) } break; case gridDynAction::GdAction::run: if (actionQueue.empty()) { - const coreTime endTimeValue = - (cmd.val_double != kNullVal) ? coreTime(cmd.val_double) : stopTime; + const CoreTime endTimeValue = + (cmd.val_double != kNullVal) ? CoreTime(cmd.val_double) : stopTime; if (controlFlags[power_flow_only]) { out = powerflow(); } else { @@ -1545,14 +1545,14 @@ std::shared_ptr GridDynSimulation::updateSolver(const SolverMod return solverData; } -void GridDynSimulation::parameterDerivatives(coreTime time, +void GridDynSimulation::parameterDerivatives(CoreTime time, ParameterSet& parameterOperators, const index_t indices[], const double values[], count_t parameterCount, const double state[], const double dstateDt[], - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const SolverMode& sMode) { const double delta = 1e-7; @@ -1653,7 +1653,7 @@ void GridDynSimulation::fillExtraStateData(StateData& stateDataRef, const Solver } } -bool GridDynSimulation::checkEventsForDynamicReset(coreTime cTime, const SolverMode& sMode) +bool GridDynSimulation::checkEventsForDynamicReset(CoreTime cTime, const SolverMode& sMode) { if (EvQ->getNextTime() < cTime) { auto eventReturn = EvQ->executeEvents(cTime); diff --git a/src/griddyn/simulation/GridDynSimulationFileOps.cpp b/src/griddyn/simulation/GridDynSimulationFileOps.cpp index 40e4acef7..1cdc0474d 100644 --- a/src/griddyn/simulation/GridDynSimulationFileOps.cpp +++ b/src/griddyn/simulation/GridDynSimulationFileOps.cpp @@ -16,7 +16,7 @@ #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" #include "units/units.hpp" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/MatrixDataSparse.hpp" #include #include #include @@ -756,7 +756,7 @@ void saveStateBinary(GridDynSimulation* gds, } } -void writeVector(coreTime time, +void writeVector(CoreTime time, std::uint32_t code, std::uint32_t index, std::uint32_t key, @@ -783,11 +783,11 @@ void writeVector(coreTime time, bFile.write(reinterpret_cast(data), sizeof(double) * numElements); } -void writeArray(coreTime time, +void writeArray(CoreTime time, std::uint32_t code, std::uint32_t index, std::uint32_t key, - matrixData& matrixValues, + MatrixData& matrixValues, const std::string& fileName, bool append) { @@ -811,7 +811,7 @@ void writeArray(coreTime time, matrixValues.start(); for (size_t elementIndex = 0; elementIndex < numElements; ++elementIndex) { const auto elementData = matrixValues.next(); - bFile.write(reinterpret_cast(&elementData), sizeof(matrixElement)); + bFile.write(reinterpret_cast(&elementData), sizeof(MatrixElement)); } } @@ -958,14 +958,14 @@ void captureJacState(GridDynSimulation* gds, const std::string& fileName, const // writing the state vector const auto& currentMode = gds->getCurrentMode(sMode); auto solverInterface = gds->getSolverInterface(currentMode); - matrixDataSparse matrixData; + MatrixDataSparse MatrixData; StateData stateDescription(gds->getSimulationTime(), solverInterface->stateData(), solverInterface->derivData()); stateDescription.cj = 10000; - gds->jacobianElements(noInputs, stateDescription, matrixData, noInputLocs, currentMode); + gds->jacobianElements(noInputs, stateDescription, MatrixData, noInputLocs, currentMode); stringVec stateNames; gds->getStateName(stateNames, currentMode); @@ -982,11 +982,11 @@ void captureJacState(GridDynSimulation* gds, const std::string& fileName, const // write the state vector bFile.write(reinterpret_cast(solverInterface->stateData()), dsize * sizeof(double)); // writing the Jacobian Matrix - dsize = matrixData.size(); + dsize = MatrixData.size(); bFile.write(reinterpret_cast(&dsize), sizeof(count_t)); for (index_t elementIndex = 0; elementIndex < dsize; ++elementIndex) { - const auto elementData = matrixData.element(elementIndex); + const auto elementData = MatrixData.element(elementIndex); bFile.write(reinterpret_cast(&(elementData.row)), sizeof(index_t)); bFile.write(reinterpret_cast(&(elementData.col)), sizeof(index_t)); bFile.write(reinterpret_cast(&(elementData.data)), sizeof(double)); @@ -1006,14 +1006,14 @@ void saveJacobian(GridDynSimulation* gds, const std::string& fileName, const Sol const auto& currentMode = gds->getCurrentMode(sMode); auto SolverInterface = gds->getSolverInterface(currentMode); - matrixDataSparse matrixData; + MatrixDataSparse MatrixData; StateData stateDescription(gds->getSimulationTime(), SolverInterface->stateData(), SolverInterface->derivData()); stateDescription.cj = 10000; - gds->jacobianElements(noInputs, stateDescription, matrixData, noInputLocs, currentMode); + gds->jacobianElements(noInputs, stateDescription, MatrixData, noInputLocs, currentMode); stringVec stateNames; gds->getStateName(stateNames, currentMode); @@ -1026,11 +1026,11 @@ void saveJacobian(GridDynSimulation* gds, const std::string& fileName, const Sol bFile.write(stN.c_str(), stnSize); } // writing the Jacobian Matrix - dsize = matrixData.size(); + dsize = MatrixData.size(); bFile.write(reinterpret_cast(&dsize), sizeof(count_t)); for (index_t elementIndex = 0; elementIndex < dsize; ++elementIndex) { - const auto elementData = matrixData.element(elementIndex); + const auto elementData = MatrixData.element(elementIndex); bFile.write(reinterpret_cast(&(elementData.row)), sizeof(index_t)); bFile.write(reinterpret_cast(&(elementData.col)), sizeof(index_t)); bFile.write(reinterpret_cast(&(elementData.data)), sizeof(double)); diff --git a/src/griddyn/simulation/GridDynSimulationFileOps.h b/src/griddyn/simulation/GridDynSimulationFileOps.h index feaafc9d7..604329368 100644 --- a/src/griddyn/simulation/GridDynSimulationFileOps.h +++ b/src/griddyn/simulation/GridDynSimulationFileOps.h @@ -11,10 +11,10 @@ #include #include template -class matrixData; +class MatrixData; namespace griddyn { -// forward declare the template class matrixData +// forward declare the template class MatrixData class SolverMode; class GridDynSimulation; @@ -171,7 +171,7 @@ void loadPowerFlowCSV(GridDynSimulation* gds, const std::string& fileName); /** struct containing binary Data information */ struct dataInfo { - coreTime time = 0.0; + CoreTime time = 0.0; std::uint32_t code = 0; std::uint32_t index = 0; std::uint32_t key = 0; @@ -201,7 +201,7 @@ data object) @throw FileOperationError if the file cannot be opened */ -void writeVector(coreTime time, +void writeVector(CoreTime time, std::uint32_t code, std::uint32_t index, std::uint32_t key, @@ -226,11 +226,11 @@ data object) */ #define JACOBIAN_DATA 1 -void writeArray(coreTime time, +void writeArray(CoreTime time, std::uint32_t code, std::uint32_t index, std::uint32_t key, - matrixData& matrixValues, + MatrixData& matrixValues, const std::string& fileName, bool append = true); diff --git a/src/griddyn/simulation/GridSimulation.cpp b/src/griddyn/simulation/GridSimulation.cpp index 5a78cc296..45e857188 100644 --- a/src/griddyn/simulation/GridSimulation.cpp +++ b/src/griddyn/simulation/GridSimulation.cpp @@ -111,7 +111,7 @@ void GridSimulation::getEventObjects(std::vector& objV) const EvQ->getEventObjects(objV); } -int GridSimulation::run(coreTime /*finishTime*/) +int GridSimulation::run(CoreTime /*finishTime*/) { return FUNCTION_EXECUTION_FAILURE; } @@ -121,7 +121,7 @@ int GridSimulation::step() return FUNCTION_EXECUTION_FAILURE; } -void GridSimulation::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void GridSimulation::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { GridArea::timestep(time, inputs, sMode); EvQ->executeEvents(time); @@ -441,12 +441,12 @@ void GridSimulation::resetObjectCounters() Generator::genCount = 0; } -coreTime GridSimulation::getEventTime() const +CoreTime GridSimulation::getEventTime() const { return EvQ->getNextTime(); } -coreTime GridSimulation::getEventTime(int eventCode) const +CoreTime GridSimulation::getEventTime(int eventCode) const { return EvQ->getNextTime(eventCode); } @@ -460,7 +460,7 @@ CoreObject* findMatchingObject(CoreObject* obj1, GridPrimary* src, GridPrimary* return sec; } CoreObject* obj2 = nullptr; - if (dynamic_cast(obj1) != + if (dynamic_cast(obj1) != nullptr) // we know it is a gen or load so it parent should be a bus { auto* bus = dynamic_cast(obj1->getParent()); @@ -479,7 +479,7 @@ CoreObject* findMatchingObject(CoreObject* obj1, GridPrimary* src, GridPrimary* } else if (dynamic_cast(obj1) != nullptr) { obj2 = getMatchingLink(dynamic_cast(obj1), src, sec); } else { - // now we get ugly we are gridSecondary Object + // now we get ugly we are GridSecondary object CoreObject* pobj = findMatchingObject(obj1->getParent(), src, sec); if (pobj != nullptr) { // this is an internal string sequence for this purpose, likely // won't be documented diff --git a/src/griddyn/simulation/GridSimulation.h b/src/griddyn/simulation/GridSimulation.h index 96d636239..59d88e16a 100644 --- a/src/griddyn/simulation/GridSimulation.h +++ b/src/griddyn/simulation/GridSimulation.h @@ -77,7 +77,7 @@ class GridSimulation: public GridArea { std::string stateFile; //!< record file for the state std::string recordDirectory; //!< folder location for storing recorded files std::string version; //!< storage for the version string - coreTime state_record_period = negTime; //!< how often to record the state + CoreTime state_record_period = negTime; //!< how often to record the state #ifdef ENABLE_MULTITHREADING std::unique_ptr gridLog; //!< the object that does the logging #else @@ -97,26 +97,26 @@ class GridSimulation: public GridArea { count_t errorCount = 0; //!< count the number of logged warnings // ---------------- clock ---------------- - coreTime startTime = timeZero; //!< [s] start time - coreTime stopTime = 30.0; //!< [s] end time - coreTime currentTime = timeZero; //!< [s] the current time - std::atomic simulationTime; //!< [s] current time - coreTime stepTime = coreTime(0.05); //!< [s] time step - coreTime timeReturn = timeZero; //!< [s] time returned by the solver - coreTime nextStopTime = negTime; //!< next time to stop the dynamic Simulation + CoreTime startTime = timeZero; //!< [s] start time + CoreTime stopTime = 30.0; //!< [s] end time + CoreTime currentTime = timeZero; //!< [s] the current time + std::atomic simulationTime; //!< [s] current time + CoreTime stepTime = CoreTime(0.05); //!< [s] time step + CoreTime timeReturn = timeZero; //!< [s] time returned by the solver + CoreTime nextStopTime = negTime; //!< next time to stop the dynamic Simulation - coreTime minUpdateTime = coreTime(0.0001); //!< minimum time period to go between updates; for + CoreTime minUpdateTime = CoreTime(0.0001); //!< minimum time period to go between updates; for //!< the hybrid simultaneous partitioned solution - coreTime maxUpdateTime = maxTime; //!<(s) max time period to go between updates + CoreTime maxUpdateTime = maxTime; //!<(s) max time period to go between updates double absTime = 0; //!< [s] seconds in unix time of the system start time; // ---------------- recorders ---------------- - coreTime recordStart = negTime; //!< [s] recorder start time - coreTime recordStop = maxTime; //!< [s] recorder stop time + CoreTime recordStart = negTime; //!< [s] recorder start time + CoreTime recordStop = maxTime; //!< [s] recorder stop time std::vector> collectorList; //!< vector storing recorder objects - coreTime nextRecordTime = maxTime; //!< time for the next set of recorders + CoreTime nextRecordTime = maxTime; //!< time for the next set of recorders - coreTime lastStateRecordTime = negTime; //!< last time the full state was recorded + CoreTime lastStateRecordTime = negTime; //!< last time the full state was recorded // ----------------timestepP ----------------- std::unique_ptr EvQ; //!< the event queue for the simulation system @@ -173,12 +173,12 @@ class GridSimulation: public GridArea { /** @brief get all the objects from the event Queue */ void getEventObjects(std::vector& objV) const; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** @brief run the simulator @param[in] finishTime the time to run to @return return code 0 for success other for failure */ - virtual int run(coreTime finishTime = negTime); + virtual int run(CoreTime finishTime = negTime); /** @brief have the simulator step forward in time @return return code 0 for success other for failure */ @@ -205,38 +205,38 @@ class GridSimulation: public GridArea { * @brief Gets the current simulation time. @details currentTime is atomic and can be used in a multithreaded context to observe the current progress of an asyncrhonously running dynamic simulation - * @return a coreTime representing the current simulation time. + * @return a CoreTime representing the current simulation time. */ - coreTime getSimulationTime() const { return currentTime; } + CoreTime getSimulationTime() const { return currentTime; } /** * @brief Gets the simulation start time. * @return a double representing the simulation start time, in seconds. */ - coreTime getStartTime() const { return startTime; } + CoreTime getStartTime() const { return startTime; } /** * @brief Gets the simulation stop time. * @return a double representing the simulation start time, in seconds. */ - coreTime getStopTime() const { return stopTime; } + CoreTime getStopTime() const { return stopTime; } /** * @brief Gets the simulation step time. * @return a time representing the simulation start time, in seconds. */ - coreTime getStepTime() const { return stepTime; } + CoreTime getStepTime() const { return stepTime; } /** * @brief gets the next event time. * @return a double representing the next scheduled event in GridDyn. */ - coreTime getEventTime() const; + CoreTime getEventTime() const; /** * @brief gets the next event time. * @param[in] eventCode a code corresponding to a specific type of event * @return a time representing the next scheduled event in GridDyn. */ - coreTime getEventTime(int eventCode) const; + CoreTime getEventTime(int eventCode) const; /** set a custom logging function */ diff --git a/src/griddyn/simulation/gridDynDynamic.cpp b/src/griddyn/simulation/gridDynDynamic.cpp index 1153a6e46..2fb40c35a 100644 --- a/src/griddyn/simulation/gridDynDynamic.cpp +++ b/src/griddyn/simulation/gridDynDynamic.cpp @@ -14,7 +14,7 @@ #include "GridDynSimulationFileOps.h" #include "core/CoreExceptions.h" #include "gmlc/utilities/vectorOps.hpp" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" // system libraries #include #include @@ -32,7 +32,7 @@ static IOdata kNullOutputVec; //!< this is a purposely created empty vector wh // --------------- dynamic program --------------- // dynamic solver and initial conditions -int GridDynSimulation::dynInitialize(coreTime tStart) +int GridDynSimulation::dynInitialize(CoreTime tStart) { if (opFlags[dyn_initialized]) { offsets.unload(true); @@ -131,8 +131,8 @@ int GridDynSimulation::dynInitialize(coreTime tStart) } int GridDynSimulation::runDynamicSolverStep(std::shared_ptr& dynData, - coreTime nextStop, - coreTime& timeActual) + CoreTime nextStop, + CoreTime& timeActual) { int retval = FUNCTION_EXECUTION_SUCCESS; if (controlFlags[single_step_mode]) { @@ -221,7 +221,7 @@ int GridDynSimulation::dynamicDAEStartupConditions(std::shared_ptrgetNextTime(); setupDynamicPartitioned(); - coreTime lastTimeStop = currentTime; + CoreTime lastTimeStop = currentTime; auto dynDataAlg = getSolverInterface(*defDynAlgMode); auto dynDataDiff = getSolverInterface(*defDynDiffMode); @@ -505,20 +505,20 @@ int GridDynSimulation::dynamicPartitioned(coreTime tStop, coreTime tStep) return out; } -int GridDynSimulation::dynamicDecoupled(coreTime /*tStop*/, coreTime /*tStep*/) +int GridDynSimulation::dynamicDecoupled(CoreTime /*tStop*/, CoreTime /*tStep*/) { return FUNCTION_EXECUTION_FAILURE; } int GridDynSimulation::step() { - coreTime tact; - const coreTime nextT = currentTime + stepTime; + CoreTime tact; + const CoreTime nextT = currentTime + stepTime; const int ret = step(nextT, tact); return (tact == nextT) ? FUNCTION_EXECUTION_SUCCESS : ret; } -int GridDynSimulation::step(coreTime nextStep, coreTime& timeActual) +int GridDynSimulation::step(CoreTime nextStep, CoreTime& timeActual) { if (currentTime >= nextStep) { if (EvQ->getNextTime() <= currentTime) { @@ -575,7 +575,7 @@ int GridDynSimulation::step(coreTime nextStep, coreTime& timeActual) nextStopTime = std::min(nextStep, EvQ->getNextTime()); while (timeReturn < nextStep) { - coreTime tStop = std::min(nextStep, nextStopTime); + CoreTime tStop = std::min(nextStep, nextStopTime); nextStopTime = nextStep; if (tStop - currentTime < @@ -588,7 +588,7 @@ int GridDynSimulation::step(coreTime nextStep, coreTime& timeActual) } while (timeReturn + tols.timeTol < tStop) { - const coreTime lastTimeStop = currentTime; + const CoreTime lastTimeStop = currentTime; if (dynamicCheckAndReset(solverModeRef)) { retval = generateDaeDynamicInitialConditions(solverModeRef); if (retval != FUNCTION_EXECUTION_SUCCESS) { @@ -625,7 +625,7 @@ int GridDynSimulation::step(coreTime nextStep, coreTime& timeActual) } void GridDynSimulation::handleEarlySolverReturn(int retval, - coreTime timeActual, + CoreTime timeActual, std::shared_ptr& dynData) { ++haltCount; @@ -828,7 +828,7 @@ int GridDynSimulation::generatePartitionedDynamicInitialConditions(const SolverM SolverInterface::IcModes::FIXED_DIFF, true); opFlags.reset(low_bus_voltage); */ } - coreTime tRet; + CoreTime tRet; retval = dynDataAlg->solve(currentTime + probeStepTime, tRet); if (retval == FUNCTION_EXECUTION_SUCCESS) { currentTime += probeStepTime; @@ -979,7 +979,7 @@ int GridDynSimulation::reInitDyn(const SolverMode& sMode) static constexpr double resid_print_tol = 1e-6; #endif // IDA nonlinear function evaluation -int GridDynSimulation::residualFunction(coreTime time, +int GridDynSimulation::residualFunction(CoreTime time, const double state[], const double dstate_dt[], double resid[], @@ -1020,7 +1020,7 @@ int GridDynSimulation::residualFunction(coreTime time, static std::vector rvals; static std::vector lstate; static std::vector dbigger; - static coreTime ptime = negTime; + static CoreTime ptime = negTime; auto dynData = getSolverInterface(sMode); const auto stateCount = dynData->size(); if (rvals.size() != stateCount) { @@ -1134,7 +1134,7 @@ int GridDynSimulation::residualFunction(coreTime time, return 0; } -int GridDynSimulation::derivativeFunction(coreTime time, +int GridDynSimulation::derivativeFunction(CoreTime time, const double state[], double dstate_dt[], const SolverMode& sMode) noexcept @@ -1160,10 +1160,10 @@ int GridDynSimulation::derivativeFunction(coreTime time, } // Jacobian computation -int GridDynSimulation::jacobianFunction(coreTime time, +int GridDynSimulation::jacobianFunction(CoreTime time, const double state[], const double dstate_dt[], - matrixData& matrixDataRef, + MatrixData& matrixDataRef, double cjValue, const SolverMode& sMode) noexcept { @@ -1182,7 +1182,7 @@ int GridDynSimulation::jacobianFunction(coreTime time, return FUNCTION_EXECUTION_SUCCESS; } -int GridDynSimulation::rootFindingFunction(coreTime time, +int GridDynSimulation::rootFindingFunction(CoreTime time, const double state[], const double dstate_dt[], double roots[], @@ -1194,7 +1194,7 @@ int GridDynSimulation::rootFindingFunction(coreTime time, return FUNCTION_EXECUTION_SUCCESS; } -int GridDynSimulation::dynAlgebraicSolve(coreTime time, +int GridDynSimulation::dynAlgebraicSolve(CoreTime time, const double diffState[], const double deriv[], const SolverMode& sMode) noexcept @@ -1205,7 +1205,7 @@ int GridDynSimulation::dynAlgebraicSolve(coreTime time, auto solverData = getSolverInterface(sMode.pairedOffsetIndex); int ret = FUNCTION_EXECUTION_FAILURE; if (solverData) { - coreTime tret; + CoreTime tret; ret = solverData->solve(time, tret); if (ret < 0) { if (jacobianCheck(this, solverData->getSolverMode()) > 0) { diff --git a/src/griddyn/simulation/gridDynPowerFlow.cpp b/src/griddyn/simulation/gridDynPowerFlow.cpp index dae6b2ff0..27df89e2c 100644 --- a/src/griddyn/simulation/gridDynPowerFlow.cpp +++ b/src/griddyn/simulation/gridDynPowerFlow.cpp @@ -71,7 +71,7 @@ int GridDynSimulation::powerflow() controlFlags[power_flow_input_saved] = true; } // solve - coreTime returnTime = currentTime; + CoreTime returnTime = currentTime; retval = pFlowData->solve(currentTime, returnTime); if (retval < 0) { @@ -286,7 +286,7 @@ void GridDynSimulation::reInitpFlow(const SolverMode& sMode, ChangeCode change) // we initialize all the objects in the simulation and the default SolverInterface // all other solver data objects would be initialized by a reInitPFlow(xxx) call; -int GridDynSimulation::pFlowInitialize(coreTime time0) +int GridDynSimulation::pFlowInitialize(CoreTime time0) { if (time0 == negTime) { time0 = powerFlowStartTime; @@ -427,7 +427,7 @@ void GridDynSimulation::continuationPowerFlow(std::string_view contName) void GridDynSimulation::pFlowSensitivityAnalysis() {} -int GridDynSimulation::eventDrivenPowerflow(coreTime t_end, coreTime t_step) +int GridDynSimulation::eventDrivenPowerflow(CoreTime t_end, CoreTime t_step) { if (t_end == negTime) { t_end = stopTime; @@ -504,7 +504,7 @@ int GridDynSimulation::eventDrivenPowerflow(coreTime t_end, coreTime t_step) return FUNCTION_EXECUTION_SUCCESS; } -int GridDynSimulation::algUpdateFunction(coreTime time, +int GridDynSimulation::algUpdateFunction(CoreTime time, const double state[], double update[], const SolverMode& sMode, diff --git a/src/griddyn/solvers/ArkodeInterface.cpp b/src/griddyn/solvers/ArkodeInterface.cpp index 5c7dcf59f..2dc9a1246 100644 --- a/src/griddyn/solvers/ArkodeInterface.cpp +++ b/src/griddyn/solvers/ArkodeInterface.cpp @@ -293,7 +293,7 @@ static const std::map arkodeRetCodes{ }; -void ArkodeInterface::initialize(coreTime time0) +void ArkodeInterface::initialize(CoreTime time0) { if (!flags[ALLOCATED_FLAG]) { throw(InvalidSolverOperation()); @@ -401,7 +401,7 @@ return(retval); */ } -int ArkodeInterface::solve(coreTime tStop, coreTime& tReturn, StepMode stepMode) +int ArkodeInterface::solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode) { assert(rootCount == m_gds->rootSize(mode)); ++solverCallCount; diff --git a/src/griddyn/solvers/ArkodeInterface.h b/src/griddyn/solvers/ArkodeInterface.h index e4db6ebe8..61f7ecd5a 100644 --- a/src/griddyn/solvers/ArkodeInterface.h +++ b/src/griddyn/solvers/ArkodeInterface.h @@ -21,7 +21,7 @@ class ArkodeInterface: public SundialsInterface { 0; //!< counter for the number of times the initial condition function was called private: - matrixDataSparse a1; //!< array structure for holding the Jacobian information + MatrixDataSparse a1; //!< array structure for holding the Jacobian information std::vector tempState; //!< temporary holding location for a state vector double maxStep = -1.0; //!< the maximum step size to take @@ -43,12 +43,12 @@ class ArkodeInterface: public SundialsInterface { virtual void cloneTo(SolverInterface* si, bool fullCopy = false) const override; virtual void allocate(count_t stateCount, count_t numRoots = 0) override; - virtual void initialize(coreTime time0) override; + virtual void initialize(CoreTime time0) override; virtual void setMaxNonZeros(count_t nonZeroCount) override; virtual void sparseReInit(SparseReinitMode sparseReinitMode) override; virtual void getCurrentData() override; virtual int - solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; + solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; virtual void getRoots() override; virtual void setRootFinding(count_t numRoots) override; diff --git a/src/griddyn/solvers/BasicOdeSolver.cpp b/src/griddyn/solvers/BasicOdeSolver.cpp index 3b143a43f..af6b1cec5 100644 --- a/src/griddyn/solvers/BasicOdeSolver.cpp +++ b/src/griddyn/solvers/BasicOdeSolver.cpp @@ -79,7 +79,7 @@ void BasicOdeSolver::allocate(count_t stateCount, count_t numRoots) } } -void BasicOdeSolver::initialize(coreTime t0) +void BasicOdeSolver::initialize(CoreTime t0) { if (!flags[ALLOCATED_FLAG]) { throw(InvalidSolverOperation(-2)); @@ -112,13 +112,13 @@ void BasicOdeSolver::set(std::string_view param, double val) } } -int BasicOdeSolver::solve(coreTime tStop, coreTime& tReturn, StepMode stepMode) +int BasicOdeSolver::solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode) { if (solveTime == tStop) { tReturn = tStop; return FUNCTION_EXECUTION_SUCCESS; } - coreTime Tstep = (std::min)(deltaT, tStop - solveTime); + CoreTime Tstep = (std::min)(deltaT, tStop - solveTime); if (mode.pairedOffsetIndex != kNullLocation) { int ret = m_gds->dynAlgebraicSolve(solveTime, state.data(), deriv.data(), mode); if (ret < FUNCTION_EXECUTION_SUCCESS) { diff --git a/src/griddyn/solvers/BasicOdeSolver.h b/src/griddyn/solvers/BasicOdeSolver.h index 537b9e02a..0ddad0941 100644 --- a/src/griddyn/solvers/BasicOdeSolver.h +++ b/src/griddyn/solvers/BasicOdeSolver.h @@ -20,7 +20,7 @@ class BasicOdeSolver: public SolverInterface { std::vector deriv; //!< temp state data location 1 std::vector state2; //!< temp state data location 2 std::vector type; //!< type data - coreTime deltaT = 0.005; //!< the default time step + CoreTime deltaT = 0.005; //!< the default time step public: using SolverInterface::set; @@ -43,14 +43,14 @@ class BasicOdeSolver: public SolverInterface { const double* derivData() const noexcept override; const double* typeData() const noexcept override; virtual void allocate(count_t stateCount, count_t numRoots = 0) override; - virtual void initialize(coreTime t0) override; + virtual void initialize(CoreTime t0) override; virtual double get(std::string_view param) const override; virtual void set(std::string_view param, std::string_view val) override; virtual void set(std::string_view param, double val) override; virtual int - solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; + solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; }; } // namespace griddyn::solvers diff --git a/src/griddyn/solvers/BasicSolver.cpp b/src/griddyn/solvers/BasicSolver.cpp index 7d45cab0a..17dbb3449 100644 --- a/src/griddyn/solvers/BasicSolver.cpp +++ b/src/griddyn/solvers/BasicSolver.cpp @@ -93,7 +93,7 @@ namespace solvers { } } - void BasicSolver::initialize(coreTime /*time0*/) + void BasicSolver::initialize(CoreTime /*time0*/) { if (!flags[ALLOCATED_FLAG]) { throw(InvalidSolverOperation(-2)); @@ -141,7 +141,7 @@ namespace solvers { std::vector& s3, double conv); - int BasicSolver::solve(coreTime tStop, coreTime& /*tReturn*/, StepMode /*stepMode*/) + int BasicSolver::solve(CoreTime tStop, CoreTime& /*tReturn*/, StepMode /*stepMode*/) { double md = 1.0; iterations = 0; diff --git a/src/griddyn/solvers/BasicSolver.h b/src/griddyn/solvers/BasicSolver.h index 97db8a488..2b4236c2c 100644 --- a/src/griddyn/solvers/BasicSolver.h +++ b/src/griddyn/solvers/BasicSolver.h @@ -54,14 +54,14 @@ namespace solvers { const double* derivData() const noexcept override; const double* typeData() const noexcept override; virtual void allocate(count_t stateCount, count_t numRoots = 0) override; - virtual void initialize(coreTime t0) override; + virtual void initialize(CoreTime t0) override; virtual double get(std::string_view param) const override; virtual void set(std::string_view param, std::string_view val) override; virtual void set(std::string_view param, double val) override; virtual int - solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; + solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; }; } // namespace solvers diff --git a/src/griddyn/solvers/CvodeInterface.cpp b/src/griddyn/solvers/CvodeInterface.cpp index 996203a08..6b8241b51 100644 --- a/src/griddyn/solvers/CvodeInterface.cpp +++ b/src/griddyn/solvers/CvodeInterface.cpp @@ -272,7 +272,7 @@ void CvodeInterface::logErrorWeights(PrintLevel logLevel) const NVECTOR_DESTROY(use_omp, ele); } -void CvodeInterface::initialize(coreTime time0) +void CvodeInterface::initialize(CoreTime time0) { if (!flags[ALLOCATED_FLAG]) { throw(InvalidSolverOperation()); @@ -382,7 +382,7 @@ if (checkFlag(&retval, "CVodeGetConsistentIC", 1)) */ } -int CvodeInterface::solve(coreTime tStop, coreTime& tReturn, StepMode stepMode) +int CvodeInterface::solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode) { assert(rootCount == m_gds->rootSize(mode)); ++solverCallCount; diff --git a/src/griddyn/solvers/CvodeInterface.h b/src/griddyn/solvers/CvodeInterface.h index c998f1766..d96b3137c 100644 --- a/src/griddyn/solvers/CvodeInterface.h +++ b/src/griddyn/solvers/CvodeInterface.h @@ -20,7 +20,7 @@ class CvodeInterface: public SundialsInterface { count_t icCount = 0; //!< total number of initial condition calls private: - matrixDataSparse a1; //!< array structure for holding the Jacobian information + MatrixDataSparse a1; //!< array structure for holding the Jacobian information std::vector tempState; //!< temporary holding location for a state vector double maxStep = -1.0; //!< the maximum step size permitted double minStep = -1.0; //!< the minimum step size permitted @@ -41,12 +41,12 @@ class CvodeInterface: public SundialsInterface { virtual void cloneTo(SolverInterface* si, bool fullCopy = false) const override; virtual void allocate(count_t stateCount, count_t numRoots = 0) override; - virtual void initialize(coreTime time0) override; + virtual void initialize(CoreTime time0) override; virtual void setMaxNonZeros(count_t nonZeroCount) override; virtual void sparseReInit(SparseReinitMode reInitMode) override; virtual void getCurrentData() override; virtual int - solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; + solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; virtual void getRoots() override; virtual void setRootFinding(count_t numRoots) override; diff --git a/src/griddyn/solvers/IdaInterface.cpp b/src/griddyn/solvers/IdaInterface.cpp index 10320257f..c70485dff 100644 --- a/src/griddyn/solvers/IdaInterface.cpp +++ b/src/griddyn/solvers/IdaInterface.cpp @@ -10,8 +10,8 @@ #include "../simulation/GridDynSimulationFileOps.h" #include "SundialsMatrixData.h" #include "gmlc/utilities/vectorOps.hpp" +#include "utilities/MatrixDataFilter.hpp" #include "utilities/matrixCreation.h" -#include "utilities/matrixDataFilter.hpp" #include #include #include @@ -255,7 +255,7 @@ void IdaInterface::logErrorWeights(PrintLevel logLevel) const NVECTOR_DESTROY(use_omp, ele); } -void IdaInterface::initialize(coreTime t0) +void IdaInterface::initialize(CoreTime t0) { if (!flags[ALLOCATED_FLAG]) { throw(InvalidSolverOperation()); @@ -350,7 +350,7 @@ void IdaInterface::setRootFinding(count_t numRoots) #define SHOW_MISSING_ELEMENTS 0 -int IdaInterface::calcIC(coreTime t0, coreTime tstep0, IcModes initCondMode, bool constraints) +int IdaInterface::calcIC(CoreTime t0, CoreTime tstep0, IcModes initCondMode, bool constraints) { int retval; ++icCount; @@ -450,7 +450,7 @@ void IdaInterface::getCurrentData() checkFlag(&retval, "IDAGetConsistentIC", 1); } -int IdaInterface::solve(coreTime tStop, coreTime& tReturn, StepMode stepMode) +int IdaInterface::solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode) { assert(rootCount == m_gds->rootSize(mode)); ++solverCallCount; diff --git a/src/griddyn/solvers/IdaInterface.h b/src/griddyn/solvers/IdaInterface.h index 16f3f8e87..2c0c12be4 100644 --- a/src/griddyn/solvers/IdaInterface.h +++ b/src/griddyn/solvers/IdaInterface.h @@ -20,7 +20,7 @@ class IdaInterface: public SundialsInterface { count_t icCount = 0; //!< the number of times the initical condition function was called private: - matrixDataSparse a1; //!< array structure for holding the Jacobian information + MatrixDataSparse a1; //!< array structure for holding the Jacobian information std::vector tempState; //!< temporary holding location for a state vector public: @@ -40,11 +40,11 @@ class IdaInterface: public SundialsInterface { virtual void allocate(count_t stateCount, count_t numRoots = 0) override; void setMaxNonZeros(count_t nonZeros) override; - virtual void initialize(coreTime t0) override; + virtual void initialize(CoreTime t0) override; virtual void sparseReInit(SparseReinitMode sparseReInitMode) override; - int calcIC(coreTime t0, coreTime tstep0, IcModes initCondMode, bool constraints) override; + int calcIC(CoreTime t0, CoreTime tstep0, IcModes initCondMode, bool constraints) override; virtual void getCurrentData() override; - int solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; + int solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; virtual void getRoots() override; virtual void setRootFinding(count_t numRoots) override; diff --git a/src/griddyn/solvers/KinsolInterface.cpp b/src/griddyn/solvers/KinsolInterface.cpp index be08c44f6..8597e2e97 100644 --- a/src/griddyn/solvers/KinsolInterface.cpp +++ b/src/griddyn/solvers/KinsolInterface.cpp @@ -9,7 +9,7 @@ #include "../GridDynSimulation.h" #include "../simulation/GridDynSimulationFileOps.h" #include "SundialsMatrixData.h" -// #include "matrixDataBoost.h" +// #include "MatrixDataBoost.h" #include "core/CoreExceptions.h" #include "utilities/matrixCreation.h" #include @@ -140,7 +140,7 @@ void KinsolInterface::logSolverStats(PrintLevel logLevel, bool /*iconly*/) const } } -void KinsolInterface::initialize(coreTime /*t0*/) +void KinsolInterface::initialize(CoreTime /*t0*/) { if (!flags[ALLOCATED_FLAG]) { throw(InvalidSolverOperation()); @@ -278,7 +278,7 @@ double KinsolInterface::get(std::string_view param) const // #define KIN_LINESEARCH 1 // #define KIN_PICARD 2 // #define KIN_FP 3 -int KinsolInterface::solve(coreTime tStop, coreTime& tReturn, StepMode /*mode*/) +int KinsolInterface::solve(CoreTime tStop, CoreTime& tReturn, StepMode /*mode*/) { // check if the multiple data sets are in use and if we should toggle the data to use solveTime = tStop; diff --git a/src/griddyn/solvers/KinsolInterface.h b/src/griddyn/solvers/KinsolInterface.h index 8d68439ed..ed1f3187a 100644 --- a/src/griddyn/solvers/KinsolInterface.h +++ b/src/griddyn/solvers/KinsolInterface.h @@ -31,9 +31,9 @@ class KinsolInterface: public SundialsInterface { virtual void cloneTo(SolverInterface* si, bool fullCopy = false) const override; virtual void allocate(count_t stateCount, count_t numRoots = 0) override; - virtual void initialize(coreTime time0) override; + virtual void initialize(CoreTime time0) override; virtual void sparseReInit(SparseReinitMode sparseReinitMode) override; - int solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; + int solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL) override; void setConstraints() override; void logSolverStats(PrintLevel logLevel, bool iconly = false) const override; diff --git a/src/griddyn/solvers/SolverInterface.cpp b/src/griddyn/solvers/SolverInterface.cpp index 303fb6a8e..b3a492f6a 100644 --- a/src/griddyn/solvers/SolverInterface.cpp +++ b/src/griddyn/solvers/SolverInterface.cpp @@ -160,14 +160,14 @@ void SolverInterface::allocate(count_t /*stateSize*/, count_t numRoots) { rootsfound.resize(numRoots); } -void SolverInterface::initialize(coreTime t0) +void SolverInterface::initialize(CoreTime t0) { solveTime = t0; } void SolverInterface::sparseReInit(SparseReinitMode /*mode*/) {} void SolverInterface::setConstraints() {} -int SolverInterface::calcIC(coreTime /*t0*/, - coreTime /*tstep0*/, +int SolverInterface::calcIC(CoreTime /*t0*/, + CoreTime /*tstep0*/, IcModes /*mode*/, bool /*constraints*/) { @@ -510,7 +510,7 @@ void SolverInterface::checkFlag(void* flagvalue, // TODO(phlpt): Handle the missing opt == 2 / nullptr case if needed. } -int SolverInterface::solve(coreTime /*tStop*/, coreTime& /*tReturn*/, StepMode /* stepMode */) +int SolverInterface::solve(CoreTime /*tStop*/, CoreTime& /*tReturn*/, StepMode /* stepMode */) { return -101; } diff --git a/src/griddyn/solvers/SolverInterface.h b/src/griddyn/solvers/SolverInterface.h index 6e045cfde..1d67070a9 100644 --- a/src/griddyn/solvers/SolverInterface.h +++ b/src/griddyn/solvers/SolverInterface.h @@ -128,7 +128,7 @@ class SolverInterface: public HelperObject { count_t max_iterations = 10000; //!< the maximum number of iterations in the solver loop SolverMode mode; //!< to the SolverMode double tolerance = 1e-8; //!< the default solver tolerance - coreTime solveTime = negTime; //!< storage for the time the solver is called + CoreTime solveTime = negTime; //!< storage for the time the solver is called std::string jacFile; //!< the file to write the Jacobian to std::string stateFile; //!< the file to write the state and residual to GridDynSimulation* m_gds = nullptr; //!< pointer the GridDynSimulation object used @@ -198,7 +198,7 @@ class SolverInterface: public HelperObject { /** @brief initialize the solver to time t0 @param[in] t0 the time for the initialization */ - virtual void initialize(coreTime t0); + virtual void initialize(CoreTime t0); /** @brief reinitialize the sparse components @param[in] mode the reinitialization mode @@ -215,7 +215,7 @@ class SolverInterface: public HelperObject { @param[in] constraints flag indicating that constraints should be used @return the function success status FUNCTION_EXECUTION_SUCCESS on success */ - virtual int calcIC(coreTime t0, coreTime tstep0, IcModes mode, bool constraints); + virtual int calcIC(CoreTime t0, CoreTime tstep0, IcModes mode, bool constraints); /** @brief get the current solution usually called after a call to CalcIC to get the calculated conditions */ @@ -254,14 +254,14 @@ class SolverInterface: public HelperObject { */ virtual bool getFlag(std::string_view flag) const override; /** get the last time the solver was called*/ - coreTime getSolverTime() const { return solveTime; } + CoreTime getSolverTime() const { return solveTime; } /** @brief perform the solver calculations @param[in] tStop the requested return time not that useful for algebraic solvers @param[out] tReturn the actual return time @param[in] stepMode the step mode @return the function success status FUNCTION_EXECUTION_SUCCESS on success */ - virtual int solve(coreTime tStop, coreTime& tReturn, StepMode stepMode = StepMode::NORMAL); + virtual int solve(CoreTime tStop, CoreTime& tReturn, StepMode stepMode = StepMode::NORMAL); /** @brief resize the storage array for the Jacobian @param[in] nonZeroCount the number of elements to potentially store */ diff --git a/src/griddyn/solvers/SundialsInterface.cpp b/src/griddyn/solvers/SundialsInterface.cpp index 93b79c66d..7d1aa7371 100644 --- a/src/griddyn/solvers/SundialsInterface.cpp +++ b/src/griddyn/solvers/SundialsInterface.cpp @@ -26,8 +26,8 @@ #include "SundialsMatrixData.h" #include "core/FactoryTemplates.hpp" #include "gmlc/utilities/stringOps.h" +#include "utilities/MatrixDataFilter.hpp" #include "utilities/matrixCreation.h" -#include "utilities/matrixDataFilter.hpp" #include #include #include @@ -290,7 +290,7 @@ bool isSUNMatrixSetup(SUNMatrix j) return true; } -void matrixDataToSUNMatrix(matrixData& md, SUNMatrix j, count_t svsize) +void matrixDataToSUNMatrix(MatrixData& md, SUNMatrix j, count_t svsize) { int id = SUNMatGetID(j); if (id == SUNMATRIX_SPARSE) { @@ -394,7 +394,7 @@ int sundialsJac(sunrealtype time, a1->setColLimit(sd->svsize); if (sd->flags[USE_MASK_FLAG]) { - matrixDataFilter filterAd(*(a1)); + MatrixDataFilter filterAd(*(a1)); filterAd.addFilter(sd->maskElements); sd->m_gds->jacobianFunction(time, nvecdata(sd->use_omp, state), @@ -435,7 +435,7 @@ int sundialsJac(sunrealtype time, // if it isn't the first we can use the SUNDIALS arraySparse object auto a1 = makeSundialsMatrixData(j); if (sd->flags[USE_MASK_FLAG]) { - matrixDataFilter filterAd(*a1); + MatrixDataFilter filterAd(*a1); filterAd.addFilter(sd->maskElements); sd->m_gds->jacobianFunction(time, nvecdata(sd->use_omp, state), @@ -463,7 +463,7 @@ int sundialsJac(sunrealtype time, } } /* -matrixDataSparse &a1 = sd->a1; +MatrixDataSparse &a1 = sd->a1; sd->m_gds->jacobianFunction (time, nvecdata(sd->use_omp, state), nvecdata(sd->use_omp, dstate_dt), a1,cj, sd->mode); a1.sortIndexCol (); if (sd->flags[USE_MASK_FLAG]) diff --git a/src/griddyn/solvers/SundialsInterface.h b/src/griddyn/solvers/SundialsInterface.h index 534156072..19cd1ddaf 100644 --- a/src/griddyn/solvers/SundialsInterface.h +++ b/src/griddyn/solvers/SundialsInterface.h @@ -7,7 +7,7 @@ #pragma once #include "SolverInterface.h" -#include "utilities/matrixDataSparse.hpp" +#include "utilities/MatrixDataSparse.hpp" // SUNDIALS libraries #include "griddyn/griddyn-config.h" // Needed for ENABLE_OPENMP_SUNDIALS define #include "nvector/nvector_serial.h" @@ -66,7 +66,7 @@ bool isSUNMatrixSetup(SUNMatrix J); @param[out] J the SUNDIALS matrix to store the data @param[in] svsize the number of states representing the matrix */ -void matrixDataToSUNMatrix(matrixData& md, SUNMatrix J, count_t svsize); +void matrixDataToSUNMatrix(MatrixData& md, SUNMatrix J, count_t svsize); #endif /** brief abstract base class for SUNDIALS based SolverInterface objects doesn't really do diff --git a/src/griddyn/solvers/SundialsMatrixData.cpp b/src/griddyn/solvers/SundialsMatrixData.cpp index d55721437..56615170f 100644 --- a/src/griddyn/solvers/SundialsMatrixData.cpp +++ b/src/griddyn/solvers/SundialsMatrixData.cpp @@ -11,7 +11,7 @@ #include namespace griddyn::solvers { -std::unique_ptr> makeSundialsMatrixData(SUNMatrix j) +std::unique_ptr> makeSundialsMatrixData(SUNMatrix j) { switch (SUNMatGetID(j)) { case SUNMATRIX_DENSE: diff --git a/src/griddyn/solvers/SundialsMatrixData.h b/src/griddyn/solvers/SundialsMatrixData.h index 4023d6920..b0ea28250 100644 --- a/src/griddyn/solvers/SundialsMatrixData.h +++ b/src/griddyn/solvers/SundialsMatrixData.h @@ -8,14 +8,14 @@ #include "sunmatrix/sunmatrix_dense.h" #include "sunmatrix/sunmatrix_sparse.h" -#include "utilities/matrixData.hpp" -#include "utilities/matrixDataOrdering.hpp" +#include "utilities/MatrixData.hpp" +#include "utilities/MatrixDataOrdering.hpp" #include #include namespace griddyn::solvers { -/** @brief class implementing an matrixData wrapper around the SUNDIALS dense matrix*/ -class SundialsMatrixDataDense: public matrixData { +/** @brief class implementing an MatrixData wrapper around the SUNDIALS dense matrix*/ +class SundialsMatrixDataDense: public MatrixData { private: SUNMatrix J = nullptr; //!< the vector of tuples containing the data public: @@ -39,12 +39,12 @@ class SundialsMatrixDataDense: public matrixData { count_t capacity() const override; - matrixElement element(index_t n) const override; + MatrixElement element(index_t n) const override; double at(index_t rowN, index_t colN) const override; }; -class SundialsMatrixDataSparseColumn: public matrixData { +class SundialsMatrixDataSparseColumn: public MatrixData { private: SUNMatrix J = nullptr; //!< pointer to the sundials sparse matrix index_t ccol = 0; @@ -69,17 +69,17 @@ class SundialsMatrixDataSparseColumn: public matrixData { count_t capacity() const override; - matrixElement element(index_t n) const override; + MatrixElement element(index_t n) const override; double at(index_t rowN, index_t colN) const override; virtual void start() override; - virtual matrixElement next() override; + virtual MatrixElement next() override; }; -/** @brief class implementing an matrixData wrapper around the SUNDIALS dense matrix*/ -class SundialsMatrixDataSparseRow: public matrixData { +/** @brief class implementing an MatrixData wrapper around the SUNDIALS dense matrix*/ +class SundialsMatrixDataSparseRow: public MatrixData { private: SUNMatrix J; //!< the vector of tuples containing the data index_t crow = 0; //!< the current row of access @@ -104,15 +104,15 @@ class SundialsMatrixDataSparseRow: public matrixData { count_t capacity() const override; - matrixElement element(index_t n) const override; + MatrixElement element(index_t n) const override; double at(index_t rowN, index_t colN) const override; virtual void start() override; - virtual matrixElement next() override; + virtual MatrixElement next() override; }; -std::unique_ptr> makeSundialsMatrixData(SUNMatrix j); +std::unique_ptr> makeSundialsMatrixData(SUNMatrix j); } // namespace griddyn::solvers diff --git a/src/griddyn/solvers/sundialsMatrixDataDense.cpp b/src/griddyn/solvers/sundialsMatrixDataDense.cpp index 0c280c1f5..d28e181c8 100644 --- a/src/griddyn/solvers/sundialsMatrixDataDense.cpp +++ b/src/griddyn/solvers/sundialsMatrixDataDense.cpp @@ -10,7 +10,7 @@ namespace griddyn::solvers { SundialsMatrixDataDense::SundialsMatrixDataDense(SUNMatrix mat): - matrixData(static_cast(SM_ROWS_D(mat)), + MatrixData(static_cast(SM_ROWS_D(mat)), static_cast(SM_COLUMNS_D(mat))), J(mat) { @@ -38,7 +38,7 @@ count_t SundialsMatrixDataDense::capacity() const { return static_cast(SM_ROWS_D(J) * SM_COLUMNS_D(J)); } -matrixElement SundialsMatrixDataDense::element(index_t n) const +MatrixElement SundialsMatrixDataDense::element(index_t n) const { return {n % static_cast(SM_COLUMNS_D(J)), n / static_cast(SM_COLUMNS_D(J)), diff --git a/src/griddyn/solvers/sundialsMatrixDataSparseColumn.cpp b/src/griddyn/solvers/sundialsMatrixDataSparseColumn.cpp index 6b0cd2ff7..75beea9ac 100644 --- a/src/griddyn/solvers/sundialsMatrixDataSparseColumn.cpp +++ b/src/griddyn/solvers/sundialsMatrixDataSparseColumn.cpp @@ -10,7 +10,7 @@ namespace griddyn::solvers { SundialsMatrixDataSparseColumn::SundialsMatrixDataSparseColumn(SUNMatrix mat): - matrixData(static_cast(SM_ROWS_S(mat)), + MatrixData(static_cast(SM_ROWS_S(mat)), static_cast(SM_COLUMNS_S(mat))), J(mat) { @@ -50,9 +50,9 @@ count_t SundialsMatrixDataSparseColumn::capacity() const { return static_cast(SM_NNZ_S(J)); } -matrixElement SundialsMatrixDataSparseColumn::element(index_t n) const +MatrixElement SundialsMatrixDataSparseColumn::element(index_t n) const { - matrixElement ret{}; + MatrixElement ret{}; ret.row = static_cast(SM_INDEXVALS_S(J)[n]); auto res = std::lower_bound(SM_INDEXPTRS_S(J), &(SM_INDEXPTRS_S(J)[colLimit()]), static_cast(n)); @@ -67,9 +67,9 @@ void SundialsMatrixDataSparseColumn::start() ccol = 0; } -matrixElement SundialsMatrixDataSparseColumn::next() +MatrixElement SundialsMatrixDataSparseColumn::next() { - matrixElement ret{static_cast(SM_INDEXVALS_S(J)[cur]), + MatrixElement ret{static_cast(SM_INDEXVALS_S(J)[cur]), ccol, SM_DATA_S(J)[cur]}; ++cur; diff --git a/src/griddyn/solvers/sundialsMatrixDataSparseRow.cpp b/src/griddyn/solvers/sundialsMatrixDataSparseRow.cpp index b3c833a37..571019544 100644 --- a/src/griddyn/solvers/sundialsMatrixDataSparseRow.cpp +++ b/src/griddyn/solvers/sundialsMatrixDataSparseRow.cpp @@ -10,7 +10,7 @@ namespace griddyn::solvers { SundialsMatrixDataSparseRow::SundialsMatrixDataSparseRow(SUNMatrix mat): - matrixData(static_cast(SM_ROWS_S(mat)), + MatrixData(static_cast(SM_ROWS_S(mat)), static_cast(SM_COLUMNS_S(mat))), J(mat) { @@ -50,9 +50,9 @@ count_t SundialsMatrixDataSparseRow::capacity() const { return static_cast(SM_NNZ_S(J)); } -matrixElement SundialsMatrixDataSparseRow::element(index_t n) const +MatrixElement SundialsMatrixDataSparseRow::element(index_t n) const { - matrixElement ret{}; + MatrixElement ret{}; ret.col = static_cast(SM_INDEXVALS_S(J)[n]); auto res = std::lower_bound(SM_INDEXPTRS_S(J), &(SM_INDEXPTRS_S(J)[rowLimit()]), static_cast(n)); @@ -67,9 +67,9 @@ void SundialsMatrixDataSparseRow::start() crow = 0; } -matrixElement SundialsMatrixDataSparseRow::next() +MatrixElement SundialsMatrixDataSparseRow::next() { - matrixElement ret{crow, + MatrixElement ret{crow, static_cast(SM_INDEXVALS_S(J)[cur]), SM_DATA_S(J)[cur]}; ++cur; diff --git a/src/griddyn/sources/BlockSource.cpp b/src/griddyn/sources/BlockSource.cpp index 2cc02d5f1..ffb8b5f9c 100644 --- a/src/griddyn/sources/BlockSource.cpp +++ b/src/griddyn/sources/BlockSource.cpp @@ -204,7 +204,7 @@ void BlockSource::algebraicUpdate(const IOdata& inputs, void BlockSource::jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) { @@ -222,7 +222,7 @@ void BlockSource::jacobianElements(const IOdata& inputs, } } -void BlockSource::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void BlockSource::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { while (prevTime < time) { auto ntime = std::min(prevTime + maxStepSize, time); @@ -253,7 +253,7 @@ void BlockSource::rootTest(const IOdata& inputs, blk->rootTest({srcOut, srcDout}, stateDataValue, roots, sMode); } } -void BlockSource::rootTrigger(coreTime time, +void BlockSource::rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) diff --git a/src/griddyn/sources/BlockSource.h b/src/griddyn/sources/BlockSource.h index c3e033c7b..9311eb405 100644 --- a/src/griddyn/sources/BlockSource.h +++ b/src/griddyn/sources/BlockSource.h @@ -63,18 +63,18 @@ namespace sources { virtual void jacobianElements(const IOdata& inputs, const StateData& stateDataValue, - matrixData& matrixDataValue, + MatrixData& matrixDataValue, const IOlocs& inputLocs, const SolverMode& sMode) override; virtual void - timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; virtual void rootTest(const IOdata& inputs, const StateData& stateDataValue, double roots[], const SolverMode& sMode) override; - virtual void rootTrigger(coreTime time, + virtual void rootTrigger(CoreTime time, const IOdata& inputs, const std::vector& rootMask, const SolverMode& sMode) override; diff --git a/src/griddyn/sources/CommSource.cpp b/src/griddyn/sources/CommSource.cpp index 776a56a6e..d446fb6ca 100644 --- a/src/griddyn/sources/CommSource.cpp +++ b/src/griddyn/sources/CommSource.cpp @@ -31,7 +31,7 @@ CoreObject* CommSource::clone(CoreObject* obj) const return cs; } -void CommSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void CommSource::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { rootSim = dynamic_cast(getRoot()); commLink = cManager.build(); @@ -98,7 +98,7 @@ void CommSource::setFlag(std::string_view flag, bool val) } } -void CommSource::updateA(coreTime time) +void CommSource::updateA(CoreTime time) { if (time > nextUpdateTime) { mp_dOdt = 0; diff --git a/src/griddyn/sources/CommSource.h b/src/griddyn/sources/CommSource.h index 5c34b07aa..e7fdc80b3 100644 --- a/src/griddyn/sources/CommSource.h +++ b/src/griddyn/sources/CommSource.h @@ -31,7 +31,7 @@ namespace sources { CommSource(const std::string& objName = "commSource_#"); CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void set(std::string_view param, std::string_view val) override; virtual void @@ -39,7 +39,7 @@ namespace sources { virtual void setFlag(std::string_view flag, bool val) override; virtual void setLevel(double val) override; - virtual void updateA(coreTime time) override; + virtual void updateA(CoreTime time) override; /** message processing function for use with communicators @param[in] sourceID the source of the comm message diff --git a/src/griddyn/sources/FileSource.cpp b/src/griddyn/sources/FileSource.cpp index cb73bf5e3..57118b61d 100644 --- a/src/griddyn/sources/FileSource.cpp +++ b/src/griddyn/sources/FileSource.cpp @@ -38,7 +38,7 @@ int FileSource::setFile(const std::string& fileName, index_t column) return count; } -void FileSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void FileSource::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { prevTime = time0; if (opFlags[USE_ABSOLUTE_TIME_FLAG]) { @@ -69,7 +69,7 @@ void FileSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) return RampSource::dynObjectInitializeA(time0, flags); } -void FileSource::updateA(coreTime time) +void FileSource::updateA(CoreTime time) { while (time >= schedLoad.time(currIndex)) { m_output = schedLoad.data(currIndex); @@ -94,7 +94,7 @@ void FileSource::updateA(coreTime time) } } -void FileSource::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void FileSource::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { if (time > nextUpdateTime) { updateA(time); diff --git a/src/griddyn/sources/FileSource.h b/src/griddyn/sources/FileSource.h index de984391a..34aa28e95 100644 --- a/src/griddyn/sources/FileSource.h +++ b/src/griddyn/sources/FileSource.h @@ -24,7 +24,7 @@ class FileSource: public RampSource { private: std::string fileName_; //!< name of the file - gmlc::utilities::TimeSeries + gmlc::utilities::TimeSeries schedLoad; //!< time series containing the output schedule index_t currIndex = 0; //!< the current location in the file count_t count = 0; //!< the total number of elements in the file @@ -41,10 +41,10 @@ class FileSource: public RampSource { set(std::string_view param, double val, units::unit unitType = units::defunit) override; int setFile(const std::string& fileName, index_t column); - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void updateA(coreTime time) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void updateA(CoreTime time) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; // let predict fall through to ramp function private: diff --git a/src/griddyn/sources/GrabberSource.cpp b/src/griddyn/sources/GrabberSource.cpp index f2f70aad5..c3c0737a8 100644 --- a/src/griddyn/sources/GrabberSource.cpp +++ b/src/griddyn/sources/GrabberSource.cpp @@ -77,7 +77,7 @@ double GrabberSource::get(std::string_view param, units::unit unitType) const return Source::get(param, unitType); } -void GrabberSource::pFlowObjectInitializeA(coreTime /*time0*/, std::uint32_t /*flags*/) +void GrabberSource::pFlowObjectInitializeA(CoreTime /*time0*/, std::uint32_t /*flags*/) { CoreObject* obj = locateObject(target, this); gset = std::make_unique(field, obj); diff --git a/src/griddyn/sources/GrabberSource.h b/src/griddyn/sources/GrabberSource.h index 708268d75..ed81f5620 100644 --- a/src/griddyn/sources/GrabberSource.h +++ b/src/griddyn/sources/GrabberSource.h @@ -25,7 +25,7 @@ namespace sources { ~GrabberSource(); protected: - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; virtual void dynObjectInitializeB(const IOdata& inputs, const IOdata& desiredOutput, diff --git a/src/griddyn/sources/PulseSource.cpp b/src/griddyn/sources/PulseSource.cpp index 9f6aa5d8c..79e53b5c1 100644 --- a/src/griddyn/sources/PulseSource.cpp +++ b/src/griddyn/sources/PulseSource.cpp @@ -36,20 +36,20 @@ CoreObject* PulseSource::clone(CoreObject* obj) const return nobj; } -void PulseSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t /*flags*/) +void PulseSource::pFlowObjectInitializeA(CoreTime time0, std::uint32_t /*flags*/) { cycleTime = time0 - shift * period - period; // subtract a period so it cycles properly the first time updateOutput(time0); } -void PulseSource::updateOutput(coreTime time) +void PulseSource::updateOutput(CoreTime time) { if ((time == prevTime) || (period == maxTime)) { return; } - coreTime tdiff = time - cycleTime; + CoreTime tdiff = time - cycleTime; if (tdiff > period) { cycleTime += period; tdiff -= period; @@ -66,7 +66,7 @@ void PulseSource::updateOutput(coreTime time) prevTime = time; } -double PulseSource::computeOutput(coreTime time) const +double PulseSource::computeOutput(CoreTime time) const { if ((time == prevTime) || (period == maxTime)) { return m_output; diff --git a/src/griddyn/sources/PulseSource.h b/src/griddyn/sources/PulseSource.h index c1efca37a..b657ce892 100644 --- a/src/griddyn/sources/PulseSource.h +++ b/src/griddyn/sources/PulseSource.h @@ -27,10 +27,10 @@ class PulseSource: public Source { }; PulseType ptype = PulseType::SQUARE; //!< the type of the pulse protected: - coreTime period = maxTime; //!<[s] pulse period + CoreTime period = maxTime; //!<[s] pulse period model_parameter dutyCycle = 0.5; //!<[%] pulse duty cycle model_parameter Amplitude = 0.0; //!< pulse amplitude - coreTime cycleTime = maxTime; //!<[s] the start time of the last cycle + CoreTime cycleTime = maxTime; //!<[s] the start time of the last cycle model_parameter baseValue; //!< the base level of the output model_parameter shift = 0.0; //!< storage for phase shift fraction (should be between 0 and 1) @@ -41,10 +41,10 @@ class PulseSource: public Source { virtual void set(std::string_view param, std::string_view val) override; virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void updateOutput(coreTime time) override; - virtual double computeOutput(coreTime time) const override; + virtual void updateOutput(CoreTime time) override; + virtual double computeOutput(CoreTime time) const override; virtual double getDoutdt(const IOdata& inputs, const StateData& stateData, const SolverMode& sMode, diff --git a/src/griddyn/sources/RampSource.cpp b/src/griddyn/sources/RampSource.cpp index abd60fe27..237c56dc9 100644 --- a/src/griddyn/sources/RampSource.cpp +++ b/src/griddyn/sources/RampSource.cpp @@ -37,7 +37,7 @@ void RampSource::set(std::string_view param, double val, units::unit unitType) } } -double RampSource::computeOutput(coreTime time) const +double RampSource::computeOutput(CoreTime time) const { auto tdiff = time - prevTime; return m_output + mp_dOdt * tdiff; diff --git a/src/griddyn/sources/RampSource.h b/src/griddyn/sources/RampSource.h index b1b96aa66..4cbf3b36d 100644 --- a/src/griddyn/sources/RampSource.h +++ b/src/griddyn/sources/RampSource.h @@ -23,7 +23,7 @@ class RampSource: public Source { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual double computeOutput(coreTime time) const override; + virtual double computeOutput(CoreTime time) const override; virtual double getDoutdt(const IOdata& inputs, const StateData& sD, const SolverMode& sMode, diff --git a/src/griddyn/sources/RandomSource.cpp b/src/griddyn/sources/RandomSource.cpp index 005af1801..0e873c2cd 100644 --- a/src/griddyn/sources/RandomSource.cpp +++ b/src/griddyn/sources/RandomSource.cpp @@ -9,7 +9,7 @@ #include "core/CoreExceptions.h" #include "core/CoreObjectTemplates.hpp" #include "gmlc/utilities/stringOps.h" -#include "utilities/gridRandom.h" +#include "utilities/GridRandom.h" #include #include #include @@ -40,9 +40,9 @@ CoreObject* RandomSource::clone(CoreObject* obj) const src->timeDistribution = timeDistribution; src->valDistribution = valDistribution; src->timeGenerator = - std::make_unique(timeDistribution, param1_t, param2_t); + std::make_unique(timeDistribution, param1_t, param2_t); src->valGenerator = - std::make_unique(valDistribution, param1_L, param2_L); + std::make_unique(valDistribution, param1_L, param2_L); return src; } @@ -60,7 +60,7 @@ void RandomSource::set(std::string_view param, std::string_view val) valGenerator->setDistribution(utilities::getDist(valDistribution)); } } else if (param == "seed") { - utilities::gridRandom::setSeed(); + utilities::GridRandom::setSeed(); } else { RampSource::set(param, val); } @@ -125,7 +125,7 @@ void RandomSource::set(std::string_view param, double val, units::unit unitType) } else if (param == "zbias") { zbias = val; } else if (param == "seed") { - utilities::gridRandom::setSeed(static_cast(val)); + utilities::GridRandom::setSeed(static_cast(val)); } else { // I am purposely skipping over the RampLoad the functionality is needed but the access // is not @@ -140,13 +140,13 @@ void RandomSource::reset(ResetLevels /*level*/) offset = 0.0; } -void RandomSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t /*flags*/) +void RandomSource::pFlowObjectInitializeA(CoreTime time0, std::uint32_t /*flags*/) { reset(); keyTime = time0; - timeGenerator = std::make_unique(timeDistribution, param1_t, param2_t); - valGenerator = std::make_unique(valDistribution, param1_L, param2_L); - const coreTime triggerTime = time0 + ntime(); + timeGenerator = std::make_unique(timeDistribution, param1_t, param2_t); + valGenerator = std::make_unique(valDistribution, param1_L, param2_L); + const CoreTime triggerTime = time0 + ntime(); if (opFlags[INTERPOLATE_FLAG]) { nextStep(triggerTime); @@ -155,7 +155,7 @@ void RandomSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t /*flags* opFlags.set(object_armed_flag); } -void RandomSource::updateOutput(coreTime time) +void RandomSource::updateOutput(CoreTime time) { if (time >= nextUpdateTime) { updateA(time); @@ -166,7 +166,7 @@ void RandomSource::updateOutput(coreTime time) // Repeats only when multiple pending trigger times must be consumed. // NOLINTNEXTLINE(misc-no-recursion) -void RandomSource::updateA(coreTime time) +void RandomSource::updateA(CoreTime time) { if (time < nextUpdateTime) { return; @@ -208,9 +208,9 @@ void RandomSource::updateA(coreTime time) m_tempOut = m_output; } -coreTime RandomSource::ntime() +CoreTime RandomSource::ntime() { - coreTime newTime = maxTime; + CoreTime newTime = maxTime; do { newTime = timeGenerator->generate(); } while (newTime < 0.0); @@ -227,7 +227,7 @@ double RandomSource::nval() return nextVal; } -void RandomSource::nextStep(coreTime triggerTime) +void RandomSource::nextStep(CoreTime triggerTime) { const double rval = nval(); const double nextVal = @@ -239,7 +239,7 @@ void RandomSource::nextStep(coreTime triggerTime) } } -void RandomSource::timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) +void RandomSource::timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) { while (time >= nextUpdateTime) { updateA(nextUpdateTime); @@ -268,15 +268,15 @@ double RandomSource::computeBiasAdjust() } double bias = 0.0; switch (valGenerator->getDistribution()) { - case utilities::gridRandom::DistributionType::UNIFORM: + case utilities::GridRandom::DistributionType::UNIFORM: bias = -(param2_L - param1_L) * zbias * (offset); break; - case utilities::gridRandom::DistributionType::EXPONENTIAL: // load varies in a + case utilities::GridRandom::DistributionType::EXPONENTIAL: // load varies in a // biexponential pattern bias = ((offset / param1_L) * zbias) - 0.5; break; - case utilities::gridRandom::DistributionType::NORMAL: + case utilities::GridRandom::DistributionType::NORMAL: bias = -param2_L * zbias * (offset); break; default: diff --git a/src/griddyn/sources/RandomSource.h b/src/griddyn/sources/RandomSource.h index bb488e543..1e2333522 100644 --- a/src/griddyn/sources/RandomSource.h +++ b/src/griddyn/sources/RandomSource.h @@ -10,7 +10,7 @@ #include #include namespace utilities { -class gridRandom; +class GridRandom; } namespace griddyn::sources { @@ -35,21 +35,21 @@ class RandomSource: public RampSource { model_parameter zbias = 0.0; //!< a factor describing the preference of changes to trend toward zero mean model_parameter offset = 0.0; //!< the current bias in the value - coreTime keyTime = 0.0; //!< the next time change + CoreTime keyTime = 0.0; //!< the next time change std::string timeDistribution = "constant"; //!< string representing the time Distribution //!< random number generation type std::string valDistribution = "constant"; //!< string representing the value Distribution //!< random number generation type - std::unique_ptr timeGenerator; //!< random number generator for the time - std::unique_ptr valGenerator; //!< random number generator for the value + std::unique_ptr timeGenerator; //!< random number generator for the time + std::unique_ptr valGenerator; //!< random number generator for the value public: RandomSource(const std::string& objName = "randomsource_#", double startVal = 0.0); - ~RandomSource(); // included so the definition of gridRandom doesn't have to be + ~RandomSource(); // included so the definition of GridRandom doesn't have to be virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; - virtual void timestep(coreTime time, const IOdata& inputs, const SolverMode& sMode) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + virtual void timestep(CoreTime time, const IOdata& inputs, const SolverMode& sMode) override; /** check if the random number generation has been triggered*/ bool isTriggered() { return opFlags[TRIGGERED_FLAG]; } @@ -58,17 +58,17 @@ class RandomSource: public RampSource { virtual void set(std::string_view param, std::string_view val) override; virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void updateA(coreTime time) override; + virtual void updateA(CoreTime time) override; void setFlag(std::string_view flag, bool val = true) override; - virtual void updateOutput(coreTime time) override; + virtual void updateOutput(CoreTime time) override; private: /** generate the next step in the random process this source represents*/ - void nextStep(coreTime triggerTime); + void nextStep(CoreTime triggerTime); /** generate a random time for the next update*/ - coreTime ntime(); + CoreTime ntime(); /** generate a new random value*/ double nval(); void timeParamUpdate(); diff --git a/src/griddyn/sources/SineSource.cpp b/src/griddyn/sources/SineSource.cpp index 458c7a0f4..df956b0f4 100644 --- a/src/griddyn/sources/SineSource.cpp +++ b/src/griddyn/sources/SineSource.cpp @@ -30,7 +30,7 @@ CoreObject* SineSource::clone(CoreObject* obj) const return nobj; } -void SineSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void SineSource::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { if (frequency <= 0.0) { lastCycle = negTime; @@ -41,7 +41,7 @@ void SineSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) updateOutput(time0); } -double SineSource::computeOutput(coreTime time) const +double SineSource::computeOutput(CoreTime time) const { auto timeDelta = time - prevTime; if (timeDelta == timeZero) { @@ -66,7 +66,7 @@ double SineSource::computeOutput(coreTime time) const return baseValue + (mult * addComponent); } -void SineSource::updateOutput(coreTime time) +void SineSource::updateOutput(CoreTime time) { auto timeDelta = time - prevTime; if (timeDelta == timeZero) { diff --git a/src/griddyn/sources/SineSource.h b/src/griddyn/sources/SineSource.h index fa0811f5c..38efb97e1 100644 --- a/src/griddyn/sources/SineSource.h +++ b/src/griddyn/sources/SineSource.h @@ -18,9 +18,9 @@ class SineSource: public PulseSource { protected: model_parameter frequency = 0.0; //!<[Hz] frequency of an oscillation model_parameter phase = 0.0; //!<[rad] the offset angle - coreTime lastCycle = negTime; ///!< time of the last cycle completion + CoreTime lastCycle = negTime; ///!< time of the last cycle completion model_parameter Amp = 0.0; //!< the amplitude of the pulse - coreTime sinePeriod = maxTime; //!< the period of the sinusoid + CoreTime sinePeriod = maxTime; //!< the period of the sinusoid model_parameter dfdt = 0.0; ///!<[Hz/s] the rate of change of frequency model_parameter dAdt = 0.0; //!< [1/s] the rate of change of amplitude @@ -32,9 +32,9 @@ class SineSource: public PulseSource { virtual void set(std::string_view param, double val, units::unit unitType = units::defunit) override; - virtual void pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) override; - virtual void updateOutput(coreTime time) override; - virtual double computeOutput(coreTime time) const override; + virtual void updateOutput(CoreTime time) override; + virtual double computeOutput(CoreTime time) const override; }; } // namespace griddyn::sources diff --git a/src/griddyn/sources/Source.cpp b/src/griddyn/sources/Source.cpp index c7ca95233..25a8edde1 100644 --- a/src/griddyn/sources/Source.cpp +++ b/src/griddyn/sources/Source.cpp @@ -76,7 +76,7 @@ void Source::set(std::string_view param, double val, units::unit unitType) } } -void Source::setState(coreTime time, +void Source::setState(CoreTime time, const double state[], const double dstate_dt[], const SolverMode& sMode) @@ -87,7 +87,7 @@ void Source::setState(coreTime time, lastTime = time; } -void Source::updateOutput(coreTime time) +void Source::updateOutput(CoreTime time) { m_tempOut = computeOutput(time); m_output = m_tempOut; @@ -95,7 +95,7 @@ void Source::updateOutput(coreTime time) lastTime = time; } -void Source::timestep(coreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) +void Source::timestep(CoreTime time, const IOdata& /*inputs*/, const SolverMode& /*sMode*/) { if (time != prevTime) { updateOutput(time); @@ -147,7 +147,7 @@ void Source::updateLocalCache(const IOdata& /*inputs*/, } } -double Source::computeOutput(coreTime /*time*/) const +double Source::computeOutput(CoreTime /*time*/) const { return m_output; } diff --git a/src/griddyn/stabilizers/Stabilizer.cpp b/src/griddyn/stabilizers/Stabilizer.cpp index eaca6cddc..5f13c63eb 100644 --- a/src/griddyn/stabilizers/Stabilizer.cpp +++ b/src/griddyn/stabilizers/Stabilizer.cpp @@ -63,7 +63,7 @@ void Stabilizer::set(std::string_view param, double val, units::unit unitType) void Stabilizer::jacobianElements(const IOdata& /*inputs*/, const StateData& /*sD*/, - matrixData& /*md*/, + MatrixData& /*md*/, const IOlocs& /*inputLocs*/, const SolverMode& sMode) { diff --git a/src/griddyn_shared/griddyn_exportMathFunctions.cpp b/src/griddyn_shared/griddyn_exportMathFunctions.cpp index 872ddb779..329cf2ba2 100644 --- a/src/griddyn_shared/griddyn_exportMathFunctions.cpp +++ b/src/griddyn_shared/griddyn_exportMathFunctions.cpp @@ -9,7 +9,7 @@ #include "griddyn_export.h" #include "internal/griddyn_export_internal.h" #include "runner/gridDynRunner.h" -#include "utilities/matrixDataCustomWriteOnly.hpp" +#include "utilities/MatrixDataCustomWriteOnly.hpp" #include #include #include @@ -258,9 +258,9 @@ void GridDynSimulationJacobian(GridDynSimulation sim, assignError(err, griddyn_error_invalid_object, invalidSolver); return; } - matrixDataCustomWriteOnly matrixData; - matrixData.setFunction([insert](index_t row, index_t col, double val) { + MatrixDataCustomWriteOnly MatrixData; + MatrixData.setFunction([insert](index_t row, index_t col, double val) { insert(static_cast(row), static_cast(col), val); }); - runner->getSim()->jacobianFunction(time, states, dstate_dt, matrixData, cj, sMode); + runner->getSim()->jacobianFunction(time, states, dstate_dt, MatrixData, cj, sMode); } diff --git a/src/griddyn_shared/griddyn_exportObjectMathFunctions.cpp b/src/griddyn_shared/griddyn_exportObjectMathFunctions.cpp index 3fb4b875f..625303275 100644 --- a/src/griddyn_shared/griddyn_exportObjectMathFunctions.cpp +++ b/src/griddyn_shared/griddyn_exportObjectMathFunctions.cpp @@ -11,7 +11,7 @@ #include "griddyn/GridDynSimulation.h" #include "griddyn_export_advanced.h" #include "internal/griddyn_export_internal.h" -#include "utilities/matrixDataCustomWriteOnly.hpp" +#include "utilities/MatrixDataCustomWriteOnly.hpp" #include using griddyn::dyn_initialized; @@ -328,7 +328,7 @@ void gridDynObjectJacobian(GridDynObject obj, assignError(err, griddyn_error_invalid_object, invalidSolver); return; } - matrixDataCustomWriteOnly md; + MatrixDataCustomWriteOnly md; md.setFunction([insert](index_t row, index_t col, double val) { insert(static_cast(row), static_cast(col), val); }); @@ -358,7 +358,7 @@ void gridDynObjecIoPartialDerivatives(GridDynObject obj, assignError(err, griddyn_error_invalid_object, invalidSolver); return; } - matrixDataCustomWriteOnly md; + MatrixDataCustomWriteOnly md; md.setFunction([insert](index_t row, index_t col, double val) { insert(static_cast(row), static_cast(col), val); }); @@ -385,7 +385,7 @@ void gridDynObjectOutputPartialDerivatives(GridDynObject obj, return; } - matrixDataCustomWriteOnly md; + MatrixDataCustomWriteOnly md; md.setFunction([insert](index_t row, index_t col, double val) { insert(static_cast(row), static_cast(col), val); }); diff --git a/src/griddyn_shared/griddyn_exportSimulation.cpp b/src/griddyn_shared/griddyn_exportSimulation.cpp index cbfef9d99..0c78093cd 100644 --- a/src/griddyn_shared/griddyn_exportSimulation.cpp +++ b/src/griddyn_shared/griddyn_exportSimulation.cpp @@ -20,7 +20,7 @@ DECLARE_TRIPLINE() using griddyn::buildFlags; using griddyn::compiler; -using griddyn::coreTime; +using griddyn::CoreTime; using griddyn::ExecutionFailure; using griddyn::FileOperationError; using griddyn::gridDynAction; @@ -349,7 +349,7 @@ int GridDynSimulationGetStatus(GridDynSimulation sim, GridDynError* err) assignError(err, griddyn_error_invalid_object, invalidSimulation); return griddyn_error_invalid_object; } - coreTime tRet; + CoreTime tRet; auto res = runner->getStatus(tRet); return res; } diff --git a/src/helics/helicsCollector.cpp b/src/helics/helicsCollector.cpp index 5ee22a0b4..5fb1e41b6 100644 --- a/src/helics/helicsCollector.cpp +++ b/src/helics/helicsCollector.cpp @@ -17,7 +17,7 @@ #include namespace griddyn::helicsLib { -HelicsCollector::HelicsCollector(coreTime time0, coreTime period): collector(time0, period) {} +HelicsCollector::HelicsCollector(CoreTime time0, CoreTime period): collector(time0, period) {} HelicsCollector::HelicsCollector(const std::string& collectorName): collector(collectorName) {} @@ -88,7 +88,7 @@ void HelicsCollector::dataPointAdded(const CollectorPoint& cp) } } -ChangeCode HelicsCollector::trigger(coreTime time) +ChangeCode HelicsCollector::trigger(CoreTime time) { auto out = collector::trigger(time); diff --git a/src/helics/helicsCollector.h b/src/helics/helicsCollector.h index 9612bacac..2668f6397 100644 --- a/src/helics/helicsCollector.h +++ b/src/helics/helicsCollector.h @@ -42,12 +42,12 @@ class HelicsCollector: public collector { HelicsCoordinator* coordinator_ = nullptr; //!< the coordinator for interaction with the helics interface public: - HelicsCollector(coreTime time0 = timeZero, coreTime period = timeOneSecond); + HelicsCollector(CoreTime time0 = timeZero, CoreTime period = timeOneSecond); explicit HelicsCollector(const std::string& name); virtual std::unique_ptr clone() const override; virtual void cloneTo(collector* col) const override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; void set(std::string_view param, double val) override; void set(std::string_view param, std::string_view val) override; diff --git a/src/helics/helicsGhostBus.cpp b/src/helics/helicsGhostBus.cpp index d25eedbed..926d3ac97 100644 --- a/src/helics/helicsGhostBus.cpp +++ b/src/helics/helicsGhostBus.cpp @@ -30,7 +30,7 @@ CoreObject* HelicsGhostBus::clone(CoreObject* obj) const return nobj; } -void HelicsGhostBus::pFlowObjectInitializeA(coreTime time0, uint32_t flags) +void HelicsGhostBus::pFlowObjectInitializeA(CoreTime time0, uint32_t flags) { GridBus::pFlowObjectInitializeA(time0, flags); } @@ -42,7 +42,7 @@ void HelicsGhostBus::pFlowObjectInitializeB() updateB(); } -void HelicsGhostBus::updateA(coreTime time) +void HelicsGhostBus::updateA(CoreTime time) { if (!loadKey.empty()) { double Pact = convert(S.sumP(), units::puMW, outUnits, systemBasePower); @@ -54,7 +54,7 @@ void HelicsGhostBus::updateA(coreTime time) lastUpdateTime = time; } -coreTime HelicsGhostBus::updateB() +CoreTime HelicsGhostBus::updateB() { nextUpdateTime += updatePeriod; @@ -71,7 +71,7 @@ coreTime HelicsGhostBus::updateB() return nextUpdateTime; } -void HelicsGhostBus::timestep(coreTime ttime, const IOdata& inputs, const SolverMode& sMode) +void HelicsGhostBus::timestep(CoreTime ttime, const IOdata& inputs, const SolverMode& sMode) { while (ttime > nextUpdateTime) { updateA(nextUpdateTime); diff --git a/src/helics/helicsGhostBus.h b/src/helics/helicsGhostBus.h index 8d1d3eb89..4cf7970c6 100644 --- a/src/helics/helicsGhostBus.h +++ b/src/helics/helicsGhostBus.h @@ -26,12 +26,12 @@ class HelicsGhostBus: public GridBus { explicit HelicsGhostBus(const std::string& objName = "helicsGhostbus_$"); virtual CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void updateA(coreTime time) override; - virtual coreTime updateB() override; - virtual void timestep(coreTime ttime, const IOdata& inputs, const SolverMode& sMode) override; + virtual void updateA(CoreTime time) override; + virtual CoreTime updateB() override; + virtual void timestep(CoreTime ttime, const IOdata& inputs, const SolverMode& sMode) override; virtual void setFlag(const std::string& param, bool val = true) override; virtual void set(const std::string& param, const std::string& val) override; virtual void diff --git a/src/helics/helicsLoad.cpp b/src/helics/helicsLoad.cpp index eb15f375d..1f9c1d5e8 100644 --- a/src/helics/helicsLoad.cpp +++ b/src/helics/helicsLoad.cpp @@ -36,7 +36,7 @@ CoreObject* HelicsLoad::clone(CoreObject* obj) const return nobj; } -void HelicsLoad::pFlowObjectInitializeA(coreTime time0, uint32_t flags) +void HelicsLoad::pFlowObjectInitializeA(CoreTime time0, uint32_t flags) { if (coordinator_ == nullptr) { auto rt = getRoot(); @@ -57,7 +57,7 @@ void HelicsLoad::pFlowObjectInitializeB() dQdt = 0.0; } -void HelicsLoad::updateA(coreTime time) +void HelicsLoad::updateA(CoreTime time) { double V = bus->getVoltage(); double A = bus->getAngle(); @@ -70,7 +70,7 @@ void HelicsLoad::updateA(coreTime time) lastUpdateTime = time; } -coreTime HelicsLoad::updateB() +CoreTime HelicsLoad::updateB() { nextUpdateTime += updatePeriod; @@ -127,7 +127,7 @@ coreTime HelicsLoad::updateB() return nextUpdateTime; } -void HelicsLoad::timestep(coreTime ttime, const IOdata& inputs, const SolverMode& sMode) +void HelicsLoad::timestep(CoreTime ttime, const IOdata& inputs, const SolverMode& sMode) { while (ttime > nextUpdateTime) { updateA(nextUpdateTime); diff --git a/src/helics/helicsLoad.h b/src/helics/helicsLoad.h index 86ebefd73..280f62f32 100644 --- a/src/helics/helicsLoad.h +++ b/src/helics/helicsLoad.h @@ -41,12 +41,12 @@ class HelicsLoad: public loads::RampLoad { explicit HelicsLoad(const std::string& objName = "helicsLoad_$"); CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void updateA(coreTime time) override; - virtual coreTime updateB() override; - virtual void timestep(coreTime ttime, const IOdata& inputs, const SolverMode& sMode) override; + virtual void updateA(CoreTime time) override; + virtual CoreTime updateB() override; + virtual void timestep(CoreTime ttime, const IOdata& inputs, const SolverMode& sMode) override; virtual void setFlag(const std::string& param, bool val = true) override; virtual void set(const std::string& param, const std::string& val) override; virtual void diff --git a/src/helics/helicsRunner.cpp b/src/helics/helicsRunner.cpp index 98d4aa889..8a04d8a94 100644 --- a/src/helics/helicsRunner.cpp +++ b/src/helics/helicsRunner.cpp @@ -82,15 +82,15 @@ void HelicsRunner::simInitialize() fed_->enterExecutingMode(); } -coreTime HelicsRunner::Run() +CoreTime HelicsRunner::Run() { - coreTime stop_time = m_gds->getStopTime(); + CoreTime stop_time = m_gds->getStopTime(); auto retTime = Step(stop_time); fed_->finalize(); return retTime; } -coreTime HelicsRunner::Step(coreTime time) +CoreTime HelicsRunner::Step(CoreTime time) { helics::Time time_granted = 0.0; /* the time step HELICS has allowed us to process */ helics::Time time_desired = 0.0; /* the time step we would like to go to next */ diff --git a/src/helics/helicsRunner.h b/src/helics/helicsRunner.h index ea1eb58fb..6ff7254c5 100644 --- a/src/helics/helicsRunner.h +++ b/src/helics/helicsRunner.h @@ -38,9 +38,9 @@ executing with helics generateLocalCommandLineParser(ReaderInfo& ReaderInformation) override; virtual void simInitialize() override; - virtual coreTime Run() override; + virtual CoreTime Run() override; - virtual coreTime Step(coreTime time) override; + virtual CoreTime Step(CoreTime time) override; virtual void Finalize() override; }; diff --git a/src/helics/helicsSource.cpp b/src/helics/helicsSource.cpp index bb9d63c5b..98b26afe5 100644 --- a/src/helics/helicsSource.cpp +++ b/src/helics/helicsSource.cpp @@ -36,7 +36,7 @@ CoreObject* HelicsSource::clone(CoreObject* obj) const return nobj; } -void HelicsSource::pFlowObjectInitializeA(coreTime time0, std::uint32_t flags) +void HelicsSource::pFlowObjectInitializeA(CoreTime time0, std::uint32_t flags) { auto obj = getRoot(); @@ -60,7 +60,7 @@ void HelicsSource::pFlowObjectInitializeB() updateB(); } -void HelicsSource::dynObjectInitializeA(coreTime time0, std::uint32_t flags) +void HelicsSource::dynObjectInitializeA(CoreTime time0, std::uint32_t flags) { RampSource::dynObjectInitializeA(time0, flags); @@ -73,7 +73,7 @@ void HelicsSource::dynObjectInitializeA(coreTime time0, std::uint32_t flags) updateB(); } -void HelicsSource::updateA(coreTime time) +void HelicsSource::updateA(CoreTime time) { if (time < nextUpdateTime) { return; @@ -123,7 +123,7 @@ void HelicsSource::updateA(coreTime time) prevTime = time; } -void HelicsSource::timestep(coreTime ttime, const IOdata& inputs, const SolverMode& sMode) +void HelicsSource::timestep(CoreTime ttime, const IOdata& inputs, const SolverMode& sMode) { while (ttime >= nextUpdateTime) { updateA(nextUpdateTime); diff --git a/src/helics/helicsSource.h b/src/helics/helicsSource.h index 8aefdee41..32cf80f02 100644 --- a/src/helics/helicsSource.h +++ b/src/helics/helicsSource.h @@ -37,12 +37,12 @@ class HelicsSource: public sources::RampSource { explicit HelicsSource(const std::string& objName = "helicsSource_$"); CoreObject* clone(CoreObject* obj = nullptr) const override; - virtual void pFlowObjectInitializeA(coreTime time0, uint32_t flags) override; + virtual void pFlowObjectInitializeA(CoreTime time0, uint32_t flags) override; virtual void pFlowObjectInitializeB() override; - virtual void dynObjectInitializeA(coreTime time0, uint32_t flags) override; + virtual void dynObjectInitializeA(CoreTime time0, uint32_t flags) override; - virtual void updateA(coreTime time) override; - virtual void timestep(coreTime ttime, const IOdata& inputs, const SolverMode& sMode) override; + virtual void updateA(CoreTime time) override; + virtual void timestep(CoreTime ttime, const IOdata& inputs, const SolverMode& sMode) override; virtual void setFlag(const std::string& param, bool val = true) override; virtual void set(const std::string& param, const std::string& val) override; virtual void diff --git a/src/helics/helicsSupport.cpp b/src/helics/helicsSupport.cpp index 2e71cfbb2..c5e2b882d 100644 --- a/src/helics/helicsSupport.cpp +++ b/src/helics/helicsSupport.cpp @@ -12,14 +12,14 @@ #include namespace griddyn::helicsLib { -helics::Time gdToHelicsTime(coreTime eventTime) +helics::Time gdToHelicsTime(CoreTime eventTime) { return helics::Time(eventTime.toCount(time_units::ns), time_units::ns); } -coreTime helicsToGdTime(helics::Time federateTime) +CoreTime helicsToGdTime(helics::Time federateTime) { - return coreTime(federateTime.toCount(time_units::ns), time_units::ns); + return CoreTime(federateTime.toCount(time_units::ns), time_units::ns); } const std::regex creg( diff --git a/src/helics/helicsSupport.h b/src/helics/helicsSupport.h index fa7ef079c..501160b47 100644 --- a/src/helics/helicsSupport.h +++ b/src/helics/helicsSupport.h @@ -14,9 +14,9 @@ #include namespace griddyn::helicsLib { -helics::Time gdToHelicsTime(coreTime eventTime); +helics::Time gdToHelicsTime(CoreTime eventTime); -coreTime helicsToGdTime(helics::Time federateTime); +CoreTime helicsToGdTime(helics::Time federateTime); std::future runBroker(std::string_view cmd_args); std::future runPlayer(std::string_view cmd_args); diff --git a/src/helics/test/helicsTest.cpp b/src/helics/test/helicsTest.cpp index 073f7a847..64c1bfaf4 100644 --- a/src/helics/test/helicsTest.cpp +++ b/src/helics/test/helicsTest.cpp @@ -34,7 +34,7 @@ class HelicsTests: public GridDynSimulationTestFixture, public ::testing::Test { using griddyn::CoreObject; using griddyn::CoreObjectFactory; -using griddyn::coreTime; +using griddyn::CoreTime; using griddyn::Generator; using griddyn::GridDynSimulationTestFixture; using griddyn::Source; @@ -52,9 +52,9 @@ static const char helics_test_directory[] = GRIDDYN_TEST_DIRECTORY "/helics_test TEST_F(HelicsTests, TimeConversionTest) { - coreTime val = 4.5234235; + CoreTime val = 4.5234235; auto helicsTime = gdToHelicsTime(val); - coreTime ret = helicsToGdTime(helicsTime); + CoreTime ret = helicsToGdTime(helicsTime); EXPECT_NEAR(static_cast(val), static_cast(ret), 0.0000001); diff --git a/src/networking/dimeCollector.cpp b/src/networking/dimeCollector.cpp index 6c0b95b71..422f87ac1 100644 --- a/src/networking/dimeCollector.cpp +++ b/src/networking/dimeCollector.cpp @@ -11,7 +11,7 @@ #include namespace griddyn::dimeLib { -DimeCollector::DimeCollector(coreTime time0, coreTime period): Collector(time0, period) {} +DimeCollector::DimeCollector(CoreTime time0, CoreTime period): Collector(time0, period) {} DimeCollector::DimeCollector(const std::string& collectorName): Collector(collectorName) {} @@ -39,7 +39,7 @@ void DimeCollector::cloneTo(Collector* col) const dimeCollectorClone->processName = processName; } -ChangeCode DimeCollector::trigger(coreTime time) +ChangeCode DimeCollector::trigger(CoreTime time) { if (!dime) { dime = std::make_unique(processName, server); diff --git a/src/networking/dimeCollector.h b/src/networking/dimeCollector.h index ca0871c51..0cbb55a63 100644 --- a/src/networking/dimeCollector.h +++ b/src/networking/dimeCollector.h @@ -20,14 +20,14 @@ class DimeCollector: public Collector { std::unique_ptr dime; public: - DimeCollector(coreTime time0 = timeZero, coreTime period = timeOneSecond); + DimeCollector(CoreTime time0 = timeZero, CoreTime period = timeOneSecond); explicit DimeCollector(const std::string& name); ~DimeCollector(); virtual std::unique_ptr clone() const override; virtual void cloneTo(Collector* col) const override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; void set(std::string_view param, double val) override; void set(std::string_view param, std::string_view val) override; diff --git a/src/networking/dimeRunner.cpp b/src/networking/dimeRunner.cpp index b8daea843..491d56f79 100644 --- a/src/networking/dimeRunner.cpp +++ b/src/networking/dimeRunner.cpp @@ -62,12 +62,12 @@ if (dimeOptions.count("test") != 0u) } */ -coreTime DimeRunner::Run() +CoreTime DimeRunner::Run() { return GriddynRunner::Run(); } -coreTime DimeRunner::Step(coreTime time) +CoreTime DimeRunner::Step(CoreTime time) { auto retTime = GriddynRunner::Step(time); // coord->updateOutputs(retTime); diff --git a/src/networking/dimeRunner.h b/src/networking/dimeRunner.h index 4351e0118..bb22745e4 100644 --- a/src/networking/dimeRunner.h +++ b/src/networking/dimeRunner.h @@ -30,9 +30,9 @@ dime virtual std::shared_ptr generateLocalCommandLineParser(ReaderInfo& ReaderInformation) override; - virtual coreTime Run(void) override; + virtual CoreTime Run(void) override; - virtual coreTime Step(coreTime time) override; + virtual CoreTime Step(CoreTime time) override; virtual void Finalize(void) override; }; diff --git a/src/networking/tcpCollector.cpp b/src/networking/tcpCollector.cpp index 9912d5855..6d753321e 100644 --- a/src/networking/tcpCollector.cpp +++ b/src/networking/tcpCollector.cpp @@ -11,7 +11,7 @@ #include namespace griddyn::tcpLib { -TcpCollector::TcpCollector(coreTime time0, coreTime period): Collector(time0, period) {} +TcpCollector::TcpCollector(CoreTime time0, CoreTime period): Collector(time0, period) {} TcpCollector::TcpCollector(const std::string& collectorName): Collector(collectorName) {} @@ -39,7 +39,7 @@ void TcpCollector::cloneTo(Collector* col) const tcpCollectorClone->port = port; } -ChangeCode TcpCollector::trigger(coreTime time) +ChangeCode TcpCollector::trigger(CoreTime time) { if (!connection) { connection = gmlc::networking::TcpConnection::create( diff --git a/src/networking/tcpCollector.h b/src/networking/tcpCollector.h index 0394a592c..a1281f175 100644 --- a/src/networking/tcpCollector.h +++ b/src/networking/tcpCollector.h @@ -19,14 +19,14 @@ class TcpCollector: public Collector { std::shared_ptr connection; public: - TcpCollector(coreTime time0 = timeZero, coreTime period = timeOneSecond); + TcpCollector(CoreTime time0 = timeZero, CoreTime period = timeOneSecond); explicit TcpCollector(const std::string& name); ~TcpCollector(); virtual std::unique_ptr clone() const override; virtual void cloneTo(Collector* col) const override; - virtual ChangeCode trigger(coreTime time) override; + virtual ChangeCode trigger(CoreTime time) override; void set(std::string_view param, double val) override; void set(std::string_view param, std::string_view val) override; diff --git a/src/optimization/gridOptObjects.cpp b/src/optimization/gridOptObjects.cpp index 47fc80525..ffd2d8716 100644 --- a/src/optimization/gridOptObjects.cpp +++ b/src/optimization/gridOptObjects.cpp @@ -382,13 +382,13 @@ void GridOptObject::gradient(const OptimizationData& /*unused*/, } void GridOptObject::jacobianElements(const OptimizationData& /*unused*/, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /*unused*/) { } void GridOptObject::getConstraints(const OptimizationData& /*unused*/, - matrixData& /*cons*/, + MatrixData& /*cons*/, double /*upperLimit*/[], double /*lowerLimit*/[], const OptimizationMode& /*unused*/) @@ -402,13 +402,13 @@ void GridOptObject::constraintValue(const OptimizationData& /*unused*/, } void GridOptObject::constraintJacobianElements(const OptimizationData& /*unused*/, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /*unused*/) { } void GridOptObject::hessianElements(const OptimizationData& /*unused*/, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /*unused*/) { } diff --git a/src/optimization/gridOptObjects.h b/src/optimization/gridOptObjects.h index 798597038..fdc8a77a5 100644 --- a/src/optimization/gridOptObjects.h +++ b/src/optimization/gridOptObjects.h @@ -17,7 +17,7 @@ template class vectData; template -class matrixData; +class MatrixData; namespace griddyn { class consData; @@ -25,7 +25,7 @@ class consData; * the basic object for creating a power system encapsulating some common functions and data that is *needed by all objects in the simulation and defining some common methods for use by all objects. *This object is not really intended to be instantiated directly and is mostly a common interface to - *inheriting objects gridPrimary, gridSecondary, and GridSubModel as it encapsulated common + *inheriting objects GridPrimary, GridSecondary, and GridSubModel as it encapsulated common *functionality between those objects **/ class GridOptObject: public CoreObject { @@ -220,7 +220,7 @@ class GridOptObject: public CoreObject { @param oMode the optimization mode to use. */ virtual void jacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode); // constraint functions @@ -234,7 +234,7 @@ class GridOptObject: public CoreObject { @param[in] oMode the optimization mode to use. */ virtual void getConstraints(const OptimizationData& of, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode); @@ -252,7 +252,7 @@ class GridOptObject: public CoreObject { @param oMode the optimization mode to use. */ virtual void constraintJacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode); /** get the Hessian array for the objective function @@ -261,7 +261,7 @@ class GridOptObject: public CoreObject { @param oMode the optimization mode to use. */ virtual void hessianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode); /** get the names of the objective variables diff --git a/src/optimization/models/gridAreaOpt.cpp b/src/optimization/models/gridAreaOpt.cpp index f2b8b5abc..f14e1f363 100644 --- a/src/optimization/models/gridAreaOpt.cpp +++ b/src/optimization/models/gridAreaOpt.cpp @@ -273,7 +273,7 @@ void GridAreaOpt::gradient(const OptimizationData& optimizationData, } } void GridAreaOpt::jacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) { for (auto* childObject : objectList) { @@ -281,7 +281,7 @@ void GridAreaOpt::jacobianElements(const OptimizationData& optimizationData, } } void GridAreaOpt::getConstraints(const OptimizationData& optimizationData, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) @@ -301,7 +301,7 @@ void GridAreaOpt::constraintValue(const OptimizationData& optimizationData, } void GridAreaOpt::constraintJacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) { for (auto* childObject : objectList) { diff --git a/src/optimization/models/gridAreaOpt.h b/src/optimization/models/gridAreaOpt.h index 94c4ba32c..92a177647 100644 --- a/src/optimization/models/gridAreaOpt.h +++ b/src/optimization/models/gridAreaOpt.h @@ -82,10 +82,10 @@ class GridAreaOpt: public GridOptObject { double deriv[], const OptimizationMode& oMode) override; virtual void jacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) override; virtual void getConstraints(const OptimizationData& optimizationData, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) override; @@ -93,7 +93,7 @@ class GridAreaOpt: public GridOptObject { double cVals[], const OptimizationMode& oMode) override; virtual void constraintJacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) override; virtual void getObjectiveNames(stringVec& objectiveNames, diff --git a/src/optimization/models/gridBusOpt.cpp b/src/optimization/models/gridBusOpt.cpp index 976166839..d9b55ac47 100644 --- a/src/optimization/models/gridBusOpt.cpp +++ b/src/optimization/models/gridBusOpt.cpp @@ -223,7 +223,7 @@ void GridBusOpt::gradient(const OptimizationData& optimizationData, } } void GridBusOpt::jacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) { for (auto* loadObject : loadList) { @@ -234,7 +234,7 @@ void GridBusOpt::jacobianElements(const OptimizationData& optimizationData, } } void GridBusOpt::getConstraints(const OptimizationData& optimizationData, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) @@ -260,7 +260,7 @@ void GridBusOpt::constraintValue(const OptimizationData& optimizationData, } void GridBusOpt::constraintJacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) { for (auto* loadObject : loadList) { diff --git a/src/optimization/models/gridBusOpt.h b/src/optimization/models/gridBusOpt.h index c400f5d86..2334b256d 100644 --- a/src/optimization/models/gridBusOpt.h +++ b/src/optimization/models/gridBusOpt.h @@ -77,10 +77,10 @@ class GridBusOpt: public GridOptObject { double deriv[], const OptimizationMode& oMode) override; virtual void jacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) override; virtual void getConstraints(const OptimizationData& optimizationData, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) override; @@ -88,7 +88,7 @@ class GridBusOpt: public GridOptObject { double cVals[], const OptimizationMode& oMode) override; virtual void constraintJacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) override; virtual void getObjectiveNames(stringVec& objectiveNames, const OptimizationMode& oMode, diff --git a/src/optimization/models/gridGenOpt.cpp b/src/optimization/models/gridGenOpt.cpp index f4ddefa75..c0883cd5f 100644 --- a/src/optimization/models/gridGenOpt.cpp +++ b/src/optimization/models/gridGenOpt.cpp @@ -13,7 +13,7 @@ #include "gmlc/utilities/vectorOps.hpp" #include "gridBusOpt.h" #include "griddyn/Generator.h" -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include "utilities/vectData.hpp" #include #include @@ -268,7 +268,7 @@ void GridGenOpt::gradient(const OptimizationData& of, double deriv[], const Opti } } void GridGenOpt::jacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode) { auto& oo = offsets.getOffsets(oMode); @@ -312,7 +312,7 @@ void GridGenOpt::jacobianElements(const OptimizationData& of, } void GridGenOpt::getConstraints(const OptimizationData& /* of */, - matrixData& /*cons*/, + MatrixData& /*cons*/, double /*upperLimit*/[], double /*lowerLimit*/[], const OptimizationMode& /* oMode */) @@ -326,7 +326,7 @@ void GridGenOpt::constraintValue(const OptimizationData& /* of */, } void GridGenOpt::constraintJacobianElements(const OptimizationData& /* of */, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /* oMode */) { } diff --git a/src/optimization/models/gridGenOpt.h b/src/optimization/models/gridGenOpt.h index e8cb68009..6c37eff54 100644 --- a/src/optimization/models/gridGenOpt.h +++ b/src/optimization/models/gridGenOpt.h @@ -74,10 +74,10 @@ class GridGenOpt: public GridOptObject { double deriv[], const OptimizationMode& oMode) override; virtual void jacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode) override; virtual void getConstraints(const OptimizationData& of, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) override; @@ -85,7 +85,7 @@ class GridGenOpt: public GridOptObject { double cVals[], const OptimizationMode& oMode) override; virtual void constraintJacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode) override; virtual void getObjectiveNames(stringVec& objectiveNames, const OptimizationMode& oMode, diff --git a/src/optimization/models/gridLinkOpt.cpp b/src/optimization/models/gridLinkOpt.cpp index 6731ba8ec..c2c52f0c4 100644 --- a/src/optimization/models/gridLinkOpt.cpp +++ b/src/optimization/models/gridLinkOpt.cpp @@ -144,7 +144,7 @@ void GridLinkOpt::constraintValue(const OptimizationData& /*optimizationData*/, } void GridLinkOpt::constraintJacobianElements(const OptimizationData& /*optimizationData*/, - matrixData& /*matrixDataRef*/, + MatrixData& /*matrixDataRef*/, const OptimizationMode& /*oMode*/) { } @@ -165,13 +165,13 @@ void GridLinkOpt::gradient(const OptimizationData& /*optimizationData*/, } void GridLinkOpt::jacobianElements(const OptimizationData& /*optimizationData*/, - matrixData& /*matrixDataRef*/, + MatrixData& /*matrixDataRef*/, const OptimizationMode& /*oMode*/) { } void GridLinkOpt::getConstraints(const OptimizationData& /*optimizationData*/, - matrixData& /*cons*/, + MatrixData& /*cons*/, double /*upperLimit*/[], double /*lowerLimit*/[], const OptimizationMode& /*oMode*/) diff --git a/src/optimization/models/gridLinkOpt.h b/src/optimization/models/gridLinkOpt.h index 86d1a64f7..8bf3a3013 100644 --- a/src/optimization/models/gridLinkOpt.h +++ b/src/optimization/models/gridLinkOpt.h @@ -73,10 +73,10 @@ class GridLinkOpt: public GridOptObject { double grad[], const OptimizationMode& oMode) override; virtual void jacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) override; virtual void getConstraints(const OptimizationData& optimizationData, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) override; @@ -84,7 +84,7 @@ class GridLinkOpt: public GridOptObject { double cVals[], const OptimizationMode& oMode) override; virtual void constraintJacobianElements(const OptimizationData& optimizationData, - matrixData& matrixDataRef, + MatrixData& matrixDataRef, const OptimizationMode& oMode) override; virtual void getObjectiveNames(stringVec& objectiveNames, const OptimizationMode& oMode, diff --git a/src/optimization/models/gridLoadOpt.cpp b/src/optimization/models/gridLoadOpt.cpp index 49310bb43..ac05f36d9 100644 --- a/src/optimization/models/gridLoadOpt.cpp +++ b/src/optimization/models/gridLoadOpt.cpp @@ -140,7 +140,7 @@ void GridLoadOpt::constraintValue(const OptimizationData& /*of*/, { } void GridLoadOpt::constraintJacobianElements(const OptimizationData& /*of*/, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /*oMode*/) { } @@ -158,12 +158,12 @@ void GridLoadOpt::gradient(const OptimizationData& /*of*/, { } void GridLoadOpt::jacobianElements(const OptimizationData& /*of*/, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /*oMode*/) { } void GridLoadOpt::getConstraints(const OptimizationData& /*of*/, - matrixData& /*cons*/, + MatrixData& /*cons*/, double /*upperLimit*/[], double /*lowerLimit*/[], const OptimizationMode& /*oMode*/) diff --git a/src/optimization/models/gridLoadOpt.h b/src/optimization/models/gridLoadOpt.h index a3b11106e..ebc770828 100644 --- a/src/optimization/models/gridLoadOpt.h +++ b/src/optimization/models/gridLoadOpt.h @@ -61,10 +61,10 @@ class GridLoadOpt: public GridOptObject { double deriv[], const OptimizationMode& oMode) override; virtual void jacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode) override; virtual void getConstraints(const OptimizationData& of, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) override; @@ -72,7 +72,7 @@ class GridLoadOpt: public GridOptObject { double cVals[], const OptimizationMode& oMode) override; virtual void constraintJacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode) override; virtual void getObjectiveNames(stringVec& objectiveNames, const OptimizationMode& oMode, diff --git a/src/optimization/models/gridRelayOpt.cpp b/src/optimization/models/gridRelayOpt.cpp index ca0a5fb21..120c57f9d 100644 --- a/src/optimization/models/gridRelayOpt.cpp +++ b/src/optimization/models/gridRelayOpt.cpp @@ -142,7 +142,7 @@ void GridRelayOpt::constraintValue(const OptimizationData& /*of*/, { } void GridRelayOpt::constraintJacobianElements(const OptimizationData& /*of*/, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /*oMode*/) { } @@ -160,12 +160,12 @@ void GridRelayOpt::gradient(const OptimizationData& /*of*/, { } void GridRelayOpt::jacobianElements(const OptimizationData& /*of*/, - matrixData& /*md*/, + MatrixData& /*md*/, const OptimizationMode& /*oMode*/) { } void GridRelayOpt::getConstraints(const OptimizationData& /*of*/, - matrixData& /*cons*/, + MatrixData& /*cons*/, double /*upperLimit*/[], double /*lowerLimit*/[], const OptimizationMode& /*oMode*/) diff --git a/src/optimization/models/gridRelayOpt.h b/src/optimization/models/gridRelayOpt.h index 89f972875..dbb291319 100644 --- a/src/optimization/models/gridRelayOpt.h +++ b/src/optimization/models/gridRelayOpt.h @@ -66,10 +66,10 @@ class GridRelayOpt: public GridOptObject { double deriv[], const OptimizationMode& oMode) override; virtual void jacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode) override; virtual void getConstraints(const OptimizationData& of, - matrixData& cons, + MatrixData& cons, double upperLimit[], double lowerLimit[], const OptimizationMode& oMode) override; @@ -77,7 +77,7 @@ class GridRelayOpt: public GridOptObject { double cVals[], const OptimizationMode& oMode) override; virtual void constraintJacobianElements(const OptimizationData& of, - matrixData& md, + MatrixData& md, const OptimizationMode& oMode) override; virtual void getObjectiveNames(stringVec& objectiveNames, const OptimizationMode& oMode, diff --git a/src/runner/gridDynRunner.cpp b/src/runner/gridDynRunner.cpp index 68e71ee33..943151c37 100644 --- a/src/runner/gridDynRunner.cpp +++ b/src/runner/gridDynRunner.cpp @@ -145,7 +145,7 @@ int GriddynRunner::Reset(ReaderInfo& ReaderInformation) return FUNCTION_EXECUTION_SUCCESS; } -coreTime GriddynRunner::Run() +CoreTime GriddynRunner::Run() { if (!isReady()) { throw(ExecutionFailure(m_gds.get(), "asynchronous operation ongoing")); @@ -169,12 +169,12 @@ void GriddynRunner::RunAsync() mAsyncReturn = std::async(std::launch::async, [this] { return Run(); }); } -coreTime GriddynRunner::Step(coreTime nextStep) +CoreTime GriddynRunner::Step(CoreTime nextStep) { if (!isReady()) { throw(ExecutionFailure(m_gds.get(), "asynchronous operation ongoing")); } - coreTime actual = nextStep; + CoreTime actual = nextStep; if (m_gds) { if (mEventMode) { const int returnValue = m_gds->eventDrivenPowerflow(nextStep); @@ -197,7 +197,7 @@ coreTime GriddynRunner::Step(coreTime nextStep) return actual; } -void GriddynRunner::StepAsync(coreTime time) +void GriddynRunner::StepAsync(CoreTime time) { if (!isReady()) { throw(ExecutionFailure(m_gds.get(), "asynchronous operation ongoing")); @@ -220,13 +220,13 @@ bool GriddynRunner::isReady() const true; } -int GriddynRunner::getStatus(coreTime& timeReturn) +int GriddynRunner::getStatus(CoreTime& timeReturn) { timeReturn = m_gds->getSimulationTime(); return (isReady()) ? static_cast(m_gds->currentProcessState()) : GRIDDYN_PENDING; } -coreTime GriddynRunner::getNextEvent() const +CoreTime GriddynRunner::getNextEvent() const { return m_gds->getEventTime(); } diff --git a/src/runner/gridDynRunner.h b/src/runner/gridDynRunner.h index 1b3e4b529..6034d516a 100644 --- a/src/runner/gridDynRunner.h +++ b/src/runner/gridDynRunner.h @@ -64,7 +64,7 @@ class GriddynRunner { * Run simulation to completion @return the final time of the simulation */ - virtual coreTime Run(); + virtual CoreTime Run(); /** * Run simulation to completion but return immediately @@ -79,7 +79,7 @@ class GriddynRunner { * @param nextStep maximum time simulation may advance to. * @return time simulation successfully advanced to. */ - virtual coreTime Step(coreTime nextStep); + virtual CoreTime Step(CoreTime nextStep); /** * Run simulation up to provided time. Simulation may @@ -87,19 +87,19 @@ class GriddynRunner { * * @param time maximum time simulation may advance to. */ - virtual void StepAsync(coreTime time); + virtual void StepAsync(CoreTime time); /** get the current execution status of the simulation @param[out] timeReturn the current simulation time @return GRIDDYN_PENDING if an asynchronous operation is ongoing otherwise returns the current state of the simulation*/ - virtual int getStatus(coreTime& timeReturn); + virtual int getStatus(CoreTime& timeReturn); /** * Get the next GridDyn Event time * * @return the next event time */ - coreTime getNextEvent() const; + CoreTime getNextEvent() const; virtual void Finalize(); virtual int Reset(); @@ -135,7 +135,7 @@ class GriddynRunner { protected: std::string mExecutablePath; //!< the executable path from command line arguments private: - std::future mAsyncReturn; //!< future code for the asynchronous operations + std::future mAsyncReturn; //!< future code for the asynchronous operations int mArgcValue{0}; char** mArgValues = nullptr; std::string mArgumentString; diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt index 20f54c819..fb77ebffd 100644 --- a/src/utilities/CMakeLists.txt +++ b/src/utilities/CMakeLists.txt @@ -8,15 +8,15 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ set(utilities_sources - gridRandom.cpp - saturation.cpp + GridRandom.cpp + Saturation.cpp ThreePhaseFunctions.cpp matrixOps.cpp functionInterpreter.cpp zipUtilities.cpp matrixCreation.cpp logger.cpp - matrixDataSparse.cpp + MatrixDataSparse.cpp OperatingBoundary.cpp GlobalWorkQueue.cpp ) @@ -24,23 +24,23 @@ set(utilities_sources set(utilities_headers dataDictionary.hpp ThreePhaseFunctions.h - gridRandom.h - saturation.h + GridRandom.h + Saturation.h vectData.hpp - matrixData.hpp + MatrixData.hpp matrixOps.h - matrixDataCompact.hpp - matrixDataSparse.hpp - matrixDataSparse_impl.hpp - matrixDataBoost.hpp - matrixDataSparseSM.hpp - matrixDataTranslate.hpp - matrixDataContainer.hpp - matrixDataScale.hpp - matrixDataOrdered.hpp - matrixDataOrdering.hpp - matrixDataFilter.hpp - matrixDataCustomWriteOnly.hpp + MatrixDataCompact.hpp + MatrixDataSparse.hpp + MatrixDataSparse_impl.hpp + MatrixDataBoost.hpp + MatrixDataSparseSM.hpp + MatrixDataTranslate.hpp + MatrixDataContainer.hpp + MatrixDataScale.hpp + MatrixDataOrdered.hpp + MatrixDataOrdering.hpp + MatrixDataFilter.hpp + MatrixDataCustomWriteOnly.hpp functionInterpreter.h zipUtilities.h valuePredictor.hpp diff --git a/src/utilities/gridRandom.cpp b/src/utilities/GridRandom.cpp similarity index 82% rename from src/utilities/gridRandom.cpp rename to src/utilities/GridRandom.cpp index 8c78bc0bf..85114257c 100644 --- a/src/utilities/gridRandom.cpp +++ b/src/utilities/GridRandom.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include "gridRandom.h" +#include "GridRandom.h" #include "gmlc/utilities/vectorOps.hpp" #include @@ -74,12 +74,12 @@ namespace { } } // namespace -std::unique_ptr gridRandom::mGenerator; +std::unique_ptr GridRandom::mGenerator; -bool gridRandom::mSeeded = false; -unsigned int gridRandom::mActualSeed = 0; +bool GridRandom::mSeeded = false; +unsigned int GridRandom::mActualSeed = 0; -gridRandom::gridRandom(DistributionType dist, double param1, double param2): +GridRandom::GridRandom(DistributionType dist, double param1, double param2): mDist(dist), mParam1(param1), mParam2(param2) { setDistribution(dist); @@ -88,33 +88,33 @@ gridRandom::gridRandom(DistributionType dist, double param1, double param2): } } -gridRandom::gridRandom(std::string_view dist_name, double param1, double param2): - gridRandom(getDist(dist_name), param1, param2) +GridRandom::GridRandom(std::string_view dist_name, double param1, double param2): + GridRandom(getDist(dist_name), param1, param2) { } -void gridRandom::ensureEngine() +void GridRandom::ensureEngine() { if (!mGenerator) { mGenerator = std::make_unique(); } } -void gridRandom::setParameters(double param1, double param2) +void GridRandom::setParameters(double param1, double param2) { mParam1 = param1; mParam2 = param2; mDistribution->updateParameters(mParam1, mParam2); } -void gridRandom::setSeed(unsigned int seed) +void GridRandom::setSeed(unsigned int seed) { ensureEngine(); mActualSeed = seed; mGenerator->seed(seed); mSeeded = true; } -void gridRandom::setSeed() +void GridRandom::setSeed() { ensureEngine(); mActualSeed = static_cast(time(nullptr)); @@ -122,11 +122,11 @@ void gridRandom::setSeed() mSeeded = true; } -unsigned int gridRandom::getSeed() +unsigned int GridRandom::getSeed() { return mActualSeed; } -void gridRandom::setDistribution(DistributionType dist) +void GridRandom::setDistribution(DistributionType dist) { mDist = dist; switch (dist) { @@ -171,7 +171,7 @@ void gridRandom::setDistribution(DistributionType dist) } } -double gridRandom::randNumber(DistributionType dist) +double GridRandom::randNumber(DistributionType dist) { if (!mSeeded) { setSeed(); @@ -205,7 +205,7 @@ double gridRandom::randNumber(DistributionType dist) } } -double gridRandom::randNumber(DistributionType dist, double param1, double param2) +double GridRandom::randNumber(DistributionType dist, double param1, double param2) { if (!mSeeded) { setSeed(); @@ -249,15 +249,15 @@ double gridRandom::randNumber(DistributionType dist, double param1, double param } } -double gridRandom::operator()() +double GridRandom::operator()() { return generate(); } -double gridRandom::generate() +double GridRandom::generate() { return (*mDistribution)(); } -std::vector gridRandom::getNewValues(size_t count) +std::vector GridRandom::getNewValues(size_t count) { std::vector randomValues(count); std::generate(randomValues.begin(), randomValues.end(), [this]() { @@ -266,32 +266,32 @@ std::vector gridRandom::getNewValues(size_t count) return randomValues; } -void gridRandom::getNewValues(std::vector& rvec, size_t count) +void GridRandom::getNewValues(std::vector& rvec, size_t count) { gmlc::utilities::ensureSizeAtLeast(rvec, count); std::generate(rvec.begin(), rvec.begin() + count - 1, [this]() { return (*mDistribution)(); }); } -std::pair gridRandom::getPair() +std::pair GridRandom::getPair() { return std::make_pair((*mDistribution)(), (*mDistribution)()); } -static constexpr auto distmap = makeLookupTable({ - {"constant", gridRandom::DistributionType::CONSTANT}, - {"const", gridRandom::DistributionType::CONSTANT}, - {"uniform", gridRandom::DistributionType::UNIFORM}, - {"lognormal", gridRandom::DistributionType::LOGNORMAL}, - {"extreme", gridRandom::DistributionType::EXTREME_VALUE}, - {"exponential", gridRandom::DistributionType::EXPONENTIAL}, - {"gamma", gridRandom::DistributionType::GAMMA}, - {"normal", gridRandom::DistributionType::NORMAL}, - {"gaussian", gridRandom::DistributionType::NORMAL}, - {"uniform_int", gridRandom::DistributionType::UNIFORM_INT}, +static constexpr auto distmap = makeLookupTable({ + {"constant", GridRandom::DistributionType::CONSTANT}, + {"const", GridRandom::DistributionType::CONSTANT}, + {"uniform", GridRandom::DistributionType::UNIFORM}, + {"lognormal", GridRandom::DistributionType::LOGNORMAL}, + {"extreme", GridRandom::DistributionType::EXTREME_VALUE}, + {"exponential", GridRandom::DistributionType::EXPONENTIAL}, + {"gamma", GridRandom::DistributionType::GAMMA}, + {"normal", GridRandom::DistributionType::NORMAL}, + {"gaussian", GridRandom::DistributionType::NORMAL}, + {"uniform_int", GridRandom::DistributionType::UNIFORM_INT}, }); -gridRandom::DistributionType getDist(std::string_view dist_name) +GridRandom::DistributionType getDist(std::string_view dist_name) { - return lookupValue(distmap, dist_name, gridRandom::DistributionType::CONSTANT); + return lookupValue(distmap, dist_name, GridRandom::DistributionType::CONSTANT); } } // namespace utilities diff --git a/src/utilities/gridRandom.h b/src/utilities/GridRandom.h similarity index 93% rename from src/utilities/gridRandom.h rename to src/utilities/GridRandom.h index b9986248c..0aaff8e8f 100644 --- a/src/utilities/gridRandom.h +++ b/src/utilities/GridRandom.h @@ -39,7 +39,7 @@ class distributionObject { // safe. /** class defining random number generation*/ -class gridRandom { +class GridRandom { private: static std::unique_ptr mGenerator; //!< generator //May need to make a generator per thread @@ -64,10 +64,10 @@ class gridRandom { GAMMA, UNIFORM_INT, }; - explicit gridRandom(DistributionType dist = DistributionType::NORMAL, + explicit GridRandom(DistributionType dist = DistributionType::NORMAL, double param1 = 0.0, double param2 = 1.0); - explicit gridRandom(std::string_view dist_name, double param1 = 0.0, double param2 = 1.0); + explicit GridRandom(std::string_view dist_name, double param1 = 0.0, double param2 = 1.0); void setDistribution(DistributionType dist); DistributionType getDistribution() const { return mDist; } @@ -112,7 +112,7 @@ class randomDistributionObject2: public distributionObject { randomDistributionObject2() {} explicit randomDistributionObject2(double param1): dist(param1) {} randomDistributionObject2(double param1, double param2): dist(param1, param2) {} - virtual double operator()() override { return dist(gridRandom::getEngine()); } + virtual double operator()() override { return dist(GridRandom::getEngine()); } virtual void updateParameter(double param1) override { dist = DIST(param1); } virtual void updateParameters(double param1, double param2) override { @@ -129,7 +129,7 @@ class randomDistributionObject1: public distributionObject { public: randomDistributionObject1() {} explicit randomDistributionObject1(double param1): dist(param1) {} - virtual double operator()() override { return dist(gridRandom::getEngine()); } + virtual double operator()() override { return dist(GridRandom::getEngine()); } virtual void updateParameter(double param1) override { dist = DIST(param1); } }; @@ -147,6 +147,6 @@ class randomDistributionObject1: public distributionObject { }; /** get the distribution type from a string*/ -gridRandom::DistributionType getDist(std::string_view dist_name); +GridRandom::DistributionType getDist(std::string_view dist_name); } // namespace utilities diff --git a/src/utilities/matrixData.hpp b/src/utilities/MatrixData.hpp similarity index 87% rename from src/utilities/matrixData.hpp rename to src/utilities/MatrixData.hpp index 5feff88d1..07d11b8c9 100644 --- a/src/utilities/matrixData.hpp +++ b/src/utilities/MatrixData.hpp @@ -13,24 +13,24 @@ /** @brief convenience structure for returning data */ template -class matrixElement { +class MatrixElement { public: using value_t = ValueT; index_t row; //!< row index_t col; //!< column value_t data; //!< value - matrixElement() = default; - matrixElement(index_t R, index_t C, value_t D) noexcept: row{R}, col{C}, data{std::move(D)} {} + MatrixElement() = default; + MatrixElement(index_t R, index_t C, value_t D) noexcept: row{R}, col{C}, data{std::move(D)} {} }; template -static bool compareRow(const matrixElement& A, const matrixElement& B) +static bool compareRow(const MatrixElement& A, const MatrixElement& B) { return (A.row < B.row) ? true : ((A.row > B.row) ? false : (A.col < B.col)); } template -static bool compareCol(const matrixElement& A, const matrixElement& B) +static bool compareCol(const MatrixElement& A, const MatrixElement& B) { return (A.col < B.col) ? true : ((A.col > B.col) ? false : (A.row < B.row)); } @@ -38,7 +38,7 @@ static bool compareCol(const matrixElement& A, const matrixElement& B) /** @brief class implementing a matrix entry class for handling Jacobian entries * * @details this is a purely virtual interface a specific - * instantiation is required in general matrixData objects are not + * instantiation is required in general MatrixData objects are not * thread safe, accessing from more than one thread at a time will * likely be problematic, because they are virtual classes, no * specific iterator is possible without dynamic allocation and that @@ -49,7 +49,7 @@ static bool compareCol(const matrixElement& A, const matrixElement& B) * that may be more useful. individual classes */ template -class matrixData { +class MatrixData { public: using value_t = ValueT; @@ -58,13 +58,13 @@ class matrixData { * @param[in] rows the initial row limit * @param[in] cols the initial column limit */ - explicit matrixData(index_t rows = kIndexMax, index_t cols = kIndexMax) noexcept: + explicit MatrixData(index_t rows = kIndexMax, index_t cols = kIndexMax) noexcept: rowLim{rows}, colLim{cols} { } /** @brief virtual destructor */ - virtual ~matrixData() = default; + virtual ~MatrixData() = default; /** @brief function to clear the data */ virtual void clear() = 0; @@ -189,9 +189,9 @@ class matrixData { * @param[in] N the element number to return * @return the element corresponding to the index */ - virtual matrixElement element(index_t N) const = 0; + virtual MatrixElement element(index_t N) const = 0; - /** @brief change the matrixData to a compact sorted form + /** @brief change the MatrixData to a compact sorted form */ virtual void compact() { @@ -210,17 +210,17 @@ class matrixData { * * @return a triple with the row/col/val of the first element */ - virtual matrixElement next() { return element(cur++); } + virtual MatrixElement next() { return element(cur++); } /** * @brief check if the data sequence is at its end * @return true if there are more points to grab false if not */ virtual bool moreData() { return (cur < size()); } /** - * @brief merge 2 matrixData structures together - * @param[in] a2 the matrixData to merge in + * @brief merge 2 MatrixData structures together + * @param[in] a2 the MatrixData to merge in */ - virtual void merge(matrixData& a2) + virtual void merge(MatrixData& a2) { count_t count = a2.size(); a2.start(); @@ -231,13 +231,13 @@ class matrixData { } /** - * @brief merge 2 matrixData structures together + * @brief merge 2 MatrixData structures together * - * @param[in] a2 the matrixData to merge in + * @param[in] a2 the MatrixData to merge in * @param[in] scale a double scaler for each of the elements in * the second matrix; */ - virtual void merge(matrixData& a2, value_t scale) + virtual void merge(MatrixData& a2, value_t scale) { count_t count = a2.size(); a2.start(); @@ -247,12 +247,12 @@ class matrixData { } } /** - * @merge copy and translate a row from a2 into the calling matrixData - * @param[in] a2 the matrixData to copy and translate + * @merge copy and translate a row from a2 into the calling MatrixData + * @param[in] a2 the MatrixData to copy and translate * @param[in] origRow the original row * @param[in] newRow the new row Value */ - virtual void copyTranslateRow(matrixData& a2, index_t origRow, index_t newRow) + virtual void copyTranslateRow(MatrixData& a2, index_t origRow, index_t newRow) { count_t count = a2.size(); a2.start(); diff --git a/src/utilities/matrixDataBoost.hpp b/src/utilities/MatrixDataBoost.hpp similarity index 79% rename from src/utilities/matrixDataBoost.hpp rename to src/utilities/MatrixDataBoost.hpp index a8cc6953d..9c98a4223 100644 --- a/src/utilities/matrixDataBoost.hpp +++ b/src/utilities/MatrixDataBoost.hpp @@ -6,14 +6,14 @@ #pragma once -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include /** @brief class implementing an expandable sparse matrix based on the boost matrices geared for * Jacobian entries*/ template -class matrixDataBoost: public matrixData { +class MatrixDataBoost: public MatrixData { public: boost::numeric::ublas::mapped_matrix m; //!< boost matrix to interface @@ -22,7 +22,7 @@ class matrixDataBoost: public matrixData { @param[in] R number of rows @param[in] C number of columns */ - matrixDataBoost(count_t R, count_t C): matrixData(R, C), m(R, C) {} + MatrixDataBoost(count_t R, count_t C): MatrixData(R, C), m(R, C) {} /** * function to clear the data */ @@ -38,29 +38,29 @@ class matrixDataBoost: public matrixData { /** * @brief don't use this function */ - matrixElement element(index_t N) { return matrixElement(); } + MatrixElement element(index_t N) { return MatrixElement(); } /** * @brief don't use this function */ - matrixElement start() override + MatrixElement start() override { - return {matrixData::rowLim, matrixData::colLim, type(0)}; + return {MatrixData::rowLim, MatrixData::colLim, type(0)}; } /** * @brief don't use this function */ - matrixElement next() override + MatrixElement next() override { - return {matrixData::rowLim, matrixData::colLim, type(0)}; + return {MatrixData::rowLim, MatrixData::colLim, type(0)}; } type at(index_t rowN, index_t colN) const override { return m(rowN, colN); } auto begin() const { return matriIteratorBoost(this, 0); } auto end() const { return matriIteratorBoost(this, size()); } protected: - class matrixIteratorBoost { + class MatrixIteratorBoost { public: - explicit matrixIteratorBoost(const matrixDataBoost* matrixData, index_t start = 0) + explicit MatrixIteratorBoost(const MatrixDataBoost* MatrixData, index_t start = 0) { if (start == 0) { cptr = mDB->m.begin1(); @@ -82,7 +82,7 @@ class matrixDataBoost: public matrixData { } } - matrixIteratorBoost& operator++() override + MatrixIteratorBoost& operator++() override { ++cptr2; if (cptr2 == cptr2end) { @@ -100,13 +100,13 @@ class matrixDataBoost: public matrixData { } } - virtual matrixElement operator*() const override + virtual MatrixElement operator*() const override { return {cptr2.index1(), cptr2.index2(), *cptr2}; } private: - matrixDataBoost* mDB = nullptr; + MatrixDataBoost* mDB = nullptr; decltype(mDB->m.begin1()) cptr; decltype(cptr->begin()) cptr2; decltype(cptr->end()) cptr2end; diff --git a/src/utilities/matrixDataCompact.hpp b/src/utilities/MatrixDataCompact.hpp similarity index 66% rename from src/utilities/matrixDataCompact.hpp rename to src/utilities/MatrixDataCompact.hpp index 22aef3c20..c4f1b4d42 100644 --- a/src/utilities/matrixDataCompact.hpp +++ b/src/utilities/MatrixDataCompact.hpp @@ -6,15 +6,15 @@ #pragma once -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include /** @brief class implementing a dense matrix geared for Jacobian entries - this matrixData structure is intended to be for small dense matrices with a required fast value + this MatrixData structure is intended to be for small dense matrices with a required fast value lookup and possibly lots of duplicate entries */ template -class matrixDataCompact: public matrixData { +class MatrixDataCompact: public MatrixData { private: std::array dVec; //!< the array containing the data index_t Rctr = 0; @@ -23,7 +23,7 @@ class matrixDataCompact: public matrixData { public: /** @brief compact constructor */ - matrixDataCompact(): matrixData(R, C) {} + MatrixDataCompact(): MatrixData(R, C) {} virtual void clear() override { dVec.fill(0); } virtual void assign(index_t row, index_t col, ValueT num) override @@ -37,27 +37,27 @@ class matrixDataCompact: public matrixData { virtual void limitUpdate(index_t newRowLimit, index_t newColLimit) final override { // the row and col limits cannot change if (newRowLimit != R) { - matrixData::setRowLimit(R); + MatrixData::setRowLimit(R); } if (newColLimit != C) { - matrixData::setColLimit(R); + MatrixData::setColLimit(R); } } - virtual matrixElement element(index_t N) const override + virtual MatrixElement element(index_t N) const override { return {N % R, N / R, dVec[N]}; } virtual void start() override { - matrixData::cur = 0; + MatrixData::cur = 0; Rctr = 0; Cctr = 0; } - virtual matrixElement next() override + virtual MatrixElement next() override { - matrixElement tp{Rctr, Cctr, dVec[matrixData::cur]}; - ++matrixData::cur; + MatrixElement tp{Rctr, Cctr, dVec[MatrixData::cur]}; + ++MatrixData::cur; ++Rctr; if (Rctr == R) { Rctr = 0; @@ -67,14 +67,14 @@ class matrixDataCompact: public matrixData { } virtual ValueT at(index_t rowN, index_t colN) const override { return dVec[colN * R + rowN]; } - auto begin() { return matrixIteratorCompact(this, 0); } - auto end() { return matrixIteratorCompact(this, R * C); } + auto begin() { return MatrixIteratorCompact(this, 0); } + auto end() { return MatrixIteratorCompact(this, R * C); } protected: - class matrixIteratorCompact { + class MatrixIteratorCompact { public: - explicit matrixIteratorCompact(const matrixDataCompact* matrixData, - index_t start = 0): mDC(matrixData), counter(start) + explicit MatrixIteratorCompact(const MatrixDataCompact* MatrixData, + index_t start = 0): mDC(MatrixData), counter(start) { if (start == mDC->size()) { Rctr = R; @@ -82,7 +82,7 @@ class matrixDataCompact: public matrixData { } } - virtual matrixIteratorCompact& operator++() + virtual MatrixIteratorCompact& operator++() { ++counter; ++Rctr; @@ -93,10 +93,10 @@ class matrixDataCompact: public matrixData { return *this; } - virtual matrixElement operator*() const { return {Rctr, Cctr, mDC->dVec[counter]}; } + virtual MatrixElement operator*() const { return {Rctr, Cctr, mDC->dVec[counter]}; } private: - const matrixDataCompact* mDC; + const MatrixDataCompact* mDC; index_t Rctr{0}; index_t Cctr{0}; index_t counter; diff --git a/src/utilities/matrixDataContainer.hpp b/src/utilities/MatrixDataContainer.hpp similarity index 58% rename from src/utilities/matrixDataContainer.hpp rename to src/utilities/MatrixDataContainer.hpp index 3fbe71b46..f6b1ba877 100644 --- a/src/utilities/matrixDataContainer.hpp +++ b/src/utilities/MatrixDataContainer.hpp @@ -6,7 +6,7 @@ #pragma once -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" /** @brief intermediate class for implementing a containing matrix data @details class is abstract and cannot be instantiated on its own meant to help some @@ -14,16 +14,16 @@ other classes that do things to the input before transmitting it. uses a pointer so it can be reassigned later */ template -class matrixDataContainer: public matrixData { +class MatrixDataContainer: public MatrixData { public: - matrixData* md; //!< the matrix this class contains + MatrixData* md; //!< the matrix this class contains public: - matrixDataContainer() = default; + MatrixDataContainer() = default; /** @brief constructor */ - explicit matrixDataContainer(matrixData& input) + explicit MatrixDataContainer(MatrixData& input) { - matrixDataContainer::setArray(&input); + MatrixDataContainer::setArray(&input); }; void clear() override { md->clear(); }; void assign(index_t row, index_t col, ValueT num) override = 0; @@ -31,23 +31,23 @@ class matrixDataContainer: public matrixData { count_t size() const override { return md->size(); }; void reserve(count_t maxNonZeros) override { md->reserve(maxNonZeros); } count_t capacity() const override { return md->capacity(); }; - matrixElement element(index_t N) const override { return md->element(N); } + MatrixElement element(index_t N) const override { return md->element(N); } void compact() override { md->compact(); } void start() override { md->start(); } - matrixElement next() override { return md->next(); } + MatrixElement next() override { return md->next(); } bool moreData() override { return md->moreData(); } ValueT at(index_t rowN, index_t colN) const override { return md->at(rowN, colN); }; - /** set the matrixData object to translate to - @param[in] newAd the new matrixData object + /** set the MatrixData object to translate to + @param[in] newAd the new MatrixData object */ - virtual void setArray(matrixData* newAd) + virtual void setArray(MatrixData* newAd) { md = newAd; - matrixData::setColLimit(md->colLimit()); - matrixData::setRowLimit(md->rowLimit()); + MatrixData::setColLimit(md->colLimit()); + MatrixData::setRowLimit(md->rowLimit()); } - /** set the matrixData object to translate to - @param[in] newAd the new matrixData object + /** set the MatrixData object to translate to + @param[in] newAd the new MatrixData object */ - virtual void setArray(matrixData& newAd) { setArray(&newAd); } + virtual void setArray(MatrixData& newAd) { setArray(&newAd); } }; diff --git a/src/utilities/matrixDataCustomWriteOnly.hpp b/src/utilities/MatrixDataCustomWriteOnly.hpp similarity index 80% rename from src/utilities/matrixDataCustomWriteOnly.hpp rename to src/utilities/MatrixDataCustomWriteOnly.hpp index a3e4a1b18..bd9f97c26 100644 --- a/src/utilities/matrixDataCustomWriteOnly.hpp +++ b/src/utilities/MatrixDataCustomWriteOnly.hpp @@ -6,7 +6,7 @@ #pragma once -#include "utilities/matrixData.hpp" +#include "utilities/MatrixData.hpp" #include #include #include @@ -15,22 +15,22 @@ none of the other read or assign functions are operation and all will assert false */ template -class matrixDataCustomWriteOnly: public matrixData { +class MatrixDataCustomWriteOnly: public MatrixData { private: std::function insertFunction; public: - matrixDataCustomWriteOnly() = default; + MatrixDataCustomWriteOnly() = default; void clear() override {}; void assign(index_t row, index_t col, ValueT num) override { insertFunction(row, col, num); } count_t size() const override { return 0; }; count_t capacity() const override { return 0; }; - matrixElement element(index_t /*N*/) const override + MatrixElement element(index_t /*N*/) const override { assert(false); - return matrixElement(); + return MatrixElement(); } ValueT at(index_t /*rowN*/, index_t /*colN*/) const override { return 0.0; }; diff --git a/src/utilities/matrixDataFilter.hpp b/src/utilities/MatrixDataFilter.hpp similarity index 79% rename from src/utilities/matrixDataFilter.hpp rename to src/utilities/MatrixDataFilter.hpp index 5bae6c4fa..66975519f 100644 --- a/src/utilities/matrixDataFilter.hpp +++ b/src/utilities/MatrixDataFilter.hpp @@ -6,31 +6,31 @@ #pragma once -#include "matrixDataContainer.hpp" +#include "MatrixDataContainer.hpp" #include #include -/** @brief class implementation filter for another matrixData object -most functions are just simple forwarding to the underlying matrixData object +/** @brief class implementation filter for another MatrixData object +most functions are just simple forwarding to the underlying MatrixData object except the assign operator, the row index is checked against a set of filtered rows if it is not in the filtered list it is passed through to the underlying matrix */ template -class matrixDataFilter: public matrixDataContainer { +class MatrixDataFilter: public MatrixDataContainer { private: std::vector rowFilter; //!< the vector of translations public: /** @brief constructor */ - matrixDataFilter() = default; + MatrixDataFilter() = default; - explicit matrixDataFilter(matrixData& input): matrixDataContainer(input) {} + explicit MatrixDataFilter(MatrixData& input): MatrixDataContainer(input) {} void assign(index_t row, index_t col, ValueT num) override { bool found = std::binary_search(rowFilter.begin(), rowFilter.end(), row); if (!found) { - matrixDataContainer::md->assign(row, col, num); + MatrixDataContainer::md->assign(row, col, num); } } diff --git a/src/utilities/matrixDataOrdered.hpp b/src/utilities/MatrixDataOrdered.hpp similarity index 85% rename from src/utilities/matrixDataOrdered.hpp rename to src/utilities/MatrixDataOrdered.hpp index 4e8cfe5ab..0a86868e5 100644 --- a/src/utilities/matrixDataOrdered.hpp +++ b/src/utilities/MatrixDataOrdered.hpp @@ -6,8 +6,8 @@ #pragma once -#include "matrixDataOrdering.hpp" -#include "utilities/matrixData.hpp" +#include "MatrixDataOrdering.hpp" +#include "utilities/MatrixData.hpp" #include #include @@ -15,7 +15,7 @@ *row also adding a function to get all the data in a particular row. */ template -class matrixDataOrdered: public matrixData { +class MatrixDataOrdered: public MatrixData { private: std::vector>> dVec; //!< vector of data vectors for each Row @@ -27,12 +27,12 @@ class matrixDataOrdered: public matrixData { count_t primary_max = 0; //!< the limit on the primary key public: /** @brief default constructor*/ - matrixDataOrdered() noexcept {} + MatrixDataOrdered() noexcept {} /** @brief constructor @param[in] RowCount the number of rows and columns in the matrix */ - explicit matrixDataOrdered(index_t RowCount): - matrixData(RowCount, RowCount), dVec(RowCount) + explicit MatrixDataOrdered(index_t RowCount): + MatrixData(RowCount, RowCount), dVec(RowCount) { } void clear() override @@ -45,7 +45,7 @@ class matrixDataOrdered: public matrixData { void assign(index_t row, index_t col, ValueT num) override { - auto key = keyOrder::order(row, col); + auto key = KeyOrder::order(row, col); auto iI = dVec[key.first].begin(); auto iEnd = dVec[key.first].end(); while (iI != iEnd) { @@ -68,7 +68,7 @@ class matrixDataOrdered: public matrixData { virtual void limitUpdate(index_t newRowLimit, index_t newColLimit) override { - primary_max = keyOrder::primary(newRowLimit, newColLimit); + primary_max = KeyOrder::primary(newRowLimit, newColLimit); dVec.resize(primary_max); } @@ -89,7 +89,7 @@ class matrixDataOrdered: public matrixData { } return sz; } - matrixElement element(index_t N) const override + MatrixElement element(index_t N) const override { index_t ii = 0; @@ -100,7 +100,7 @@ class matrixDataOrdered: public matrixData { ++ii; sz2 += dVec[ii].size(); } - auto res = keyOrder::order(ii, dVec[ii][N - sz1].first); + auto res = KeyOrder::order(ii, dVec[ii][N - sz1].first); return {res.first, res.second, dVec[ii][N - sz1].second}; } @@ -121,10 +121,10 @@ class matrixDataOrdered: public matrixData { } } - matrixElement next() override + MatrixElement next() override { - auto res = keyOrder::order(ci, cptr->first); - matrixElement tp{res.first, res.second, cptr->second}; + auto res = KeyOrder::order(ci, cptr->first); + MatrixElement tp{res.first, res.second, cptr->second}; ++cptr; if (cptr == iend) { ++ci; @@ -149,7 +149,7 @@ class matrixDataOrdered: public matrixData { bool moreData() override { return (ci < primary_max); } ValueT at(index_t rowN, index_t colN) const override { - auto key = keyOrder::order(rowN, colN); + auto key = KeyOrder::order(rowN, colN); for (auto& de : dVec[key.first]) { if (de.first == key.second) { return de.second; diff --git a/src/utilities/matrixDataOrdering.hpp b/src/utilities/MatrixDataOrdering.hpp similarity index 93% rename from src/utilities/matrixDataOrdering.hpp rename to src/utilities/MatrixDataOrdering.hpp index 191d04178..0c2abf08b 100644 --- a/src/utilities/matrixDataOrdering.hpp +++ b/src/utilities/MatrixDataOrdering.hpp @@ -18,7 +18,7 @@ enum class SparseOrdering { /** class to reorder row and column into primary and secondary indices */ template -class keyOrder { +class KeyOrder { public: static Y primary(Y rowIndex, Y /*colIndex*/) { return rowIndex; } static Y secondary(Y /*rowIndex*/, Y colIndex) { return colIndex; } @@ -26,7 +26,7 @@ class keyOrder { }; template -class keyOrder { +class KeyOrder { public: static Y primary(Y /*rowIndex*/, Y colIndex) { return colIndex; } static Y secondary(Y rowIndex, Y /*colIndex*/) { return rowIndex; } diff --git a/src/utilities/matrixDataScale.hpp b/src/utilities/MatrixDataScale.hpp similarity index 71% rename from src/utilities/matrixDataScale.hpp rename to src/utilities/MatrixDataScale.hpp index 8570749e3..d41f3c441 100644 --- a/src/utilities/matrixDataScale.hpp +++ b/src/utilities/MatrixDataScale.hpp @@ -6,27 +6,27 @@ #pragma once -#include "matrixDataContainer.hpp" +#include "MatrixDataContainer.hpp" /** @brief class implementation for a scaling array data - all data is multiplied by a factor before being sent to the underlying matrixData object + all data is multiplied by a factor before being sent to the underlying MatrixData object */ template -class matrixDataScale: public matrixDataContainer { +class MatrixDataScale: public MatrixDataContainer { private: ScaleT scalingFactor_; public: /** @brief constructor */ - matrixDataScale(matrixData& input, ScaleT scaleFactor): - matrixDataContainer(input), scalingFactor_(scaleFactor) + MatrixDataScale(MatrixData& input, ScaleT scaleFactor): + MatrixDataContainer(input), scalingFactor_(scaleFactor) { } void assign(index_t row, index_t col, ValueT num) override { - matrixDataContainer::md->assign(row, col, num * scalingFactor_); + MatrixDataContainer::md->assign(row, col, num * scalingFactor_); } /** @brief set the scale factor for the array @param[in] scaleFactor the input row to translate diff --git a/src/utilities/MatrixDataSparse.cpp b/src/utilities/MatrixDataSparse.cpp new file mode 100644 index 000000000..0ae1c67e8 --- /dev/null +++ b/src/utilities/MatrixDataSparse.cpp @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2014-2026, Lawrence Livermore National Security + * See the top-level NOTICE for additional details. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "MatrixDataSparse.hpp" + +#include "MatrixDataSparse_impl.hpp" +#include +#include + +template class MatrixDataSparse; +// template class MatrixDataSparse; +template class MatrixDataSparse; +// template class MatrixDataSparse>; +// template class MatrixDataSparse>; + +// template std::vector findMissing(MatrixDataSparse &md); +// template std::vector findMissing (MatrixDataSparse &md); +template std::vector findMissing(MatrixDataSparse& md); +// template std::vector +// findMissing>(MatrixDataSparse> &md); +// template std::vector +// findMissing>(MatrixDataSparse> &md); + +// template std::vector> +// findRank(MatrixDataSparse &md); +// template std::vector> findRank (MatrixDataSparse &md); +template std::vector> findRank(MatrixDataSparse& md); +// template std::vector> +// findRank>(MatrixDataSparse> &md); +// template std::vector> +// findRank>(MatrixDataSparse> &md); diff --git a/src/utilities/matrixDataSparse.hpp b/src/utilities/MatrixDataSparse.hpp similarity index 86% rename from src/utilities/matrixDataSparse.hpp rename to src/utilities/MatrixDataSparse.hpp index 2aa852b43..c39bc435a 100644 --- a/src/utilities/matrixDataSparse.hpp +++ b/src/utilities/MatrixDataSparse.hpp @@ -6,8 +6,8 @@ #pragma once -#include "matrixData.hpp" -#include "matrixDataOrdering.hpp" +#include "MatrixData.hpp" +#include "MatrixDataOrdering.hpp" #include #include #include @@ -20,12 +20,12 @@ /** @brief class implementing an expandable sparse matrix geared for Jacobian entries*/ template -class matrixDataSparse: public matrixData { +class MatrixDataSparse: public MatrixData { public: /** @brief constructor @param[in] startCount the number of elements to allocate space for initially */ - explicit matrixDataSparse(index_t startCount = 50) { data_.reserve(startCount); } + explicit MatrixDataSparse(index_t startCount = 50) { data_.reserve(startCount); } /** * function to clear the data */ @@ -50,13 +50,13 @@ class matrixDataSparse: public matrixData { */ void compact() override; - matrixElement element(index_t N) const override { return data_[N]; } + MatrixElement element(index_t N) const override { return data_[N]; } auto begin() const noexcept { return data_.cbegin(); } auto end() const noexcept { return data_.end(); } void start() override { cptr_ = data_.cbegin(); } - matrixElement next() override + MatrixElement next() override { - matrixElement tp = *cptr_; + MatrixElement tp = *cptr_; ++cptr_; return tp; } @@ -136,15 +136,15 @@ class matrixDataSparse: public matrixData { } } - using matrixData::copyTranslateRow; + using MatrixData::copyTranslateRow; /** @brief translate all the elements in a particular row in a2 and translate row origRow to newRow - @param[in] a2 the matrixDataSparse object to copy from + @param[in] a2 the MatrixDataSparse object to copy from @param[in] origRow the column to change @param[in] newRow the column to change origRow into */ - void copyTranslateRow(const matrixDataSparse& a2, index_t origRow, index_t newRow) + void copyTranslateRow(const MatrixDataSparse& a2, index_t origRow, index_t newRow) { for (const auto& res : a2.data_) { if (res.row == origRow) { @@ -155,11 +155,11 @@ class matrixDataSparse: public matrixData { /** @brief translate all the elements in a particular column in a2 and translate column origCol to newCol - @param[in] a2 the matrixDataSparse object to copy from + @param[in] a2 the MatrixDataSparse object to copy from @param[in] origCol the column to change @param[in] newCol the column to change origCol into */ - void copyTranslateCol(const matrixDataSparse& a2, index_t origCol, index_t newCol) + void copyTranslateCol(const MatrixDataSparse& a2, index_t origCol, index_t newCol) { for (const auto& res : a2.data_) { if (res.col == origCol) { @@ -175,12 +175,12 @@ class matrixDataSparse: public matrixData { summation of other states, this function allows the translation into a large sparse data object. - @param[in] a2 the matrixDataSparse object to copy from + @param[in] a2 the MatrixDataSparse object to copy from @param[in] origCol the column to change @param[in] newIndices a vector of indices to change @param[in] mult the scaler multiplier for each fo the new indices */ - void copyReplicate(const matrixDataSparse& a2, + void copyReplicate(const MatrixDataSparse& a2, index_t origCol, std::vector newIndices, std::vector mult); @@ -189,10 +189,10 @@ class matrixDataSparse: public matrixData { @param[in] rowTest the row index to remove*/ void filter(index_t rowTest = kNullLocation); - void cascade(matrixDataSparse& a2, index_t element); + void cascade(MatrixDataSparse& a2, index_t element); - using matrixData::merge; - void merge(matrixDataSparse& a2) + using MatrixData::merge; + void merge(MatrixDataSparse& a2) { data_.insert(data_.end(), a2.data_.begin(), a2.data_.end()); } @@ -217,13 +217,13 @@ class matrixDataSparse: public matrixData { private: count_t sortCount_ = 0; //!< count of the last sort operation /** @brief the vector of tuples containing the data */ - std::vector> data_; + std::vector> data_; decltype(data_.cbegin()) cptr_; //!< ptr to the beginning of the sequence }; template -std::vector findMissing(matrixDataSparse& md); +std::vector findMissing(MatrixDataSparse& md); template -std::vector> findRank(matrixDataSparse& md); +std::vector> findRank(MatrixDataSparse& md); diff --git a/src/utilities/matrixDataSparseSM.hpp b/src/utilities/MatrixDataSparseSM.hpp similarity index 89% rename from src/utilities/matrixDataSparseSM.hpp rename to src/utilities/MatrixDataSparseSM.hpp index 89e4401b4..53857d80b 100644 --- a/src/utilities/matrixDataSparseSM.hpp +++ b/src/utilities/MatrixDataSparseSM.hpp @@ -6,8 +6,8 @@ #pragma once -#include "matrixData.hpp" -#include "matrixDataOrdering.hpp" +#include "MatrixData.hpp" +#include "MatrixDataOrdering.hpp" #include #include #include @@ -18,7 +18,7 @@ /** @brief simple class for compute the keyIndex from a row and column and inverting it*/ template -class keyCompute { // default is row ordered +class KeyCompute { // default is row ordered public: static X keyGen(index_t rowIndex, index_t colIndex) { @@ -34,7 +34,7 @@ class keyCompute { // default is row ordered }; template -class keyCompute { +class KeyCompute { public: static X keyGen(index_t rowIndex, index_t colIndex) { @@ -51,7 +51,7 @@ class keyCompute { /** @brief simple class for compute the blockIndex from a row and column and inverting it*/ template -class blockCompute { +class BlockCompute { public: index_t blockIndexGen(index_t row, index_t col) const { @@ -85,7 +85,7 @@ class blockCompute { /** @brief simple class for compute the blockIndex from a row and column and inverting it*/ template -class blockCompute<1, M> { +class BlockCompute<1, M> { public: index_t blockIndexGen(index_t row, index_t col) const { @@ -113,7 +113,7 @@ template -class matrixDataSparseSMB: public matrixData { +class MatrixDataSparseSMB: public MatrixData { static_assert(std::is_integral::value, "class X must be of integral type"); static_assert(std::is_unsigned::value, "class X must be of an unsigned type"); using pLoc = std::pair; @@ -149,11 +149,11 @@ class matrixDataSparseSMB: public matrixData { return bucketCount; } - keyCompute + KeyCompute key_computer; //!< object that generators the keys and extracts row and column information std::array, bucketCount> dVec; //!< the vector of pairs containing the data count_t sortCount = 0; //!< count of the last sort operation - blockCompute block_computer; //!< object that generates the appropriate block index; + BlockCompute block_computer; //!< object that generates the appropriate block index; cIterator cptr; //!< ptr to the beginning of the sequence; cIterator iend; //!< ptr to the end of the current sequence; count_t ci = 0; //!< indicator of which vector of the array we are sequencing on; @@ -162,7 +162,7 @@ class matrixDataSparseSMB: public matrixData { the actual storage space used is approx 2x startCount due to expected unevenness in the array @param[in] startCount the number of elements to reserve */ - explicit matrixDataSparseSMB(index_t startCount = 1000) + explicit MatrixDataSparseSMB(index_t startCount = 1000) { for (auto& dvk : dVec) { dvk.reserve(startCount >> (K - 1)); @@ -254,7 +254,7 @@ class matrixDataSparseSMB: public matrixData { sortCount = size(); } - matrixElement element(index_t N) const override + MatrixElement element(index_t N) const override { count_t ii = 0; index_t sz1 = 0; @@ -270,8 +270,8 @@ class matrixDataSparseSMB: public matrixData { dVec[ii][N - sz1].second}; } - auto begin() const { return matrixIteratorSM(this, 0); } - auto end() const { return matrixIteratorSM(this, size()); } + auto begin() const { return MatrixIteratorSM(this, 0); } + auto end() const { return MatrixIteratorSM(this, size()); } void start() override { ci = findNextNonEmptyBucket(0); @@ -284,12 +284,12 @@ class matrixDataSparseSMB: public matrixData { } } - matrixElement next() override + MatrixElement next() override { if (ci >= bucketCount) { return {}; } - matrixElement tp{key_computer.row(cptr->first), + MatrixElement tp{key_computer.row(cptr->first), key_computer.col(cptr->first), cptr->second}; ++cptr; @@ -337,10 +337,10 @@ class matrixDataSparseSMB: public matrixData { } protected: - class matrixIteratorSM { + class MatrixIteratorSM { public: - explicit matrixIteratorSM(const matrixDataSparseSMB* matrixData, - index_t start = 0): mDS(matrixData) + explicit MatrixIteratorSM(const MatrixDataSparseSMB* MatrixData, + index_t start = 0): mDS(MatrixData) { if (start == 0) { ci = mDS->findNextNonEmptyBucket(0); @@ -362,7 +362,7 @@ class matrixDataSparseSMB: public matrixData { } } - matrixIteratorSM& operator++() + MatrixIteratorSM& operator++() { ++cptr; if (cptr == iend) { @@ -375,7 +375,7 @@ class matrixDataSparseSMB: public matrixData { return *this; } - matrixElement operator*() const + MatrixElement operator*() const { return {mDS->key_computer.row(cptr->first), mDS->key_computer.col(cptr->first), @@ -383,7 +383,7 @@ class matrixDataSparseSMB: public matrixData { } private: - const matrixDataSparseSMB* mDS = nullptr; + const MatrixDataSparseSMB* mDS = nullptr; cIterator cptr; //!< ptr to the beginning of the sequence; cIterator iend; //!< ptr to the end of the current sequence; count_t ci = 0; //!< indicator of which vector of the array we are sequencing on; @@ -396,7 +396,7 @@ necessary the vector contains a single 32 bit unsigned number composed by using the sorting faster when done */ template -class matrixDataSparseSMB<0, X, ValueT, M>: public matrixData { +class MatrixDataSparseSMB<0, X, ValueT, M>: public MatrixData { static_assert(std::is_integral::value, "class X must be of integral type"); static_assert(std::is_unsigned::value, "class X must be of an unsigned type"); @@ -406,7 +406,7 @@ class matrixDataSparseSMB<0, X, ValueT, M>: public matrixData { count_t sortCount = 0; //!< count of the last sort operation std::vector dVec; //!< the vector of pairs containing the data cIterator cptr; //!< ptr to the beginning of the sequence; - keyCompute + KeyCompute key_computer; //!< object that generators the keys and extracts row and column information public: @@ -414,7 +414,7 @@ class matrixDataSparseSMB<0, X, ValueT, M>: public matrixData { the actual storage space used is approx 2x startCount due to expected unevenness in the array @param[in] startCount the number of elements to reserve */ - explicit matrixDataSparseSMB(index_t startCount = 1000) { dVec.reserve(startCount); } + explicit MatrixDataSparseSMB(index_t startCount = 1000) { dVec.reserve(startCount); } void clear() override { dVec.clear(); } void assign(index_t row, index_t col, ValueT num) override { @@ -466,17 +466,17 @@ class matrixDataSparseSMB<0, X, ValueT, M>: public matrixData { sortCount = size(); } - matrixElement element(index_t N) const override + MatrixElement element(index_t N) const override { return {key_computer.row(dVec[N].first), key_computer.col(dVec[N].first), dVec[N].second}; } - auto begin() const { return matrixIteratorSM(this, 0); } - auto end() const { return matrixIteratorSM(this, size()); } + auto begin() const { return MatrixIteratorSM(this, 0); } + auto end() const { return MatrixIteratorSM(this, size()); } void start() override { cptr = dVec.cbegin(); } - matrixElement next() override + MatrixElement next() override { - matrixElement tp{key_computer.row(cptr->first), + MatrixElement tp{key_computer.row(cptr->first), key_computer.col(cptr->first), cptr->second}; ++cptr; @@ -511,10 +511,10 @@ class matrixDataSparseSMB<0, X, ValueT, M>: public matrixData { } return ValueT(0); } - class matrixIteratorSM { + class MatrixIteratorSM { public: - explicit matrixIteratorSM(const matrixDataSparseSMB<0, X, ValueT, M>* matrixData, - index_t start = 0): mDS(matrixData) + explicit MatrixIteratorSM(const MatrixDataSparseSMB<0, X, ValueT, M>* MatrixData, + index_t start = 0): mDS(MatrixData) { if (start == 0) { cptr = mDS->dVec.cbegin(); @@ -525,8 +525,8 @@ class matrixDataSparseSMB<0, X, ValueT, M>: public matrixData { } } - matrixIteratorSM& operator++() { ++cptr; } - virtual matrixElement operator*() const override + MatrixIteratorSM& operator++() { ++cptr; } + virtual MatrixElement operator*() const override { return {mDS->key_computer.row(cptr->first), mDS->key_computer.col(cptr->first), @@ -534,7 +534,7 @@ class matrixDataSparseSMB<0, X, ValueT, M>: public matrixData { } private: - const matrixDataSparseSMB<0, X, ValueT, M>* mDS = nullptr; + const MatrixDataSparseSMB<0, X, ValueT, M>* mDS = nullptr; cIterator cptr; //!< ptr to the beginning of the sequence; }; }; @@ -547,7 +547,7 @@ parameter K indicates that the structure should use 2^K vectors for data storage is approximately 2x that used in the single column structure */ template -class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { +class MatrixDataSparseSMB<1, X, ValueT, M>: public MatrixData { static_assert(std::is_integral::value, "class X must be of integral type"); static_assert(std::is_unsigned::value, "class X must be of an unsigned type"); using pLoc = std::pair; @@ -561,16 +561,16 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { cIterator cptr; //!< iterator to the beginning of the sequence; cIterator iend; //!< iterator to the end of the current sequence; - keyCompute + KeyCompute key_computer; //!< object that generators the keys and extracts row and column information - blockCompute<1, M> block_computer; //!< object that generators the appropriate block to use + BlockCompute<1, M> block_computer; //!< object that generators the appropriate block to use public: /** @brief constructor the actual storage space used is approx 2x startCount due to expected unevenness in the array @param[in] startCount the number of elements to reserve */ - explicit matrixDataSparseSMB(index_t startCount = 1000) + explicit MatrixDataSparseSMB(index_t startCount = 1000) { dVec[0].reserve(startCount); dVec[1].reserve(startCount); @@ -645,9 +645,9 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { sortCount = size(); } - virtual matrixElement element(index_t N) const override + virtual MatrixElement element(index_t N) const override { - matrixElement ret; + MatrixElement ret; auto dvs = static_cast(dVec[0].size()); ret.row = static_cast( key_computer.row((N >= dvs) ? dVec[1][N - dvs].first : dVec[0][N].first)); @@ -657,8 +657,8 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { return ret; } - auto begin() const { return matrixIteratorSM(this, 0); } - auto end() const { return matrixIteratorSM(this, size()); } + auto begin() const { return MatrixIteratorSM(this, 0); } + auto end() const { return MatrixIteratorSM(this, size()); } void start() override { cptr = dVec[0].cbegin(); @@ -666,9 +666,9 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { ci = 0; } - matrixElement next() override + MatrixElement next() override { - matrixElement tp{key_computer.row(cptr->first), + MatrixElement tp{key_computer.row(cptr->first), key_computer.col(cptr->first), cptr->second}; ++cptr; @@ -713,10 +713,10 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { } protected: - class matrixIteratorSM { + class MatrixIteratorSM { public: - explicit matrixIteratorSM(const matrixDataSparseSMB<1, X, ValueT, M>* matrixData, - index_t start = 0): mDS(matrixData) + explicit MatrixIteratorSM(const MatrixDataSparseSMB<1, X, ValueT, M>* MatrixData, + index_t start = 0): mDS(MatrixData) { if (start == 0) { ci = 0; @@ -730,7 +730,7 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { } } - matrixIteratorSM& operator++() + MatrixIteratorSM& operator++() { ++cptr; if (cptr == iend) { @@ -743,7 +743,7 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { return &this; } - virtual matrixElement operator*() const override + virtual MatrixElement operator*() const override { return {mDS->key_computer.row(cptr->first), mDS->key_computer.col(cptr->first), @@ -751,7 +751,7 @@ class matrixDataSparseSMB<1, X, ValueT, M>: public matrixData { } private: - const matrixDataSparseSMB<1, X, ValueT, M>* mDS = nullptr; + const MatrixDataSparseSMB<1, X, ValueT, M>* mDS = nullptr; cIterator cptr; //!< ptr to the beginning of the sequence; cIterator iend; //!< ptr to the end of the current sequence; int ci = 0; //!< indicator of which vector of the array we are sequencing on; diff --git a/src/utilities/matrixDataSparse_impl.hpp b/src/utilities/MatrixDataSparse_impl.hpp similarity index 89% rename from src/utilities/matrixDataSparse_impl.hpp rename to src/utilities/MatrixDataSparse_impl.hpp index cef5164e4..2694ae78b 100644 --- a/src/utilities/matrixDataSparse_impl.hpp +++ b/src/utilities/MatrixDataSparse_impl.hpp @@ -6,17 +6,17 @@ #pragma once -#include "matrixDataSparse.hpp" +#include "MatrixDataSparse.hpp" #include #include template -void matrixDataSparse::assign(index_t row, index_t col, ValueT num) +void MatrixDataSparse::assign(index_t row, index_t col, ValueT num) { assert(row != kNullLocation); assert(col != kNullLocation); - assert(row < matrixData::rowLimit()); - assert(col < matrixData::colLimit()); + assert(row < MatrixData::rowLimit()); + assert(col < MatrixData::colLimit()); // assert (std::isfinite (num)); assert(static_cast(row) >= 0); assert(static_cast(col) >= 0); @@ -26,7 +26,7 @@ void matrixDataSparse::assign(index_t row, index_t col, ValueT num) } template -void matrixDataSparse::sortIndex(SparseOrdering ordering) +void MatrixDataSparse::sortIndex(SparseOrdering ordering) { switch (ordering) { case SparseOrdering::COLUMN_ORDERED: @@ -40,7 +40,7 @@ void matrixDataSparse::sortIndex(SparseOrdering ordering) } template -void matrixDataSparse::compact() +void MatrixDataSparse::compact() { if (data_.empty()) { return; @@ -72,7 +72,7 @@ void matrixDataSparse::compact() } template -std::vector matrixDataSparse::columnCount() +std::vector MatrixDataSparse::columnCount() { if (!isSorted()) { sortIndex(SparseOrdering::COLUMN_ORDERED); @@ -95,12 +95,12 @@ std::vector matrixDataSparse::columnCount() } template -ValueT matrixDataSparse::at(index_t rowN, index_t colN) const +ValueT MatrixDataSparse::at(index_t rowN, index_t colN) const { if (isSorted()) { auto res = std::lower_bound(data_.begin(), data_.end(), - matrixElement{rowN, colN, ValueT{0}}, + MatrixElement{rowN, colN, ValueT{0}}, compareCol); if (res == data_.end()) { return ValueT{0}; @@ -119,7 +119,7 @@ ValueT matrixDataSparse::at(index_t rowN, index_t colN) const } template -void matrixDataSparse::scale(ValueT factor, index_t startIndex, count_t count) +void MatrixDataSparse::scale(ValueT factor, index_t startIndex, count_t count) { if (startIndex >= static_cast(data_.size())) { return; @@ -136,7 +136,7 @@ void matrixDataSparse::scale(ValueT factor, index_t startIndex, count_t } template -void matrixDataSparse::copyReplicate(const matrixDataSparse& a2, +void MatrixDataSparse::copyReplicate(const MatrixDataSparse& a2, index_t origCol, std::vector newIndices, std::vector mult) @@ -153,14 +153,14 @@ void matrixDataSparse::copyReplicate(const matrixDataSparse& a2, } template -void matrixDataSparse::filter(index_t rowTest) +void MatrixDataSparse::filter(index_t rowTest) { auto rem = std::remove_if(data_.begin(), data_.end(), [rowTest, - clim = matrixData::colLimit(), - rlim = matrixData::rowLimit()](const matrixElement& el) { + clim = MatrixData::colLimit(), + rlim = MatrixData::rowLimit()](const MatrixElement& el) { return ((el.row == rowTest) || (el.row >= rlim) || (el.col >= clim)); }); @@ -168,7 +168,7 @@ void matrixDataSparse::filter(index_t rowTest) } template -void matrixDataSparse::cascade(matrixDataSparse& a2, index_t elementIndex) +void MatrixDataSparse::cascade(MatrixDataSparse& a2, index_t elementIndex) { auto term = data_.size(); size_t nn = 0; @@ -201,7 +201,7 @@ void matrixDataSparse::cascade(matrixDataSparse& a2, index_t ele } template -std::vector matrixDataSparse::vectorMult(std::vector V) +std::vector MatrixDataSparse::vectorMult(std::vector V) { sortIndex(SparseOrdering::ROW_ORDERED); auto maxRow = data_.back().row; @@ -218,7 +218,7 @@ std::vector matrixDataSparse::vectorMult(std::vector V) } template -std::vector findMissing(matrixDataSparse& md) +std::vector findMissing(MatrixDataSparse& md) { std::vector missing; md.compact(); @@ -251,7 +251,7 @@ std::vector findMissing(matrixDataSparse& md) } template -std::vector> findRank(matrixDataSparse& md) +std::vector> findRank(MatrixDataSparse& md) { std::vector vr, vt; std::vector vq, vtq; diff --git a/src/utilities/matrixDataTranslate.hpp b/src/utilities/MatrixDataTranslate.hpp similarity index 70% rename from src/utilities/matrixDataTranslate.hpp rename to src/utilities/MatrixDataTranslate.hpp index cbab77d22..fac0219ea 100644 --- a/src/utilities/matrixDataTranslate.hpp +++ b/src/utilities/MatrixDataTranslate.hpp @@ -6,35 +6,35 @@ #pragma once -#include "matrixDataContainer.hpp" +#include "MatrixDataContainer.hpp" #include -/** @brief class implementation translation for another matrixData object - most functions are just simple forwarding to the underlying matrixData object -except the assign and at operator which basically means the matrixData can interact with a small -subset of a bigger matrixData object though rowIndex, colIndex, and val will still return the +/** @brief class implementation translation for another MatrixData object + most functions are just simple forwarding to the underlying MatrixData object +except the assign and at operator which basically means the MatrixData can interact with a small +subset of a bigger MatrixData object though rowIndex, colIndex, and val will still return the original values. The intent of this class is not to replace the interactions with another it is to act as a filter in cases where elements need to be added but the row needs a translation, using it outside that purpose could lead to issues */ template -class matrixDataTranslate: public matrixDataContainer { +class MatrixDataTranslate: public MatrixDataContainer { private: std::array Trow; //!< the vector of translations public: /** @brief constructor */ - matrixDataTranslate() { Trow.fill(kNullLocation); } - explicit matrixDataTranslate(matrixData& input): matrixDataContainer(input) + MatrixDataTranslate() { Trow.fill(kNullLocation); } + explicit MatrixDataTranslate(MatrixData& input): MatrixDataContainer(input) { Trow.fill(kNullLocation); } inline bool isValidRow(index_t row) const { #ifdef UNSIGNED_INDEXING - return ((row < CT) && (Trow[row] < matrixData::rowLimit())); + return ((row < CT) && (Trow[row] < MatrixData::rowLimit())); #else - return ((row < CT) && (row >= 0) && (Trow[row] < matrixData::rowLimit())); + return ((row < CT) && (row >= 0) && (Trow[row] < MatrixData::rowLimit())); #endif } void assign(index_t row, index_t col, ValueT num) override @@ -43,14 +43,14 @@ class matrixDataTranslate: public matrixDataContainer { // and we do automatic checking of the translation and if it isn't valid don't do the // assignment if (isValidRow(row)) { - matrixDataContainer::md->assign(Trow[row], col, num); + MatrixDataContainer::md->assign(Trow[row], col, num); } }; ValueT at(index_t rowN, index_t colN) const override { if (isValidRow(rowN)) { - return matrixDataContainer::md->at(Trow[rowN], colN); + return MatrixDataContainer::md->at(Trow[rowN], colN); } return ValueT(0); }; diff --git a/src/utilities/saturation.cpp b/src/utilities/Saturation.cpp similarity index 87% rename from src/utilities/saturation.cpp rename to src/utilities/Saturation.cpp index e7c3e3c17..7e1fc816c 100644 --- a/src/utilities/saturation.cpp +++ b/src/utilities/Saturation.cpp @@ -3,27 +3,26 @@ * See the top-level NOTICE for additional details. All rights reserved. * SPDX-License-Identifier: BSD-3-Clause */ -#include "saturation.h" +#include "Saturation.h" #include #include -// NOLINTBEGIN namespace utilities { -saturation::saturation(SaturationType sT): type(sT) +Saturation::Saturation(SaturationType sT): type(sT) { loadFunctions(); computeParam(); } -saturation::saturation(const std::string& satType): type(SaturationType::NONE) +Saturation::Saturation(const std::string& satType): type(SaturationType::NONE) { setType(satType); loadFunctions(); computeParam(); } -void saturation::setType(const std::string& stype) +void Saturation::setType(const std::string& stype) { if (stype == "none") { type = SaturationType::NONE; @@ -40,14 +39,14 @@ void saturation::setType(const std::string& stype) computeParam(); } -void saturation::setParam(double S1, double S2) +void Saturation::setParam(double S1, double S2) { s10 = S1; s12 = S2; computeParam(); } -void saturation::setParam(double V1, double S1, double V2, double S2) +void Saturation::setParam(double V1, double S1, double V2, double S2) { switch (type) { case SaturationType::QUADRATIC: { @@ -78,30 +77,30 @@ void saturation::setParam(double V1, double S1, double V2, double S2) s12 = compute(1.2); } -void saturation::setType(SaturationType sT) +void Saturation::setType(SaturationType sT) { type = sT; loadFunctions(); computeParam(); } -saturation::SaturationType saturation::getType() const +Saturation::SaturationType Saturation::getType() const { return type; } -double saturation::operator()(double val) const +double Saturation::operator()(double val) const { return satFunc(val); } -double saturation::compute(double val) const +double Saturation::compute(double val) const { return satFunc(val); } -double saturation::deriv(double val) const +double Saturation::deriv(double val) const { return derivFunc(val); } -double saturation::inv(double val) const +double Saturation::inv(double val) const { if (val < 0.00001) { return 0.5; @@ -129,7 +128,7 @@ double saturation::inv(double val) const return ret; } -void saturation::computeParam() +void Saturation::computeParam() { switch (type) { case SaturationType::QUADRATIC: { @@ -160,7 +159,7 @@ void saturation::computeParam() } } -void saturation::loadFunctions() +void Saturation::loadFunctions() { switch (type) { case SaturationType::QUADRATIC: @@ -191,4 +190,3 @@ void saturation::loadFunctions() } } // namespace utilities -// NOLINTEND diff --git a/src/utilities/saturation.h b/src/utilities/Saturation.h similarity index 96% rename from src/utilities/saturation.h rename to src/utilities/Saturation.h index 91ce78ce1..ada388368 100644 --- a/src/utilities/saturation.h +++ b/src/utilities/Saturation.h @@ -13,7 +13,7 @@ namespace utilities { *@details 4 mathematical models are available including: quadratic, scaled_quadratic, exponential, *and linear */ -class saturation { +class Saturation { public: /** @brief enumeration of saturation types */ @@ -33,10 +33,10 @@ class saturation { * @details constructor is converting type * @param[in] sT saturation Type */ - explicit saturation(SaturationType sT = SaturationType::SCALED_QUADRATIC); + explicit Saturation(SaturationType sT = SaturationType::SCALED_QUADRATIC); /** construct from string naming saturation type *@param[in] satType a string containing the type of the saturation*/ - explicit saturation(const std::string& satType); + explicit Saturation(const std::string& satType); /** set the S10 and S12 parameter *@details sets the parameters of the saturation function previously specified at the point 1.0 *and 1.2 The values input should correspond to the reduction in values so 0.0 for no saturation diff --git a/src/utilities/ThreePhaseFunctions.h b/src/utilities/ThreePhaseFunctions.h index 02d99ffad..a2eba46b5 100644 --- a/src/utilities/ThreePhaseFunctions.h +++ b/src/utilities/ThreePhaseFunctions.h @@ -7,7 +7,7 @@ #pragma once /** @file - * @brief define some operations related to matrixData objects + * @brief define some operations related to MatrixData objects */ #include #include diff --git a/src/utilities/functionInterpreter.cpp b/src/utilities/functionInterpreter.cpp index 213c490d3..b413bb571 100644 --- a/src/utilities/functionInterpreter.cpp +++ b/src/utilities/functionInterpreter.cpp @@ -13,10 +13,10 @@ #include "functionInterpreter.h" +#include "GridRandom.h" #include "gmlc/containers/mapOps.hpp" #include "gmlc/utilities/stringOps.h" #include "gmlc/utilities/vectorOps.hpp" -#include "gridRandom.h" #include "griddyn/griddyn-config.h" #include #include @@ -41,7 +41,7 @@ using gmlc::utilities::mult_sum; using gmlc::utilities::product; using gmlc::utilities::stdev; using gmlc::utilities::sum; -using utilities::gridRandom; +using utilities::GridRandom; namespace { template @@ -164,19 +164,19 @@ double piValue() } double randUniform() { - return gridRandom::randNumber(gridRandom::DistributionType::UNIFORM); + return GridRandom::randNumber(GridRandom::DistributionType::UNIFORM); } double randNormal() { - return gridRandom::randNumber(gridRandom::DistributionType::NORMAL); + return GridRandom::randNumber(GridRandom::DistributionType::NORMAL); } double randExponential() { - return gridRandom::randNumber(gridRandom::DistributionType::EXPONENTIAL); + return GridRandom::randNumber(GridRandom::DistributionType::EXPONENTIAL); } double randLognormal() { - return gridRandom::randNumber(gridRandom::DistributionType::LOGNORMAL); + return GridRandom::randNumber(GridRandom::DistributionType::LOGNORMAL); } double signValue(double val) @@ -200,7 +200,7 @@ double decimalValue(double val) } double randExpSingle(double val) { - return gridRandom::randNumber(gridRandom::DistributionType::EXPONENTIAL, val, val); + return GridRandom::randNumber(GridRandom::DistributionType::EXPONENTIAL, val, val); } double pow10Value(double val) @@ -324,31 +324,31 @@ double median3(double val1, double val2, double val3) double randUniformRange(double val1, double val2) { - return gridRandom::randNumber(gridRandom::DistributionType::UNIFORM, val1, val2); + return GridRandom::randNumber(GridRandom::DistributionType::UNIFORM, val1, val2); } double randNormalRange(double val1, double val2) { - return gridRandom::randNumber(gridRandom::DistributionType::NORMAL, val1, val2); + return GridRandom::randNumber(GridRandom::DistributionType::NORMAL, val1, val2); } double randExponentialRange(double val1, double val2) { - return gridRandom::randNumber(gridRandom::DistributionType::EXPONENTIAL, val1, val2); + return GridRandom::randNumber(GridRandom::DistributionType::EXPONENTIAL, val1, val2); } double randLognormalRange(double val1, double val2) { - return gridRandom::randNumber(gridRandom::DistributionType::LOGNORMAL, val1, val2); + return GridRandom::randNumber(GridRandom::DistributionType::LOGNORMAL, val1, val2); } double randIntegerRange(double val1, double val2) { - return gridRandom::randNumber(gridRandom::DistributionType::UNIFORM_INT, val1, val2); + return GridRandom::randNumber(GridRandom::DistributionType::UNIFORM_INT, val1, val2); } double randExtremeValueRange(double val1, double val2) { - return gridRandom::randNumber(gridRandom::DistributionType::EXTREME_VALUE, val1, val2); + return GridRandom::randNumber(GridRandom::DistributionType::EXTREME_VALUE, val1, val2); } double randGammaRange(double val1, double val2) { - return gridRandom::randNumber(gridRandom::DistributionType::GAMMA, val1, val2); + return GridRandom::randNumber(GridRandom::DistributionType::GAMMA, val1, val2); } double addValue(double val1, double val2) { diff --git a/src/utilities/matrixCreation.cpp b/src/utilities/matrixCreation.cpp index f069518b7..a118cc6b3 100644 --- a/src/utilities/matrixCreation.cpp +++ b/src/utilities/matrixCreation.cpp @@ -6,22 +6,22 @@ #include "matrixCreation.h" -#include "matrixDataSparseSM.hpp" +#include "MatrixDataSparseSM.hpp" #include -std::unique_ptr> makeSparseMatrix(count_t size, count_t maxElements) +std::unique_ptr> makeSparseMatrix(count_t size, count_t maxElements) { if (size < 65535) { if (size < 100) { - return std::make_unique>(maxElements); + return std::make_unique>(maxElements); } if (size < 1000) { - return std::make_unique>(maxElements); + return std::make_unique>(maxElements); } if (size < 20000) { - return std::make_unique>(maxElements); + return std::make_unique>(maxElements); } - return std::make_unique>(maxElements); + return std::make_unique>(maxElements); } - return std::make_unique>(maxElements); + return std::make_unique>(maxElements); } diff --git a/src/utilities/matrixCreation.h b/src/utilities/matrixCreation.h index 220b67b11..5000109ed 100644 --- a/src/utilities/matrixCreation.h +++ b/src/utilities/matrixCreation.h @@ -6,7 +6,7 @@ #pragma once -#include "matrixData.hpp" +#include "MatrixData.hpp" #include -std::unique_ptr> makeSparseMatrix(count_t size, count_t maxElements); +std::unique_ptr> makeSparseMatrix(count_t size, count_t maxElements); diff --git a/src/utilities/matrixDataSparse.cpp b/src/utilities/matrixDataSparse.cpp deleted file mode 100644 index a13d95a73..000000000 --- a/src/utilities/matrixDataSparse.cpp +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2014-2026, Lawrence Livermore National Security - * See the top-level NOTICE for additional details. All rights reserved. - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "matrixDataSparse.hpp" - -#include "matrixDataSparse_impl.hpp" -#include -#include - -template class matrixDataSparse; -// template class matrixDataSparse; -template class matrixDataSparse; -// template class matrixDataSparse>; -// template class matrixDataSparse>; - -// template std::vector findMissing(matrixDataSparse &md); -// template std::vector findMissing (matrixDataSparse &md); -template std::vector findMissing(matrixDataSparse& md); -// template std::vector -// findMissing>(matrixDataSparse> &md); -// template std::vector -// findMissing>(matrixDataSparse> &md); - -// template std::vector> -// findRank(matrixDataSparse &md); -// template std::vector> findRank (matrixDataSparse &md); -template std::vector> findRank(matrixDataSparse& md); -// template std::vector> -// findRank>(matrixDataSparse> &md); -// template std::vector> -// findRank>(matrixDataSparse> &md); diff --git a/src/utilities/matrixOps.cpp b/src/utilities/matrixOps.cpp index 05d7c9497..dce0facdc 100644 --- a/src/utilities/matrixOps.cpp +++ b/src/utilities/matrixOps.cpp @@ -9,14 +9,14 @@ #include #include -std::vector matrixDataMultiply(matrixData& md, const double vec[]) +std::vector matrixDataMultiply(MatrixData& md, const double vec[]) { std::vector res(md.rowLimit()); matrixDataMultiply(md, vec, res.data()); return res; } -void matrixDataMultiply(matrixData& md, const double vec[], double res[]) +void matrixDataMultiply(MatrixData& md, const double vec[], double res[]) { memset(res, 0, sizeof(double) * md.rowLimit()); auto sz = md.size(); diff --git a/src/utilities/matrixOps.h b/src/utilities/matrixOps.h index 7c67a5efa..42f00ff00 100644 --- a/src/utilities/matrixOps.h +++ b/src/utilities/matrixOps.h @@ -7,9 +7,9 @@ #pragma once /** @file - * @brief define some operations related to matrixData objects + * @brief define some operations related to MatrixData objects */ -#include "matrixData.hpp" +#include "MatrixData.hpp" #include /** multiply a matrix data object by a vector @details assumes vec has the appropriate size otherwise undefined behavior will occur @@ -17,7 +17,7 @@ @param[in] vec the vector data to multiply at least size N @param[out] res the location to store the results, with length M */ -void matrixDataMultiply(matrixData& md, const double vec[], double res[]); +void matrixDataMultiply(MatrixData& md, const double vec[], double res[]); /** multiply a matrix data object by a vector @details assumes vec has the appropriate size otherwise undefined behavior will occur @@ -25,4 +25,4 @@ void matrixDataMultiply(matrixData& md, const double vec[], double res[] @param[in] vec the vector data to multiply at least size N @return a vector with the results the vector will be of length M */ -std::vector matrixDataMultiply(matrixData& md, const double vec[]); +std::vector matrixDataMultiply(MatrixData& md, const double vec[]); diff --git a/test/componentTests/testEvents.cpp b/test/componentTests/testEvents.cpp index 6bd1e56fa..128347567 100644 --- a/test/componentTests/testEvents.cpp +++ b/test/componentTests/testEvents.cpp @@ -30,8 +30,8 @@ TEST_F(EventTests, EventTestLoadstring) EXPECT_EQ(gdEI.fieldList[0], "param"); EXPECT_EQ(gdEI.value[0], 13); EXPECT_EQ(gdEI.units[0], units::MW); - EXPECT_EQ(gdEI.time[0], griddyn::coreTime(2)); - EXPECT_EQ(gdEI.period, griddyn::coreTime(3)); + EXPECT_EQ(gdEI.time[0], griddyn::CoreTime(2)); + EXPECT_EQ(gdEI.period, griddyn::CoreTime(3)); } TEST_F(EventTests, EventTest1) {} diff --git a/test/componentTests/testLoads.cpp b/test/componentTests/testLoads.cpp index 8afdfb2e3..bb2bb40fb 100644 --- a/test/componentTests/testLoads.cpp +++ b/test/componentTests/testLoads.cpp @@ -213,8 +213,8 @@ TEST_F(LoadTests, RandomLoadTest) auto src = ld1->find("p"); ASSERT_NE(src, nullptr); auto otime = src->getNextUpdateTime(); - EXPECT_GE(otime, coreTime(8.0)); - EXPECT_LE(otime, coreTime(11.0)); + EXPECT_GE(otime, CoreTime(8.0)); + EXPECT_LE(otime, CoreTime(11.0)); ld1->timestep(otime - 0.2, noInputs, cLocalSolverMode); val = ld1->getRealPower(1.1); EXPECT_NEAR(val, 0.8, 1e-6); diff --git a/test/extraTests/objectSizeReport.cpp b/test/extraTests/objectSizeReport.cpp index 78f105477..8d1664ca2 100644 --- a/test/extraTests/objectSizeReport.cpp +++ b/test/extraTests/objectSizeReport.cpp @@ -27,7 +27,7 @@ TEST(ExtraSizeReportTests, ObjectSizeReport) std::cout << "solverOffset size=" << sizeof(SolverOffsets) << '\n'; std::cout << "offsetTableSize=" << sizeof(OffsetTable) << '\n'; std::cout << "solverModeSize=" << sizeof(SolverMode) << '\n'; - std::cout << "coreTime size = " << sizeof(coreTime) << '\n'; + std::cout << "CoreTime size = " << sizeof(CoreTime) << '\n'; auto coreSize = sizeof(CoreObject); std::cout << "core object size=" << coreSize << '\n'; @@ -38,8 +38,8 @@ TEST(ExtraSizeReportTests, ObjectSizeReport) auto primSize = sizeof(GridPrimary); std::cout << "GridPrimary size=" << primSize << " adds " << primSize - compSize << '\n'; - auto secSize = sizeof(gridSecondary); - std::cout << "gridSecondary size=" << secSize << " adds " << secSize - compSize << '\n'; + auto secSize = sizeof(GridSecondary); + std::cout << "GridSecondary size=" << secSize << " adds " << secSize - compSize << '\n'; std::cout << "bus size=" << sizeof(GridBus) << " adds " << sizeof(GridBus) - primSize << '\n'; std::cout << "acbus size=" << sizeof(AcBus) << " adds " << sizeof(AcBus) - sizeof(GridBus) diff --git a/test/libraryTests/testCore.cpp b/test/libraryTests/testCore.cpp index 592288ae6..03472ad86 100644 --- a/test/libraryTests/testCore.cpp +++ b/test/libraryTests/testCore.cpp @@ -167,17 +167,17 @@ TEST(CoreTests, ObjectFactory) TEST(CoreTests, GridDynTime) { - coreTime rt(34.123141512); + CoreTime rt(34.123141512); auto dval = static_cast(rt); EXPECT_NEAR(dval, 34.123141512, 34.123141512 * 1e-9); - coreTime rt2(-2.3); + CoreTime rt2(-2.3); auto dval2 = static_cast(rt2); EXPECT_NEAR(dval2, -2.3, 2.3e-9); - coreTime rt3(-1.0); + CoreTime rt3(-1.0); auto dval3 = static_cast(rt3); EXPECT_NEAR(dval3, -1.0, 1e-9); diff --git a/test/libraryTests/testMatrixData.cpp b/test/libraryTests/testMatrixData.cpp index 4a1797576..c9535b463 100644 --- a/test/libraryTests/testMatrixData.cpp +++ b/test/libraryTests/testMatrixData.cpp @@ -12,8 +12,8 @@ #include "../gtestHelper.h" #include "griddyn/gridDynDefinitions.hpp" -#include "utilities/matrixDataSparse.hpp" -#include "utilities/matrixDataSparseSM.hpp" +#include "utilities/MatrixDataSparse.hpp" +#include "utilities/MatrixDataSparseSM.hpp" #include "utilities/matrixOps.h" #include #include @@ -23,7 +23,7 @@ // NOLINTNEXTLINE(readability-function-cognitive-complexity) TEST(MatrixDataTests, BlockCompute) { - blockCompute<2, SparseOrdering::COLUMN_ORDERED> bc1; + BlockCompute<2, SparseOrdering::COLUMN_ORDERED> bc1; bc1.setMaxIndex(0, 20); std::vector colcnt(6, 0); for (index_t pp = 0; pp < 20; ++pp) { @@ -34,7 +34,7 @@ TEST(MatrixDataTests, BlockCompute) EXPECT_EQ(colcnt[2], 8); EXPECT_EQ(colcnt[3], 2); - blockCompute<2, SparseOrdering::ROW_ORDERED> bc2; + BlockCompute<2, SparseOrdering::ROW_ORDERED> bc2; bc2.setMaxIndex(20, 0); std::vector colcnt2(6, 0); for (index_t pp = 0; pp < 20; ++pp) { @@ -49,7 +49,7 @@ TEST(MatrixDataTests, BlockCompute) // NOLINTNEXTLINE(readability-function-cognitive-complexity) TEST(MatrixDataTests, BlockCompute2) { - blockCompute<3, SparseOrdering::COLUMN_ORDERED> bc1; + BlockCompute<3, SparseOrdering::COLUMN_ORDERED> bc1; bc1.setMaxIndex(7893, 7893); std::vector colcnt(10, 0); for (index_t pp = 0; pp < 7893; ++pp) { @@ -68,25 +68,25 @@ TEST(MatrixDataTests, BlockCompute2) TEST(MatrixDataTests, Keygen) { - auto key1 = keyCompute::keyGen(45, 1); + auto key1 = KeyCompute::keyGen(45, 1); EXPECT_EQ(key1, (1 << 16) + 45); - auto key2 = keyCompute::keyGen(45, 1); + auto key2 = KeyCompute::keyGen(45, 1); EXPECT_EQ(key2, (45 << 16) + 1); - keyCompute kc1; - keyCompute kc2; + KeyCompute kc1; + KeyCompute kc2; EXPECT_EQ(kc1.row(key1), 45); EXPECT_EQ(kc1.col(key1), 1); EXPECT_EQ(kc2.row(key2), 45); EXPECT_EQ(kc2.col(key2), 1); - auto key3 = keyCompute::keyGen(45, 1); + auto key3 = KeyCompute::keyGen(45, 1); EXPECT_EQ(key3, (static_cast(1) << 32) + 45); - auto key4 = keyCompute::keyGen(45, 1); + auto key4 = KeyCompute::keyGen(45, 1); EXPECT_EQ(key4, (static_cast(45) << 32) + 1); - keyCompute kc3; - keyCompute kc4; + KeyCompute kc3; + KeyCompute kc4; EXPECT_EQ(kc3.row(key3), 45); EXPECT_EQ(kc3.col(key3), 1); EXPECT_EQ(kc4.row(key4), 45); @@ -96,7 +96,7 @@ TEST(MatrixDataTests, Keygen) // NOLINTNEXTLINE(readability-function-cognitive-complexity) TEST(MatrixDataTests, Matrix1) { - matrixDataSparseSMB<4, std::uint64_t> bigMatrix; + MatrixDataSparseSMB<4, std::uint64_t> bigMatrix; bigMatrix.setColLimit(1000000); bigMatrix.setRowLimit(1000000); bigMatrix.reserve(200000); @@ -136,7 +136,7 @@ TEST(MatrixDataTests, Matrix1) // NOLINTNEXTLINE(readability-function-cognitive-complexity) TEST(MatrixDataTests, Matrix2) { - matrixDataSparseSMB<3, std::uint64_t, double, SparseOrdering::ROW_ORDERED> bigMatrix; + MatrixDataSparseSMB<3, std::uint64_t, double, SparseOrdering::ROW_ORDERED> bigMatrix; bigMatrix.setColLimit(1000000); bigMatrix.setRowLimit(1000000); bigMatrix.reserve(200000); @@ -175,7 +175,7 @@ TEST(MatrixDataTests, Matrix2) TEST(MatrixDataTests, SparseMatrix) { - matrixDataSparse testMatrix; + MatrixDataSparse testMatrix; testMatrix.setColLimit(10); testMatrix.setRowLimit(10); testMatrix.assign(0, 0, 3.1); @@ -204,7 +204,7 @@ TEST(MatrixDataTests, SparseMatrix) TEST(MatrixDataTests, SparseMatrixMultiply) { - matrixDataSparse testMatrix; + MatrixDataSparse testMatrix; testMatrix.setColLimit(10); testMatrix.setRowLimit(10); for (int ii = 0; ii < 10; ++ii) { diff --git a/test/test_files/location_testFile.txt b/test/test_files/location_testFile.txt index e69de29bb..9436cd391 100644 --- a/test/test_files/location_testFile.txt +++ b/test/test_files/location_testFile.txt @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2014-2026, Lawrence Livermore National Security + * See the top-level NOTICE for additional details. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + */ + +#pragma once + +#include "../Relay.h" +#include +#include +#include + +namespace griddyn::relays { +/** class building off of Relay to define a zonal relays +the number of zones is arbitrary and it works by checking the impedances of the associated link and +comparing to specific thresholds. This zonal relays runs off a single impedance number +*/ +class ZonalRelay: public Relay { + public: + enum ZonalRelayFlags { + NONDIRECTIONAL_FLAG = object_flag10, + }; + + protected: + count_t mZoneCount = 2; //!< the number of zones for the relay + index_t m_terminal = 1; //!< the side of the line to connect 1=from side 2=to side, 3+ for + //!< multiterminal devices + double mResetMargin = 0.01; //! mZoneLevels; //!< the level of impedance to trigger + std::vector mZoneDelays; //!< the delay upon which to act for the relay + count_t mConditionLevel = kInvalidCount; //!< the level of condition that has been triggered + int mAutoName = -1; //!< storage for indicator of the type of autoname to use + public: + explicit ZonalRelay(const std::string& objName = "zonalRelay_$"); + virtual CoreObject* clone(CoreObject* obj = nullptr) const override; + virtual void setFlag(std::string_view flag, bool val = true) override; + virtual void set(std::string_view param, std::string_view val) override; + + virtual void + set(std::string_view param, double val, units::unit unitType = units::defunit) override; + + virtual double get(std::string_view param, + units::unit unitType = units::defunit) const override; + virtual void dynObjectInitializeA(CoreTime time0, std::uint32_t flags) override; + + protected: + virtual void actionTaken(index_t actionNum, + index_t conditionNum, + ChangeCode actionReturn, + CoreTime actionTime) override; + virtual void conditionTriggered(index_t conditionNum, CoreTime triggerTime) override; + virtual void conditionCleared(index_t conditionNum, CoreTime triggerTime) override; + virtual void receiveMessage(std::uint64_t sourceID, + std::shared_ptr message) override; + /** function to automatically generate the comm system names +@param[in] code a code value representing the method of generating the name +@return the generated name +*/ + std::string generateAutoName(int code); + + virtual std::string generateCommName() override; +}; +} // namespace griddyn::relays diff --git a/test/test_files/xml_tests/location_testFile.txt b/test/test_files/xml_tests/location_testFile.txt index e69de29bb..fe11cff38 100644 --- a/test/test_files/xml_tests/location_testFile.txt +++ b/test/test_files/xml_tests/location_testFile.txt @@ -0,0 +1,42 @@ + + + + + fourthOrder + 0.040 + 5 + 8 + 1 + 1.050 + 0.350 + 0.850 + 0.350 + + + type1 + 0 + 0 + 20 + 1 + 0.040 + 0.200 + 0.700 + 1 + 50 + -50 + + + basic + 16.667 + + 0.100 + 0.150 + 0.050 + + + + + + + +