ORNL · pelesh · Jan 22, 2025 · Jan 21, 2025 · Jan 21, 2025 · Jan 21, 2025
diff --git a/.github/workflows/spack_default_build.yaml b/.github/workflows/spack_default_build.yaml
@@ -109,7 +109,7 @@ jobs:
           submodules: true
 
       - name: Setup Spack
-        run: echo "$PWD/Buildsystem/spack/spack/bin" >> "$GITHUB_PATH"
+        run: echo "$PWD/buildsystem/spack/spack/bin" >> "$GITHUB_PATH"
 
       - name: Create heredoc spack.yaml
         run: |

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "Buildsystem/spack/spack"]
-	path = Buildsystem/spack/spack
+[submodule "buildsystem/spack/spack"]
+	path = buildsystem/spack/spack
 	url = https://github.com/nkoukpaizan/spack.git
 	branch = Gridkit-package-dev+enzyme
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,7 +89,7 @@ option(GRIDKIT_ENABLE_ENZYME "Enable automatic differentiation with Enzyme" OFF)
 
 set(CMAKE_MACOSX_RPATH 1)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#always-full-rpath
 # use, i.e. don't skip the full RPATH for the build tree
@@ -117,7 +117,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 option(GRIDKIT_BUILD_SHARED "Build shared libraries" ON)
 option(GRIDKIT_BUILD_STATIC "Build static libraries" OFF)
@@ -145,21 +145,11 @@ include(GridkitAddLibrary)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Create component models
-add_subdirectory(ComponentLib)
-
-# General Utilities and File IO
-add_subdirectory(Utilities)
-
-#Local Sparse matrix operations
-add_subdirectory(SparseMatrix)
-
-# Create solvers
-add_subdirectory(Solver)
+add_subdirectory(src)
 
 # Create examples and tests
 enable_testing()
-add_subdirectory(Examples)
+add_subdirectory(examples)
 
 export(EXPORT gridkit-targets FILE ${CMAKE_CURRENT_BINARY_DIR}/GridKitTargets.cmake)
 
@@ -178,7 +168,7 @@ write_basic_package_version_file(
   COMPATIBILITY SameMajorVersion)
 
 # Generate config file that includes exports
-configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/Config.cmake.in
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfig.cmake
   INSTALL_DESTINATION share/cmake/gridkit
   NO_SET_AND_CHECK_MACRO

diff --git a/buildsystem/.gitkeep b/buildsystem/.gitkeep
diff --git a/Buildsystem/spack/spack → buildsystem/spack/spack b/Buildsystem/spack/spack → buildsystem/spack/spack
diff --git a/CMake/Config.cmake.in → cmake/Config.cmake.in b/CMake/Config.cmake.in → cmake/Config.cmake.in
diff --git a/CMake/FindEnzyme.cmake → cmake/FindEnzyme.cmake b/CMake/FindEnzyme.cmake → cmake/FindEnzyme.cmake
diff --git a/CMake/FindIpopt.cmake → cmake/FindIpopt.cmake b/CMake/FindIpopt.cmake → cmake/FindIpopt.cmake
diff --git a/CMake/FindSuiteSparse.cmake → cmake/FindSuiteSparse.cmake b/CMake/FindSuiteSparse.cmake → cmake/FindSuiteSparse.cmake
diff --git a/CMake/GridkitAddLibrary.cmake → cmake/GridkitAddLibrary.cmake b/CMake/GridkitAddLibrary.cmake → cmake/GridkitAddLibrary.cmake
diff --git a/docs/.gitkeep b/docs/.gitkeep
diff --git a/Documentation/Figures/EXDC1.JPG → docs/Figures/EXDC1.JPG b/Documentation/Figures/EXDC1.JPG → docs/Figures/EXDC1.JPG
diff --git a/Documentation/Figures/GENROU.JPG → docs/Figures/GENROU.JPG b/Documentation/Figures/GENROU.JPG → docs/Figures/GENROU.JPG
diff --git a/Documentation/Figures/GENSAL.JPG → docs/Figures/GENSAL.JPG b/Documentation/Figures/GENSAL.JPG → docs/Figures/GENSAL.JPG
diff --git a/Documentation/Figures/PSS1A.JPG → docs/Figures/PSS1A.JPG b/Documentation/Figures/PSS1A.JPG → docs/Figures/PSS1A.JPG
diff --git a/Documentation/Figures/SM1.JPG → docs/Figures/SM1.JPG b/Documentation/Figures/SM1.JPG → docs/Figures/SM1.JPG
diff --git a/Documentation/Figures/TGOV1.JPG → docs/Figures/TGOV1.JPG b/Documentation/Figures/TGOV1.JPG → docs/Figures/TGOV1.JPG
diff --git a/Documentation/Figures/TL.jpg → docs/Figures/TL.jpg b/Documentation/Figures/TL.jpg → docs/Figures/TL.jpg
diff --git a/Documentation/Figures/branch.jpg → docs/Figures/branch.jpg b/Documentation/Figures/branch.jpg → docs/Figures/branch.jpg
diff --git a/...tation/Figures/branch_phasor_dynamics.png → docs/Figures/branch_phasor_dynamics.png b/...tation/Figures/branch_phasor_dynamics.png → docs/Figures/branch_phasor_dynamics.png
diff --git a/Documentation/Figures/bus_variables.jpg → docs/Figures/bus_variables.jpg b/Documentation/Figures/bus_variables.jpg → docs/Figures/bus_variables.jpg
diff --git a/Documentation/Figures/example1.jpg → docs/Figures/example1.jpg b/Documentation/Figures/example1.jpg → docs/Figures/example1.jpg
diff --git a/Documentation/Figures/gen1.png → docs/Figures/gen1.png b/Documentation/Figures/gen1.png → docs/Figures/gen1.png
diff --git a/Documentation/Figures/gen2.png → docs/Figures/gen2.png b/Documentation/Figures/gen2.png → docs/Figures/gen2.png
diff --git a/Documentation/Figures/transformer-branch.png → docs/Figures/transformer-branch.png b/Documentation/Figures/transformer-branch.png → docs/Figures/transformer-branch.png
diff --git a/...AdjointSensitivity/AdjointSensitivity.cpp → ...AdjointSensitivity/AdjointSensitivity.cpp b/...AdjointSensitivity/AdjointSensitivity.cpp → ...AdjointSensitivity/AdjointSensitivity.cpp
@@ -61,8 +61,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
-#include <ComponentLib/PowerFlow/Generator4/Generator4.hpp>
+#include <Model/PowerFlow/Bus/BusSlack.hpp>
+#include <Model/PowerFlow/Generator4/Generator4.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <Utilities/Testing.hpp>

diff --git a/Examples/AdjointSensitivity/CMakeLists.txt → examples/AdjointSensitivity/CMakeLists.txt b/Examples/AdjointSensitivity/CMakeLists.txt → examples/AdjointSensitivity/CMakeLists.txt
diff --git a/Examples/CMakeLists.txt → examples/CMakeLists.txt b/Examples/CMakeLists.txt → examples/CMakeLists.txt
diff --git a/...s/DistributedGeneratorTest/CMakeLists.txt → ...s/DistributedGeneratorTest/CMakeLists.txt b/...s/DistributedGeneratorTest/CMakeLists.txt → ...s/DistributedGeneratorTest/CMakeLists.txt
diff --git a/Examples/DistributedGeneratorTest/DGTest.cpp → examples/DistributedGeneratorTest/DGTest.cpp b/Examples/DistributedGeneratorTest/DGTest.cpp → examples/DistributedGeneratorTest/DGTest.cpp
@@ -7,7 +7,7 @@
 #include <filesystem>
 #include <math.h>
 
-#include <ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
+#include <Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
 
 
 /**

diff --git a/...ples/DynamicConstrainedOpt/CMakeLists.txt → ...ples/DynamicConstrainedOpt/CMakeLists.txt b/...ples/DynamicConstrainedOpt/CMakeLists.txt → ...ples/DynamicConstrainedOpt/CMakeLists.txt
diff --git a/...cConstrainedOpt/DynamicConstrainedOpt.cpp → ...cConstrainedOpt/DynamicConstrainedOpt.cpp b/...cConstrainedOpt/DynamicConstrainedOpt.cpp → ...cConstrainedOpt/DynamicConstrainedOpt.cpp
@@ -61,8 +61,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
-#include <ComponentLib/PowerFlow/Generator2/Generator2.hpp>
+#include <Model/PowerFlow/Bus/BusSlack.hpp>
+#include <Model/PowerFlow/Generator2/Generator2.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 

diff --git a/Examples/Enzyme/CMakeLists.txt → examples/Enzyme/CMakeLists.txt b/Examples/Enzyme/CMakeLists.txt → examples/Enzyme/CMakeLists.txt
diff --git a/Examples/Enzyme/Library/CMakeLists.txt → examples/Enzyme/Library/CMakeLists.txt b/Examples/Enzyme/Library/CMakeLists.txt → examples/Enzyme/Library/CMakeLists.txt
diff --git a/Examples/Enzyme/Library/library.cpp → examples/Enzyme/Library/library.cpp b/Examples/Enzyme/Library/library.cpp → examples/Enzyme/Library/library.cpp
diff --git a/Examples/Enzyme/Library/library.hpp → examples/Enzyme/Library/library.hpp b/Examples/Enzyme/Library/library.hpp → examples/Enzyme/Library/library.hpp
diff --git a/Examples/Enzyme/Library/main.cpp → examples/Enzyme/Library/main.cpp b/Examples/Enzyme/Library/main.cpp → examples/Enzyme/Library/main.cpp
diff --git a/Examples/Enzyme/Standalone/CMakeLists.txt → examples/Enzyme/Standalone/CMakeLists.txt b/Examples/Enzyme/Standalone/CMakeLists.txt → examples/Enzyme/Standalone/CMakeLists.txt
diff --git a/Examples/Enzyme/Standalone/main.cpp → examples/Enzyme/Standalone/main.cpp b/Examples/Enzyme/Standalone/main.cpp → examples/Enzyme/Standalone/main.cpp
diff --git a/Examples/GenConstLoad/CMakeLists.txt → examples/GenConstLoad/CMakeLists.txt b/Examples/GenConstLoad/CMakeLists.txt → examples/GenConstLoad/CMakeLists.txt
diff --git a/Examples/GenConstLoad/GenConstLoad.cpp → examples/GenConstLoad/GenConstLoad.cpp b/Examples/GenConstLoad/GenConstLoad.cpp → examples/GenConstLoad/GenConstLoad.cpp
@@ -61,9 +61,9 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/PowerFlow/Bus/BusPQ.hpp>
-#include <ComponentLib/PowerFlow/Load/Load.hpp>
-#include <ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.hpp>
+#include <Model/PowerFlow/Bus/BusPQ.hpp>
+#include <Model/PowerFlow/Load/Load.hpp>
+#include <Model/PowerFlow/Generator4Governor/Generator4Governor.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <SystemModel.hpp>
 

diff --git a/Examples/GenInfiniteBus/CMakeLists.txt → examples/GenInfiniteBus/CMakeLists.txt b/Examples/GenInfiniteBus/CMakeLists.txt → examples/GenInfiniteBus/CMakeLists.txt
diff --git a/Examples/GenInfiniteBus/GenInfiniteBus.cpp → examples/GenInfiniteBus/GenInfiniteBus.cpp b/Examples/GenInfiniteBus/GenInfiniteBus.cpp → examples/GenInfiniteBus/GenInfiniteBus.cpp
@@ -61,8 +61,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
-#include <ComponentLib/PowerFlow/Generator4/Generator4.hpp>
+#include <Model/PowerFlow/Bus/BusSlack.hpp>
+#include <Model/PowerFlow/Generator4/Generator4.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 

diff --git a/Examples/Grid3Bus/3bus.mat → examples/Grid3Bus/3bus.mat b/Examples/Grid3Bus/3bus.mat → examples/Grid3Bus/3bus.mat
diff --git a/Examples/Grid3Bus/CMakeLists.txt → examples/Grid3Bus/CMakeLists.txt b/Examples/Grid3Bus/CMakeLists.txt → examples/Grid3Bus/CMakeLists.txt
diff --git a/Examples/Grid3Bus/Grid3BusSys.cpp → examples/Grid3Bus/Grid3BusSys.cpp b/Examples/Grid3Bus/Grid3BusSys.cpp → examples/Grid3Bus/Grid3BusSys.cpp
@@ -73,12 +73,12 @@
 #include <fstream>
 #include <filesystem>
 
-#include <ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp>
-#include <ComponentLib/PowerFlow/Bus/BusFactory.hpp>
-#include <ComponentLib/PowerFlow/Generator/GeneratorFactory.hpp>
-#include <ComponentLib/PowerFlow/Branch/Branch.hpp>
-#include <ComponentLib/PowerFlow/Load/Load.hpp>
-#include <SystemSteadyStateModel.hpp>
+#include <Model/PowerFlow/MiniGrid/MiniGrid.hpp>
+#include <Model/PowerFlow/Bus/BusFactory.hpp>
+#include <Model/PowerFlow/Generator/GeneratorFactory.hpp>
+#include <Model/PowerFlow/Branch/Branch.hpp>
+#include <Model/PowerFlow/Load/Load.hpp>
+#include <Model/PowerFlow/SystemModelPowerFlow.hpp>
 #include <Solver/SteadyState/Kinsol.hpp>
 #include <PowerSystemData.hpp>
 

diff --git a/Examples/Grid3Bus/README.md → examples/Grid3Bus/README.md b/Examples/Grid3Bus/README.md → examples/Grid3Bus/README.md
@@ -10,7 +10,7 @@ The mathematical model of the power flow problem is formulated as a set of nonli
 The model and its parameters are described in Figure 1:
 
 <div align="center">
-   <img align="center" src="../../Documentation/Figures/example1.jpg">
+   <img align="center" src="../../docs/Figures/example1.jpg">
 
 
   Figure 1: A simple 3-bus grid example.
@@ -22,7 +22,7 @@ Problem variables are voltage magnitudes and phases; they are stored in bus obje
 
 **Bus 1**: Slack bus, does not store variables no residuals. Voltage and phase are set to $`V_1 \equiv 1`$p.u. and $`\theta_1 \equiv 0`$, respectively.
 
-**Bus 2**: PQ bus, stores variables $`V_2, \theta_2`$ and residuals $`P_2, Q_2`$. Load $`P_{L2} = 2.5`$p.u., $`Q_{L2} = -j0.8`$p.u. is attached to it. From the equations for [branch](../../ComponentLib/Branch/README.md) and [load](../../ComponentLib/Load/README.md) components, we assemble Bus 2 residuals as:
+**Bus 2**: PQ bus, stores variables $`V_2, \theta_2`$ and residuals $`P_2, Q_2`$. Load $`P_{L2} = 2.5`$p.u., $`Q_{L2} = -j0.8`$p.u. is attached to it. From the equations for [branch](../../src/Model/PowerFlow/Branch/README.md) and [load](../../src/Model/PowerFlow/Load/README.md) components, we assemble Bus 2 residuals as:
 ```math
 \begin{array}{rcll}
 P_2 & = &-P_{L2} &~~~\mathrm{(load ~2)} \\
@@ -34,7 +34,7 @@ Q_2 & = & -Q_{L2} &~~~\mathrm{(load ~2)} \\
 \end{array}
 ``` 
 
-**Bus 3**: PV bus, stores variable $`\theta_3`$ and residual $`P_3`$. Voltage is set to $`|V_3| \equiv 1.1`$p.u.. Generator $`P_{G3} = 2`$p.u. is attached to it. From the equations for [branch](../../ComponentLib/Branch/README.md) and [generator](../../ComponentLib/Gen/README.md) components, we assemble Bus 3 residual as:
+**Bus 3**: PV bus, stores variable $`\theta_3`$ and residual $`P_3`$. Voltage is set to $`|V_3| \equiv 1.1`$p.u.. Generator $`P_{G3} = 2`$p.u. is attached to it. From the equations for [branch](../../src/Model/PowerFlow/Branch/README.md) and [generator](../../src/Model/PowerFlow/Gen/README.md) components, we assemble Bus 3 residual as:
 ```math
 \begin{array}{rcll}
 P_3 & = &P_{G3} &~~~\mathrm{(generator ~3)} \\

diff --git a/Examples/MatPowerTesting/CMakeLists.txt → examples/MatPowerTesting/CMakeLists.txt b/Examples/MatPowerTesting/CMakeLists.txt → examples/MatPowerTesting/CMakeLists.txt
diff --git a/...MatPowerTesting/test_parse_branch_row.cpp → ...MatPowerTesting/test_parse_branch_row.cpp b/...MatPowerTesting/test_parse_branch_row.cpp → ...MatPowerTesting/test_parse_branch_row.cpp
diff --git a/...es/MatPowerTesting/test_parse_bus_row.cpp → ...es/MatPowerTesting/test_parse_bus_row.cpp b/...es/MatPowerTesting/test_parse_bus_row.cpp → ...es/MatPowerTesting/test_parse_bus_row.cpp
diff --git a/...es/MatPowerTesting/test_parse_gen_row.cpp → ...es/MatPowerTesting/test_parse_gen_row.cpp b/...es/MatPowerTesting/test_parse_gen_row.cpp → ...es/MatPowerTesting/test_parse_gen_row.cpp
diff --git a/...atPowerTesting/test_parse_gencost_row.cpp → ...atPowerTesting/test_parse_gencost_row.cpp b/...atPowerTesting/test_parse_gencost_row.cpp → ...atPowerTesting/test_parse_gencost_row.cpp
diff --git a/...s/MatPowerTesting/test_parse_matpower.cpp → ...s/MatPowerTesting/test_parse_matpower.cpp b/...s/MatPowerTesting/test_parse_matpower.cpp → ...s/MatPowerTesting/test_parse_matpower.cpp
diff --git a/Examples/Microgrid/CMakeLists.txt → examples/Microgrid/CMakeLists.txt b/Examples/Microgrid/CMakeLists.txt → examples/Microgrid/CMakeLists.txt
diff --git a/Examples/Microgrid/Microgrid.cpp → examples/Microgrid/Microgrid.cpp b/Examples/Microgrid/Microgrid.cpp → examples/Microgrid/Microgrid.cpp
@@ -8,12 +8,12 @@
 #include <filesystem>
 
 
-#include <ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
-#include <ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp>
-#include <ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp>
-#include <ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp>
+#include <Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
+#include <Model/PowerElectronics/MicrogridLine/MicrogridLine.hpp>
+#include <Model/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp>
+#include <Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp>
 
-#include <PowerElectronicsModel.hpp>
+#include <Model/PowerElectronics/SystemModelPowerElectronics.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <Solver/Dynamic/DynamicSolver.hpp>
 

diff --git a/Examples/ParameterEstimation/CMakeLists.txt → examples/ParameterEstimation/CMakeLists.txt b/Examples/ParameterEstimation/CMakeLists.txt → examples/ParameterEstimation/CMakeLists.txt
diff --git a/...rameterEstimation/ParameterEstimation.cpp → ...rameterEstimation/ParameterEstimation.cpp b/...rameterEstimation/ParameterEstimation.cpp → ...rameterEstimation/ParameterEstimation.cpp
@@ -67,8 +67,8 @@
 
 #include <Solver/Optimization/DynamicObjective.hpp>
 #include <Solver/Optimization/DynamicConstraint.hpp>
-#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
-#include <ComponentLib/PowerFlow/Generator4Param/Generator4Param.hpp>
+#include <Model/PowerFlow/Bus/BusSlack.hpp>
+#include <Model/PowerFlow/Generator4Param/Generator4Param.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 

diff --git a/...ples/ParameterEstimation/lookup_table.hpp → ...ples/ParameterEstimation/lookup_table.hpp b/...ples/ParameterEstimation/lookup_table.hpp → ...ples/ParameterEstimation/lookup_table.hpp
diff --git a/Examples/RLCircuit/CMakeLists.txt → examples/RLCircuit/CMakeLists.txt b/Examples/RLCircuit/CMakeLists.txt → examples/RLCircuit/CMakeLists.txt
diff --git a/Examples/RLCircuit/RLCircuit.cpp → examples/RLCircuit/RLCircuit.cpp b/Examples/RLCircuit/RLCircuit.cpp → examples/RLCircuit/RLCircuit.cpp
@@ -6,12 +6,12 @@
 #include <fstream>
 #include <filesystem>
 
-#include <ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp>
-#include <ComponentLib/PowerElectronics/Inductor/Inductor.hpp>
-#include <ComponentLib/PowerElectronics/Resistor/Resistor.hpp>
-#include <ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp>
+#include <Model/PowerElectronics/Capacitor/Capacitor.hpp>
+#include <Model/PowerElectronics/Inductor/Inductor.hpp>
+#include <Model/PowerElectronics/Resistor/Resistor.hpp>
+#include <Model/PowerElectronics/VoltageSource/VoltageSource.hpp>
 
-#include <PowerElectronicsModel.hpp>
+#include <Model/PowerElectronics/SystemModelPowerElectronics.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <Solver/Dynamic/DynamicSolver.hpp>
 

diff --git a/Examples/ScaleMicrogrid/CMakeLists.txt → examples/ScaleMicrogrid/CMakeLists.txt b/Examples/ScaleMicrogrid/CMakeLists.txt → examples/ScaleMicrogrid/CMakeLists.txt
diff --git a/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp → examples/ScaleMicrogrid/ScaleMicrogrid.cpp b/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp → examples/ScaleMicrogrid/ScaleMicrogrid.cpp
@@ -8,12 +8,12 @@
 
 #include <Utilities/Testing.hpp>
 
-#include <ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
-#include <ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp>
-#include <ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp>
-#include <ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp>
+#include <Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
+#include <Model/PowerElectronics/MicrogridLine/MicrogridLine.hpp>
+#include <Model/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp>
+#include <Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp>
 
-#include <PowerElectronicsModel.hpp>
+#include <Model/PowerElectronics/SystemModelPowerElectronics.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <Solver/Dynamic/DynamicSolver.hpp>
 

diff --git a/Examples/ScaleMicrogrid/SolutionKeys.hpp → examples/ScaleMicrogrid/SolutionKeys.hpp b/Examples/ScaleMicrogrid/SolutionKeys.hpp → examples/ScaleMicrogrid/SolutionKeys.hpp
diff --git a/Examples/SparseTest/CMakeLists.txt → examples/SparseTest/CMakeLists.txt b/Examples/SparseTest/CMakeLists.txt → examples/SparseTest/CMakeLists.txt
diff --git a/Examples/SparseTest/SparseTest.cpp → examples/SparseTest/SparseTest.cpp b/Examples/SparseTest/SparseTest.cpp → examples/SparseTest/SparseTest.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 #include <tuple>
 
-#include <SparseMatrix/COO_Matrix.hpp>
+#include <LinearAlgebra/COO_Matrix.hpp>
 
 int main(int argc, char const *argv[])
 {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Create component models
+add_subdirectory(Model)
+
+# General Utilities and File IO
+add_subdirectory(Utilities)
+
+# Local Sparse matrix operations
+add_subdirectory(LinearAlgebra)
+
+# Create solvers
+add_subdirectory(Solver)
diff --git a/CircuitGraph.hpp → src/CircuitGraph.hpp b/CircuitGraph.hpp → src/CircuitGraph.hpp
diff --git a/SparseMatrix/CMakeLists.txt → src/LinearAlgebra/CMakeLists.txt b/SparseMatrix/CMakeLists.txt → src/LinearAlgebra/CMakeLists.txt
diff --git a/SparseMatrix/COO_Matrix.hpp → src/LinearAlgebra/COO_Matrix.hpp b/SparseMatrix/COO_Matrix.hpp → src/LinearAlgebra/COO_Matrix.hpp
diff --git a/ComponentLib/CMakeLists.txt → src/Model/CMakeLists.txt b/ComponentLib/CMakeLists.txt → src/Model/CMakeLists.txt
diff --git a/...onentLib/PhasorDynamics/Branch/Branch.cpp → src/Model/PhasorDynamics/Branch/Branch.cpp b/...onentLib/PhasorDynamics/Branch/Branch.cpp → src/Model/PhasorDynamics/Branch/Branch.cpp
@@ -59,7 +59,7 @@
 
 #include <iostream>
 #include <cmath>
-#include <ComponentLib/PhasorDynamics/Bus/Bus.hpp>
+#include <Model/PhasorDynamics/Bus/Bus.hpp>
 #include <PowerSystemData.hpp>
 
 #include "Branch.hpp"

diff --git a/...onentLib/PhasorDynamics/Branch/Branch.hpp → src/Model/PhasorDynamics/Branch/Branch.hpp b/...onentLib/PhasorDynamics/Branch/Branch.hpp → src/Model/PhasorDynamics/Branch/Branch.hpp
diff --git a/...tLib/PhasorDynamics/Branch/CMakeLists.txt → ...odel/PhasorDynamics/Branch/CMakeLists.txt b/...tLib/PhasorDynamics/Branch/CMakeLists.txt → ...odel/PhasorDynamics/Branch/CMakeLists.txt
diff --git a/ComponentLib/PhasorDynamics/Branch/README.md → src/Model/PhasorDynamics/Branch/README.md b/ComponentLib/PhasorDynamics/Branch/README.md → src/Model/PhasorDynamics/Branch/README.md
@@ -13,7 +13,7 @@ sending to receiving bus. We decide to use this symmetric convention because it
 provides more flexibility for modeling.
 
 <div align="center">
-   <img align="center" src="../../../Documentation/Figures/branch_phasor_dynamics.png">
+   <img align="center" src="../../../docs/Figures/branch_phasor_dynamics.png">
 
   Figure 1: Transmission line $`\pi`$ equivalent circuit
 </div>
@@ -96,7 +96,7 @@ magnitude and $`\theta`$ is the phase shift angle and
 $`N = \tau e^{j \theta}`$.
 
 <div align="center">
-   <img align="center" src="../../../Documentation/Figures/transformer-branch.png">
+   <img align="center" src="../../../docs/Figures/transformer-branch.png">
 
 
   Figure 2: Branch equivalent circuit

diff --git a/ComponentLib/PhasorDynamics/Bus/Bus.cpp → src/Model/PhasorDynamics/Bus/Bus.cpp b/ComponentLib/PhasorDynamics/Bus/Bus.cpp → src/Model/PhasorDynamics/Bus/Bus.cpp
diff --git a/ComponentLib/PhasorDynamics/Bus/Bus.hpp → src/Model/PhasorDynamics/Bus/Bus.hpp b/ComponentLib/PhasorDynamics/Bus/Bus.hpp → src/Model/PhasorDynamics/Bus/Bus.hpp
diff --git a/...nentLib/PhasorDynamics/Bus/CMakeLists.txt → src/Model/PhasorDynamics/Bus/CMakeLists.txt b/...nentLib/PhasorDynamics/Bus/CMakeLists.txt → src/Model/PhasorDynamics/Bus/CMakeLists.txt
diff --git a/ComponentLib/PhasorDynamics/Bus/README.md → src/Model/PhasorDynamics/Bus/README.md b/ComponentLib/PhasorDynamics/Bus/README.md → src/Model/PhasorDynamics/Bus/README.md
@@ -16,7 +16,7 @@ Current entering the bus has positive and current exiting the bus negative
 sign.
 
 <div align="center">
-   <img align="center" src="../../../Documentation/Figures/bus_variables.jpg">
+   <img align="center" src="../../../docs/Figures/bus_variables.jpg">
 
   Figure 1: Needs to be changed to represent current balance instead of power
   balance.

diff --git a/ComponentLib/PhasorDynamics/CMakeLists.txt → src/Model/PhasorDynamics/CMakeLists.txt b/ComponentLib/PhasorDynamics/CMakeLists.txt → src/Model/PhasorDynamics/CMakeLists.txt
diff --git a/...onentLib/PhasorDynamics/Exciter/README.md → src/Model/PhasorDynamics/Exciter/README.md b/...onentLib/PhasorDynamics/Exciter/README.md → src/Model/PhasorDynamics/Exciter/README.md
@@ -4,7 +4,7 @@
 **Note: Exciter model not yet implemented**
 
 <div align="center">
-   <img align="center" src="../../../Documentation/Figures/EXDC1.JPG">
+   <img align="center" src="../../../docs/Figures/EXDC1.JPG">
 
 
   Figure 1: Exciter EXDC1 model. Fifure courtesy of [PoweWorld](https://www.powerworld.com/WebHelp/).

diff --git a/...nentLib/PhasorDynamics/Governor/README.md → src/Model/PhasorDynamics/Governor/README.md b/...nentLib/PhasorDynamics/Governor/README.md → src/Model/PhasorDynamics/Governor/README.md
@@ -8,7 +8,7 @@
 Standard model of the stream turbine
 
 <div align="center">
-   <img align="center" src="../../../Documentation/Figures/TGOV1.JPG">
+   <img align="center" src="../../../docs/Figures/TGOV1.JPG">
 
 
   Figure 1: Governor TGOV1 model. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/)

diff --git a/...ntLib/PhasorDynamics/Stabilizer/README.md → ...Model/PhasorDynamics/Stabilizer/README.md b/...ntLib/PhasorDynamics/Stabilizer/README.md → ...Model/PhasorDynamics/Stabilizer/README.md
@@ -4,7 +4,7 @@
 
 
 <div align="center">
-   <img align="center" src="../../../Documentation/Figures/PSS1A.JPG">
+   <img align="center" src="../../../docs/Figures/PSS1A.JPG">
 
 
   Figure 1: Power system stabilizer PSS1A model. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/)

diff --git a/...ics/SynchronousMachine/GENROUwS/README.md → ...ics/SynchronousMachine/GENROUwS/README.md b/...ics/SynchronousMachine/GENROUwS/README.md → ...ics/SynchronousMachine/GENROUwS/README.md
@@ -6,7 +6,7 @@
 - same relative amount of saturation occurs on both $`d`$ and $`q`$ axis
 
 <div align="center">
-   <img align="center" src="../../../../Documentation/Figures/GENROU.JPG">
+   <img align="center" src="../../../../docs/Figures/GENROU.JPG">
 
 
   Figure 2: GENROU. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/)

diff --git a/...ics/SynchronousMachine/GENSALwS/README.md → ...ics/SynchronousMachine/GENSALwS/README.md b/...ics/SynchronousMachine/GENSALwS/README.md → ...ics/SynchronousMachine/GENSALwS/README.md
@@ -8,7 +8,7 @@
 - $`T'_{q0}`$ is neglected
 
 <div align="center">
-   <img align="center" src="../../../../Documentation/Figures/GENSAL.JPG">
+   <img align="center" src="../../../../docs/Figures/GENSAL.JPG">
 
 
   Figure 2: GENSAL. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/)

diff --git a/...asorDynamics/SynchronousMachine/README.md → ...asorDynamics/SynchronousMachine/README.md b/...asorDynamics/SynchronousMachine/README.md → ...asorDynamics/SynchronousMachine/README.md
@@ -9,7 +9,7 @@
 
 
 <div align="center">
-   <img align="center" src="../../../Documentation/Figures/SM1.JPG">
+   <img align="center" src="../../../docs/Figures/SM1.JPG">
 
 
   Figure 1: Synchronous Machine. Figure courtesy of [PowerWorld](https://www.powerworld.com/files/Synchronous-Machines.pdf)

diff --git a/ComponentLib/PowerElectronics/CMakeLists.txt → src/Model/PowerElectronics/CMakeLists.txt b/ComponentLib/PowerElectronics/CMakeLists.txt → src/Model/PowerElectronics/CMakeLists.txt
diff --git a/...PowerElectronics/Capacitor/CMakeLists.txt → ...PowerElectronics/Capacitor/CMakeLists.txt b/...PowerElectronics/Capacitor/CMakeLists.txt → ...PowerElectronics/Capacitor/CMakeLists.txt
diff --git a/.../PowerElectronics/Capacitor/Capacitor.cpp → .../PowerElectronics/Capacitor/Capacitor.cpp b/.../PowerElectronics/Capacitor/Capacitor.cpp → .../PowerElectronics/Capacitor/Capacitor.cpp
diff --git a/.../PowerElectronics/Capacitor/Capacitor.hpp → .../PowerElectronics/Capacitor/Capacitor.hpp b/.../PowerElectronics/Capacitor/Capacitor.hpp → .../PowerElectronics/Capacitor/Capacitor.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
+#include <Model/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...Lib/PowerElectronics/CircuitComponent.hpp → ...del/PowerElectronics/CircuitComponent.hpp b/...Lib/PowerElectronics/CircuitComponent.hpp → ...del/PowerElectronics/CircuitComponent.hpp
diff --git a/...onics/DistributedGenerator/CMakeLists.txt → ...onics/DistributedGenerator/CMakeLists.txt b/...onics/DistributedGenerator/CMakeLists.txt → ...onics/DistributedGenerator/CMakeLists.txt
diff --git a/...ributedGenerator/DistributedGenerator.cpp → ...ributedGenerator/DistributedGenerator.cpp b/...ributedGenerator/DistributedGenerator.cpp → ...ributedGenerator/DistributedGenerator.cpp
diff --git a/...ributedGenerator/DistributedGenerator.hpp → ...ributedGenerator/DistributedGenerator.hpp b/...ributedGenerator/DistributedGenerator.hpp → ...ributedGenerator/DistributedGenerator.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
+#include <Model/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...Electronics/InductionMotor/CMakeLists.txt → ...Electronics/InductionMotor/CMakeLists.txt b/...Electronics/InductionMotor/CMakeLists.txt → ...Electronics/InductionMotor/CMakeLists.txt
diff --git a/...tronics/InductionMotor/InductionMotor.cpp → ...tronics/InductionMotor/InductionMotor.cpp b/...tronics/InductionMotor/InductionMotor.cpp → ...tronics/InductionMotor/InductionMotor.cpp
diff --git a/...tronics/InductionMotor/InductionMotor.hpp → ...tronics/InductionMotor/InductionMotor.hpp b/...tronics/InductionMotor/InductionMotor.hpp → ...tronics/InductionMotor/InductionMotor.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
+#include <Model/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/.../PowerElectronics/Inductor/CMakeLists.txt → .../PowerElectronics/Inductor/CMakeLists.txt b/.../PowerElectronics/Inductor/CMakeLists.txt → .../PowerElectronics/Inductor/CMakeLists.txt
diff --git a/...ib/PowerElectronics/Inductor/Inductor.cpp → ...el/PowerElectronics/Inductor/Inductor.cpp b/...ib/PowerElectronics/Inductor/Inductor.cpp → ...el/PowerElectronics/Inductor/Inductor.cpp
diff --git a/...ib/PowerElectronics/Inductor/Inductor.hpp → ...el/PowerElectronics/Inductor/Inductor.hpp b/...ib/PowerElectronics/Inductor/Inductor.hpp → ...el/PowerElectronics/Inductor/Inductor.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
+#include <Model/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...ctronics/LinearTransformer/CMakeLists.txt → ...ctronics/LinearTransformer/CMakeLists.txt b/...ctronics/LinearTransformer/CMakeLists.txt → ...ctronics/LinearTransformer/CMakeLists.txt
diff --git a/...s/LinearTransformer/LinearTransformer.cpp → ...s/LinearTransformer/LinearTransformer.cpp b/...s/LinearTransformer/LinearTransformer.cpp → ...s/LinearTransformer/LinearTransformer.cpp
diff --git a/...s/LinearTransformer/LinearTransformer.hpp → ...s/LinearTransformer/LinearTransformer.hpp b/...s/LinearTransformer/LinearTransformer.hpp → ...s/LinearTransformer/LinearTransformer.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
+#include <Model/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...Electronics/MicrogridBusDQ/CMakeLists.txt → ...Electronics/MicrogridBusDQ/CMakeLists.txt b/...Electronics/MicrogridBusDQ/CMakeLists.txt → ...Electronics/MicrogridBusDQ/CMakeLists.txt
diff --git a/...tronics/MicrogridBusDQ/MicrogridBusDQ.cpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.cpp b/...tronics/MicrogridBusDQ/MicrogridBusDQ.cpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.cpp
diff --git a/...tronics/MicrogridBusDQ/MicrogridBusDQ.hpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.hpp b/...tronics/MicrogridBusDQ/MicrogridBusDQ.hpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
+#include <Model/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...rElectronics/MicrogridLine/CMakeLists.txt → ...rElectronics/MicrogridLine/CMakeLists.txt b/...rElectronics/MicrogridLine/CMakeLists.txt → ...rElectronics/MicrogridLine/CMakeLists.txt
diff --git a/...ectronics/MicrogridLine/MicrogridLine.cpp → ...ectronics/MicrogridLine/MicrogridLine.cpp b/...ectronics/MicrogridLine/MicrogridLine.cpp → ...ectronics/MicrogridLine/MicrogridLine.cpp