diff --git a/.github/workflows/spack_default_build.yaml b/.github/workflows/spack_default_build.yaml index 3fe72c371..206c68f1e 100644 --- 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 index 8980bd16c..b5ba06cd3 100644 --- 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 index 2fba25791..3fbba2cb6 100644 --- 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 new file mode 100644 index 000000000..e69de29bb diff --git a/Buildsystem/spack/spack b/buildsystem/spack/spack similarity index 100% rename from Buildsystem/spack/spack rename to buildsystem/spack/spack diff --git a/CMake/Config.cmake.in b/cmake/Config.cmake.in similarity index 100% rename from CMake/Config.cmake.in rename to cmake/Config.cmake.in diff --git a/CMake/FindEnzyme.cmake b/cmake/FindEnzyme.cmake similarity index 100% rename from CMake/FindEnzyme.cmake rename to cmake/FindEnzyme.cmake diff --git a/CMake/FindIpopt.cmake b/cmake/FindIpopt.cmake similarity index 100% rename from CMake/FindIpopt.cmake rename to cmake/FindIpopt.cmake diff --git a/CMake/FindSuiteSparse.cmake b/cmake/FindSuiteSparse.cmake similarity index 100% rename from CMake/FindSuiteSparse.cmake rename to cmake/FindSuiteSparse.cmake diff --git a/CMake/GridkitAddLibrary.cmake b/cmake/GridkitAddLibrary.cmake similarity index 100% rename from CMake/GridkitAddLibrary.cmake rename to cmake/GridkitAddLibrary.cmake diff --git a/docs/.gitkeep b/docs/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/Documentation/Figures/EXDC1.JPG b/docs/Figures/EXDC1.JPG similarity index 100% rename from Documentation/Figures/EXDC1.JPG rename to docs/Figures/EXDC1.JPG diff --git a/Documentation/Figures/GENROU.JPG b/docs/Figures/GENROU.JPG similarity index 100% rename from Documentation/Figures/GENROU.JPG rename to docs/Figures/GENROU.JPG diff --git a/Documentation/Figures/GENSAL.JPG b/docs/Figures/GENSAL.JPG similarity index 100% rename from Documentation/Figures/GENSAL.JPG rename to docs/Figures/GENSAL.JPG diff --git a/Documentation/Figures/PSS1A.JPG b/docs/Figures/PSS1A.JPG similarity index 100% rename from Documentation/Figures/PSS1A.JPG rename to docs/Figures/PSS1A.JPG diff --git a/Documentation/Figures/SM1.JPG b/docs/Figures/SM1.JPG similarity index 100% rename from Documentation/Figures/SM1.JPG rename to docs/Figures/SM1.JPG diff --git a/Documentation/Figures/TGOV1.JPG b/docs/Figures/TGOV1.JPG similarity index 100% rename from Documentation/Figures/TGOV1.JPG rename to docs/Figures/TGOV1.JPG diff --git a/Documentation/Figures/TL.jpg b/docs/Figures/TL.jpg similarity index 100% rename from Documentation/Figures/TL.jpg rename to docs/Figures/TL.jpg diff --git a/Documentation/Figures/branch.jpg b/docs/Figures/branch.jpg similarity index 100% rename from Documentation/Figures/branch.jpg rename to docs/Figures/branch.jpg diff --git a/Documentation/Figures/branch_phasor_dynamics.png b/docs/Figures/branch_phasor_dynamics.png similarity index 100% rename from Documentation/Figures/branch_phasor_dynamics.png rename to docs/Figures/branch_phasor_dynamics.png diff --git a/Documentation/Figures/bus_variables.jpg b/docs/Figures/bus_variables.jpg similarity index 100% rename from Documentation/Figures/bus_variables.jpg rename to docs/Figures/bus_variables.jpg diff --git a/Documentation/Figures/example1.jpg b/docs/Figures/example1.jpg similarity index 100% rename from Documentation/Figures/example1.jpg rename to docs/Figures/example1.jpg diff --git a/Documentation/Figures/gen1.png b/docs/Figures/gen1.png similarity index 100% rename from Documentation/Figures/gen1.png rename to docs/Figures/gen1.png diff --git a/Documentation/Figures/gen2.png b/docs/Figures/gen2.png similarity index 100% rename from Documentation/Figures/gen2.png rename to docs/Figures/gen2.png diff --git a/Documentation/Figures/transformer-branch.png b/docs/Figures/transformer-branch.png similarity index 100% rename from Documentation/Figures/transformer-branch.png rename to docs/Figures/transformer-branch.png diff --git a/Examples/AdjointSensitivity/AdjointSensitivity.cpp b/examples/AdjointSensitivity/AdjointSensitivity.cpp similarity index 98% rename from Examples/AdjointSensitivity/AdjointSensitivity.cpp rename to examples/AdjointSensitivity/AdjointSensitivity.cpp index 78c57bfc6..83e3890ef 100644 --- a/Examples/AdjointSensitivity/AdjointSensitivity.cpp +++ b/examples/AdjointSensitivity/AdjointSensitivity.cpp @@ -61,8 +61,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/Examples/AdjointSensitivity/CMakeLists.txt b/examples/AdjointSensitivity/CMakeLists.txt similarity index 100% rename from Examples/AdjointSensitivity/CMakeLists.txt rename to examples/AdjointSensitivity/CMakeLists.txt diff --git a/Examples/CMakeLists.txt b/examples/CMakeLists.txt similarity index 100% rename from Examples/CMakeLists.txt rename to examples/CMakeLists.txt diff --git a/Examples/DistributedGeneratorTest/CMakeLists.txt b/examples/DistributedGeneratorTest/CMakeLists.txt similarity index 100% rename from Examples/DistributedGeneratorTest/CMakeLists.txt rename to examples/DistributedGeneratorTest/CMakeLists.txt diff --git a/Examples/DistributedGeneratorTest/DGTest.cpp b/examples/DistributedGeneratorTest/DGTest.cpp similarity index 95% rename from Examples/DistributedGeneratorTest/DGTest.cpp rename to examples/DistributedGeneratorTest/DGTest.cpp index c33f1f481..22903c609 100644 --- a/Examples/DistributedGeneratorTest/DGTest.cpp +++ b/examples/DistributedGeneratorTest/DGTest.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include /** diff --git a/Examples/DynamicConstrainedOpt/CMakeLists.txt b/examples/DynamicConstrainedOpt/CMakeLists.txt similarity index 100% rename from Examples/DynamicConstrainedOpt/CMakeLists.txt rename to examples/DynamicConstrainedOpt/CMakeLists.txt diff --git a/Examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp b/examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp similarity index 98% rename from Examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp rename to examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp index f765647b0..df24ad597 100644 --- a/Examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp +++ b/examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp @@ -61,8 +61,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/Examples/Enzyme/CMakeLists.txt b/examples/Enzyme/CMakeLists.txt similarity index 100% rename from Examples/Enzyme/CMakeLists.txt rename to examples/Enzyme/CMakeLists.txt diff --git a/Examples/Enzyme/Library/CMakeLists.txt b/examples/Enzyme/Library/CMakeLists.txt similarity index 100% rename from Examples/Enzyme/Library/CMakeLists.txt rename to examples/Enzyme/Library/CMakeLists.txt diff --git a/Examples/Enzyme/Library/library.cpp b/examples/Enzyme/Library/library.cpp similarity index 100% rename from Examples/Enzyme/Library/library.cpp rename to examples/Enzyme/Library/library.cpp diff --git a/Examples/Enzyme/Library/library.hpp b/examples/Enzyme/Library/library.hpp similarity index 100% rename from Examples/Enzyme/Library/library.hpp rename to examples/Enzyme/Library/library.hpp diff --git a/Examples/Enzyme/Library/main.cpp b/examples/Enzyme/Library/main.cpp similarity index 100% rename from Examples/Enzyme/Library/main.cpp rename to examples/Enzyme/Library/main.cpp diff --git a/Examples/Enzyme/Standalone/CMakeLists.txt b/examples/Enzyme/Standalone/CMakeLists.txt similarity index 100% rename from Examples/Enzyme/Standalone/CMakeLists.txt rename to examples/Enzyme/Standalone/CMakeLists.txt diff --git a/Examples/Enzyme/Standalone/main.cpp b/examples/Enzyme/Standalone/main.cpp similarity index 100% rename from Examples/Enzyme/Standalone/main.cpp rename to examples/Enzyme/Standalone/main.cpp diff --git a/Examples/GenConstLoad/CMakeLists.txt b/examples/GenConstLoad/CMakeLists.txt similarity index 100% rename from Examples/GenConstLoad/CMakeLists.txt rename to examples/GenConstLoad/CMakeLists.txt diff --git a/Examples/GenConstLoad/GenConstLoad.cpp b/examples/GenConstLoad/GenConstLoad.cpp similarity index 97% rename from Examples/GenConstLoad/GenConstLoad.cpp rename to examples/GenConstLoad/GenConstLoad.cpp index fbbc271ec..836b40cb8 100644 --- a/Examples/GenConstLoad/GenConstLoad.cpp +++ b/examples/GenConstLoad/GenConstLoad.cpp @@ -61,9 +61,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Examples/GenInfiniteBus/CMakeLists.txt b/examples/GenInfiniteBus/CMakeLists.txt similarity index 100% rename from Examples/GenInfiniteBus/CMakeLists.txt rename to examples/GenInfiniteBus/CMakeLists.txt diff --git a/Examples/GenInfiniteBus/GenInfiniteBus.cpp b/examples/GenInfiniteBus/GenInfiniteBus.cpp similarity index 98% rename from Examples/GenInfiniteBus/GenInfiniteBus.cpp rename to examples/GenInfiniteBus/GenInfiniteBus.cpp index 938132ed8..a215e26b6 100644 --- a/Examples/GenInfiniteBus/GenInfiniteBus.cpp +++ b/examples/GenInfiniteBus/GenInfiniteBus.cpp @@ -61,8 +61,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/Examples/Grid3Bus/3bus.mat b/examples/Grid3Bus/3bus.mat similarity index 100% rename from Examples/Grid3Bus/3bus.mat rename to examples/Grid3Bus/3bus.mat diff --git a/Examples/Grid3Bus/CMakeLists.txt b/examples/Grid3Bus/CMakeLists.txt similarity index 100% rename from Examples/Grid3Bus/CMakeLists.txt rename to examples/Grid3Bus/CMakeLists.txt diff --git a/Examples/Grid3Bus/Grid3BusSys.cpp b/examples/Grid3Bus/Grid3BusSys.cpp similarity index 97% rename from Examples/Grid3Bus/Grid3BusSys.cpp rename to examples/Grid3Bus/Grid3BusSys.cpp index e34827cf2..551869872 100644 --- a/Examples/Grid3Bus/Grid3BusSys.cpp +++ b/examples/Grid3Bus/Grid3BusSys.cpp @@ -73,12 +73,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/Examples/Grid3Bus/README.md b/examples/Grid3Bus/README.md similarity index 92% rename from Examples/Grid3Bus/README.md rename to examples/Grid3Bus/README.md index 39d27740f..b628ad426 100644 --- a/Examples/Grid3Bus/README.md +++ b/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:
- + 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 b/examples/MatPowerTesting/CMakeLists.txt similarity index 100% rename from Examples/MatPowerTesting/CMakeLists.txt rename to examples/MatPowerTesting/CMakeLists.txt diff --git a/Examples/MatPowerTesting/test_parse_branch_row.cpp b/examples/MatPowerTesting/test_parse_branch_row.cpp similarity index 100% rename from Examples/MatPowerTesting/test_parse_branch_row.cpp rename to examples/MatPowerTesting/test_parse_branch_row.cpp diff --git a/Examples/MatPowerTesting/test_parse_bus_row.cpp b/examples/MatPowerTesting/test_parse_bus_row.cpp similarity index 100% rename from Examples/MatPowerTesting/test_parse_bus_row.cpp rename to examples/MatPowerTesting/test_parse_bus_row.cpp diff --git a/Examples/MatPowerTesting/test_parse_gen_row.cpp b/examples/MatPowerTesting/test_parse_gen_row.cpp similarity index 100% rename from Examples/MatPowerTesting/test_parse_gen_row.cpp rename to examples/MatPowerTesting/test_parse_gen_row.cpp diff --git a/Examples/MatPowerTesting/test_parse_gencost_row.cpp b/examples/MatPowerTesting/test_parse_gencost_row.cpp similarity index 100% rename from Examples/MatPowerTesting/test_parse_gencost_row.cpp rename to examples/MatPowerTesting/test_parse_gencost_row.cpp diff --git a/Examples/MatPowerTesting/test_parse_matpower.cpp b/examples/MatPowerTesting/test_parse_matpower.cpp similarity index 100% rename from Examples/MatPowerTesting/test_parse_matpower.cpp rename to examples/MatPowerTesting/test_parse_matpower.cpp diff --git a/Examples/Microgrid/CMakeLists.txt b/examples/Microgrid/CMakeLists.txt similarity index 100% rename from Examples/Microgrid/CMakeLists.txt rename to examples/Microgrid/CMakeLists.txt diff --git a/Examples/Microgrid/Microgrid.cpp b/examples/Microgrid/Microgrid.cpp similarity index 97% rename from Examples/Microgrid/Microgrid.cpp rename to examples/Microgrid/Microgrid.cpp index ea6d203b5..3168b12bd 100644 --- a/Examples/Microgrid/Microgrid.cpp +++ b/examples/Microgrid/Microgrid.cpp @@ -8,12 +8,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/Examples/ParameterEstimation/CMakeLists.txt b/examples/ParameterEstimation/CMakeLists.txt similarity index 100% rename from Examples/ParameterEstimation/CMakeLists.txt rename to examples/ParameterEstimation/CMakeLists.txt diff --git a/Examples/ParameterEstimation/ParameterEstimation.cpp b/examples/ParameterEstimation/ParameterEstimation.cpp similarity index 98% rename from Examples/ParameterEstimation/ParameterEstimation.cpp rename to examples/ParameterEstimation/ParameterEstimation.cpp index f73f028e7..91406e37d 100644 --- a/Examples/ParameterEstimation/ParameterEstimation.cpp +++ b/examples/ParameterEstimation/ParameterEstimation.cpp @@ -67,8 +67,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/Examples/ParameterEstimation/lookup_table.hpp b/examples/ParameterEstimation/lookup_table.hpp similarity index 100% rename from Examples/ParameterEstimation/lookup_table.hpp rename to examples/ParameterEstimation/lookup_table.hpp diff --git a/Examples/RLCircuit/CMakeLists.txt b/examples/RLCircuit/CMakeLists.txt similarity index 100% rename from Examples/RLCircuit/CMakeLists.txt rename to examples/RLCircuit/CMakeLists.txt diff --git a/Examples/RLCircuit/RLCircuit.cpp b/examples/RLCircuit/RLCircuit.cpp similarity index 92% rename from Examples/RLCircuit/RLCircuit.cpp rename to examples/RLCircuit/RLCircuit.cpp index f1c5a6b3f..c00be85fb 100644 --- a/Examples/RLCircuit/RLCircuit.cpp +++ b/examples/RLCircuit/RLCircuit.cpp @@ -6,12 +6,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/Examples/ScaleMicrogrid/CMakeLists.txt b/examples/ScaleMicrogrid/CMakeLists.txt similarity index 100% rename from Examples/ScaleMicrogrid/CMakeLists.txt rename to examples/ScaleMicrogrid/CMakeLists.txt diff --git a/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp b/examples/ScaleMicrogrid/ScaleMicrogrid.cpp similarity index 97% rename from Examples/ScaleMicrogrid/ScaleMicrogrid.cpp rename to examples/ScaleMicrogrid/ScaleMicrogrid.cpp index 3b645f147..86fc27dd9 100644 --- a/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp +++ b/examples/ScaleMicrogrid/ScaleMicrogrid.cpp @@ -8,12 +8,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/Examples/ScaleMicrogrid/SolutionKeys.hpp b/examples/ScaleMicrogrid/SolutionKeys.hpp similarity index 100% rename from Examples/ScaleMicrogrid/SolutionKeys.hpp rename to examples/ScaleMicrogrid/SolutionKeys.hpp diff --git a/Examples/SparseTest/CMakeLists.txt b/examples/SparseTest/CMakeLists.txt similarity index 100% rename from Examples/SparseTest/CMakeLists.txt rename to examples/SparseTest/CMakeLists.txt diff --git a/Examples/SparseTest/SparseTest.cpp b/examples/SparseTest/SparseTest.cpp similarity index 98% rename from Examples/SparseTest/SparseTest.cpp rename to examples/SparseTest/SparseTest.cpp index c563dbd49..c7c07195d 100644 --- a/Examples/SparseTest/SparseTest.cpp +++ b/examples/SparseTest/SparseTest.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include int main(int argc, char const *argv[]) { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 000000000..ffd1613c0 --- /dev/null +++ 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 b/src/CircuitGraph.hpp similarity index 100% rename from CircuitGraph.hpp rename to src/CircuitGraph.hpp diff --git a/SparseMatrix/CMakeLists.txt b/src/LinearAlgebra/CMakeLists.txt similarity index 100% rename from SparseMatrix/CMakeLists.txt rename to src/LinearAlgebra/CMakeLists.txt diff --git a/SparseMatrix/COO_Matrix.hpp b/src/LinearAlgebra/COO_Matrix.hpp similarity index 100% rename from SparseMatrix/COO_Matrix.hpp rename to src/LinearAlgebra/COO_Matrix.hpp diff --git a/ComponentLib/CMakeLists.txt b/src/Model/CMakeLists.txt similarity index 100% rename from ComponentLib/CMakeLists.txt rename to src/Model/CMakeLists.txt diff --git a/ComponentLib/PhasorDynamics/Branch/Branch.cpp b/src/Model/PhasorDynamics/Branch/Branch.cpp similarity index 96% rename from ComponentLib/PhasorDynamics/Branch/Branch.cpp rename to src/Model/PhasorDynamics/Branch/Branch.cpp index b6005d40b..b8782a654 100644 --- a/ComponentLib/PhasorDynamics/Branch/Branch.cpp +++ b/src/Model/PhasorDynamics/Branch/Branch.cpp @@ -59,7 +59,7 @@ #include #include -#include +#include #include #include "Branch.hpp" diff --git a/ComponentLib/PhasorDynamics/Branch/Branch.hpp b/src/Model/PhasorDynamics/Branch/Branch.hpp similarity index 100% rename from ComponentLib/PhasorDynamics/Branch/Branch.hpp rename to src/Model/PhasorDynamics/Branch/Branch.hpp diff --git a/ComponentLib/PhasorDynamics/Branch/CMakeLists.txt b/src/Model/PhasorDynamics/Branch/CMakeLists.txt similarity index 100% rename from ComponentLib/PhasorDynamics/Branch/CMakeLists.txt rename to src/Model/PhasorDynamics/Branch/CMakeLists.txt diff --git a/ComponentLib/PhasorDynamics/Branch/README.md b/src/Model/PhasorDynamics/Branch/README.md similarity index 95% rename from ComponentLib/PhasorDynamics/Branch/README.md rename to src/Model/PhasorDynamics/Branch/README.md index 364bb6a9a..d140263e6 100644 --- a/ComponentLib/PhasorDynamics/Branch/README.md +++ b/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.
- + Figure 1: Transmission line $`\pi`$ equivalent circuit
@@ -96,7 +96,7 @@ magnitude and $`\theta`$ is the phase shift angle and $`N = \tau e^{j \theta}`$.
- + Figure 2: Branch equivalent circuit diff --git a/ComponentLib/PhasorDynamics/Bus/Bus.cpp b/src/Model/PhasorDynamics/Bus/Bus.cpp similarity index 100% rename from ComponentLib/PhasorDynamics/Bus/Bus.cpp rename to src/Model/PhasorDynamics/Bus/Bus.cpp diff --git a/ComponentLib/PhasorDynamics/Bus/Bus.hpp b/src/Model/PhasorDynamics/Bus/Bus.hpp similarity index 100% rename from ComponentLib/PhasorDynamics/Bus/Bus.hpp rename to src/Model/PhasorDynamics/Bus/Bus.hpp diff --git a/ComponentLib/PhasorDynamics/Bus/CMakeLists.txt b/src/Model/PhasorDynamics/Bus/CMakeLists.txt similarity index 100% rename from ComponentLib/PhasorDynamics/Bus/CMakeLists.txt rename to src/Model/PhasorDynamics/Bus/CMakeLists.txt diff --git a/ComponentLib/PhasorDynamics/Bus/README.md b/src/Model/PhasorDynamics/Bus/README.md similarity index 92% rename from ComponentLib/PhasorDynamics/Bus/README.md rename to src/Model/PhasorDynamics/Bus/README.md index 4a9df7d25..0e879af3d 100644 --- a/ComponentLib/PhasorDynamics/Bus/README.md +++ b/src/Model/PhasorDynamics/Bus/README.md @@ -16,7 +16,7 @@ Current entering the bus has positive and current exiting the bus negative sign.
- + Figure 1: Needs to be changed to represent current balance instead of power balance. diff --git a/ComponentLib/PhasorDynamics/CMakeLists.txt b/src/Model/PhasorDynamics/CMakeLists.txt similarity index 100% rename from ComponentLib/PhasorDynamics/CMakeLists.txt rename to src/Model/PhasorDynamics/CMakeLists.txt diff --git a/ComponentLib/PhasorDynamics/Exciter/README.md b/src/Model/PhasorDynamics/Exciter/README.md similarity index 97% rename from ComponentLib/PhasorDynamics/Exciter/README.md rename to src/Model/PhasorDynamics/Exciter/README.md index de04b75f8..2bb549083 100644 --- a/ComponentLib/PhasorDynamics/Exciter/README.md +++ b/src/Model/PhasorDynamics/Exciter/README.md @@ -4,7 +4,7 @@ **Note: Exciter model not yet implemented**
- + Figure 1: Exciter EXDC1 model. Fifure courtesy of [PoweWorld](https://www.powerworld.com/WebHelp/). diff --git a/ComponentLib/PhasorDynamics/Governor/README.md b/src/Model/PhasorDynamics/Governor/README.md similarity index 95% rename from ComponentLib/PhasorDynamics/Governor/README.md rename to src/Model/PhasorDynamics/Governor/README.md index 0447ca411..83671079c 100644 --- a/ComponentLib/PhasorDynamics/Governor/README.md +++ b/src/Model/PhasorDynamics/Governor/README.md @@ -8,7 +8,7 @@ Standard model of the stream turbine
- + Figure 1: Governor TGOV1 model. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/) diff --git a/ComponentLib/PhasorDynamics/Stabilizer/README.md b/src/Model/PhasorDynamics/Stabilizer/README.md similarity index 96% rename from ComponentLib/PhasorDynamics/Stabilizer/README.md rename to src/Model/PhasorDynamics/Stabilizer/README.md index 39c508435..b316611a7 100644 --- a/ComponentLib/PhasorDynamics/Stabilizer/README.md +++ b/src/Model/PhasorDynamics/Stabilizer/README.md @@ -4,7 +4,7 @@
- + Figure 1: Power system stabilizer PSS1A model. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/) diff --git a/ComponentLib/PhasorDynamics/SynchronousMachine/GENROUwS/README.md b/src/Model/PhasorDynamics/SynchronousMachine/GENROUwS/README.md similarity index 97% rename from ComponentLib/PhasorDynamics/SynchronousMachine/GENROUwS/README.md rename to src/Model/PhasorDynamics/SynchronousMachine/GENROUwS/README.md index b24b5a250..bdb502b1a 100644 --- a/ComponentLib/PhasorDynamics/SynchronousMachine/GENROUwS/README.md +++ b/src/Model/PhasorDynamics/SynchronousMachine/GENROUwS/README.md @@ -6,7 +6,7 @@ - same relative amount of saturation occurs on both $`d`$ and $`q`$ axis
- + Figure 2: GENROU. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/) diff --git a/ComponentLib/PhasorDynamics/SynchronousMachine/GENSALwS/README.md b/src/Model/PhasorDynamics/SynchronousMachine/GENSALwS/README.md similarity index 95% rename from ComponentLib/PhasorDynamics/SynchronousMachine/GENSALwS/README.md rename to src/Model/PhasorDynamics/SynchronousMachine/GENSALwS/README.md index 159377de9..81df746f9 100644 --- a/ComponentLib/PhasorDynamics/SynchronousMachine/GENSALwS/README.md +++ b/src/Model/PhasorDynamics/SynchronousMachine/GENSALwS/README.md @@ -8,7 +8,7 @@ - $`T'_{q0}`$ is neglected
- + Figure 2: GENSAL. Figure courtesy of [PowerWorld](https://www.powerworld.com/WebHelp/) diff --git a/ComponentLib/PhasorDynamics/SynchronousMachine/README.md b/src/Model/PhasorDynamics/SynchronousMachine/README.md similarity index 98% rename from ComponentLib/PhasorDynamics/SynchronousMachine/README.md rename to src/Model/PhasorDynamics/SynchronousMachine/README.md index 037e6303d..8d8c6334a 100644 --- a/ComponentLib/PhasorDynamics/SynchronousMachine/README.md +++ b/src/Model/PhasorDynamics/SynchronousMachine/README.md @@ -9,7 +9,7 @@
- + Figure 1: Synchronous Machine. Figure courtesy of [PowerWorld](https://www.powerworld.com/files/Synchronous-Machines.pdf) diff --git a/ComponentLib/PowerElectronics/CMakeLists.txt b/src/Model/PowerElectronics/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/CMakeLists.txt rename to src/Model/PowerElectronics/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/Capacitor/CMakeLists.txt b/src/Model/PowerElectronics/Capacitor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/Capacitor/CMakeLists.txt rename to src/Model/PowerElectronics/Capacitor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/Capacitor/Capacitor.cpp b/src/Model/PowerElectronics/Capacitor/Capacitor.cpp similarity index 100% rename from ComponentLib/PowerElectronics/Capacitor/Capacitor.cpp rename to src/Model/PowerElectronics/Capacitor/Capacitor.cpp diff --git a/ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp b/src/Model/PowerElectronics/Capacitor/Capacitor.hpp similarity index 96% rename from ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp rename to src/Model/PowerElectronics/Capacitor/Capacitor.hpp index 9a54b6634..76cdc3504 100644 --- a/ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp +++ b/src/Model/PowerElectronics/Capacitor/Capacitor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/CircuitComponent.hpp b/src/Model/PowerElectronics/CircuitComponent.hpp similarity index 100% rename from ComponentLib/PowerElectronics/CircuitComponent.hpp rename to src/Model/PowerElectronics/CircuitComponent.hpp diff --git a/ComponentLib/PowerElectronics/DistributedGenerator/CMakeLists.txt b/src/Model/PowerElectronics/DistributedGenerator/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/DistributedGenerator/CMakeLists.txt rename to src/Model/PowerElectronics/DistributedGenerator/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp b/src/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp similarity index 100% rename from ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp rename to src/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp diff --git a/ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp b/src/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp similarity index 97% rename from ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp rename to src/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp index 69f8e41a9..bbb9475fa 100644 --- a/ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp +++ b/src/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/InductionMotor/CMakeLists.txt b/src/Model/PowerElectronics/InductionMotor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/InductionMotor/CMakeLists.txt rename to src/Model/PowerElectronics/InductionMotor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/InductionMotor/InductionMotor.cpp b/src/Model/PowerElectronics/InductionMotor/InductionMotor.cpp similarity index 100% rename from ComponentLib/PowerElectronics/InductionMotor/InductionMotor.cpp rename to src/Model/PowerElectronics/InductionMotor/InductionMotor.cpp diff --git a/ComponentLib/PowerElectronics/InductionMotor/InductionMotor.hpp b/src/Model/PowerElectronics/InductionMotor/InductionMotor.hpp similarity index 97% rename from ComponentLib/PowerElectronics/InductionMotor/InductionMotor.hpp rename to src/Model/PowerElectronics/InductionMotor/InductionMotor.hpp index 5072a02f2..0a502d556 100644 --- a/ComponentLib/PowerElectronics/InductionMotor/InductionMotor.hpp +++ b/src/Model/PowerElectronics/InductionMotor/InductionMotor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/Inductor/CMakeLists.txt b/src/Model/PowerElectronics/Inductor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/Inductor/CMakeLists.txt rename to src/Model/PowerElectronics/Inductor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/Inductor/Inductor.cpp b/src/Model/PowerElectronics/Inductor/Inductor.cpp similarity index 100% rename from ComponentLib/PowerElectronics/Inductor/Inductor.cpp rename to src/Model/PowerElectronics/Inductor/Inductor.cpp diff --git a/ComponentLib/PowerElectronics/Inductor/Inductor.hpp b/src/Model/PowerElectronics/Inductor/Inductor.hpp similarity index 96% rename from ComponentLib/PowerElectronics/Inductor/Inductor.hpp rename to src/Model/PowerElectronics/Inductor/Inductor.hpp index e69e2aaf4..fbab06496 100644 --- a/ComponentLib/PowerElectronics/Inductor/Inductor.hpp +++ b/src/Model/PowerElectronics/Inductor/Inductor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/LinearTransformer/CMakeLists.txt b/src/Model/PowerElectronics/LinearTransformer/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/LinearTransformer/CMakeLists.txt rename to src/Model/PowerElectronics/LinearTransformer/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.cpp b/src/Model/PowerElectronics/LinearTransformer/LinearTransformer.cpp similarity index 100% rename from ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.cpp rename to src/Model/PowerElectronics/LinearTransformer/LinearTransformer.cpp diff --git a/ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.hpp b/src/Model/PowerElectronics/LinearTransformer/LinearTransformer.hpp similarity index 97% rename from ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.hpp rename to src/Model/PowerElectronics/LinearTransformer/LinearTransformer.hpp index 487f2de6e..7938ed76b 100644 --- a/ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.hpp +++ b/src/Model/PowerElectronics/LinearTransformer/LinearTransformer.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/MicrogridBusDQ/CMakeLists.txt b/src/Model/PowerElectronics/MicrogridBusDQ/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/MicrogridBusDQ/CMakeLists.txt rename to src/Model/PowerElectronics/MicrogridBusDQ/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.cpp b/src/Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.cpp similarity index 100% rename from ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.cpp rename to src/Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.cpp diff --git a/ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp b/src/Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp similarity index 96% rename from ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp rename to src/Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp index 63d33ef4e..027143e66 100644 --- a/ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp +++ b/src/Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/MicrogridLine/CMakeLists.txt b/src/Model/PowerElectronics/MicrogridLine/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/MicrogridLine/CMakeLists.txt rename to src/Model/PowerElectronics/MicrogridLine/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.cpp b/src/Model/PowerElectronics/MicrogridLine/MicrogridLine.cpp similarity index 100% rename from ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.cpp rename to src/Model/PowerElectronics/MicrogridLine/MicrogridLine.cpp diff --git a/ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp b/src/Model/PowerElectronics/MicrogridLine/MicrogridLine.hpp similarity index 96% rename from ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp rename to src/Model/PowerElectronics/MicrogridLine/MicrogridLine.hpp index ff25bd98c..17cc18ba9 100644 --- a/ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp +++ b/src/Model/PowerElectronics/MicrogridLine/MicrogridLine.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerElectronics/MicrogridLoad/CMakeLists.txt b/src/Model/PowerElectronics/MicrogridLoad/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/MicrogridLoad/CMakeLists.txt rename to src/Model/PowerElectronics/MicrogridLoad/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.cpp b/src/Model/PowerElectronics/MicrogridLoad/MicrogridLoad.cpp similarity index 100% rename from ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.cpp rename to src/Model/PowerElectronics/MicrogridLoad/MicrogridLoad.cpp diff --git a/ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp b/src/Model/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp similarity index 96% rename from ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp rename to src/Model/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp index 1ecd18f3b..f64626bee 100644 --- a/ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp +++ b/src/Model/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/Resistor/CMakeLists.txt b/src/Model/PowerElectronics/Resistor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/Resistor/CMakeLists.txt rename to src/Model/PowerElectronics/Resistor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/Resistor/Resistor.cpp b/src/Model/PowerElectronics/Resistor/Resistor.cpp similarity index 100% rename from ComponentLib/PowerElectronics/Resistor/Resistor.cpp rename to src/Model/PowerElectronics/Resistor/Resistor.cpp diff --git a/ComponentLib/PowerElectronics/Resistor/Resistor.hpp b/src/Model/PowerElectronics/Resistor/Resistor.hpp similarity index 96% rename from ComponentLib/PowerElectronics/Resistor/Resistor.hpp rename to src/Model/PowerElectronics/Resistor/Resistor.hpp index 64995cba9..f3c925abd 100644 --- a/ComponentLib/PowerElectronics/Resistor/Resistor.hpp +++ b/src/Model/PowerElectronics/Resistor/Resistor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/SynchronousMachine/CMakeLists.txt b/src/Model/PowerElectronics/SynchronousMachine/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/SynchronousMachine/CMakeLists.txt rename to src/Model/PowerElectronics/SynchronousMachine/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.cpp b/src/Model/PowerElectronics/SynchronousMachine/SynchronousMachine.cpp similarity index 100% rename from ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.cpp rename to src/Model/PowerElectronics/SynchronousMachine/SynchronousMachine.cpp diff --git a/ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp b/src/Model/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp similarity index 97% rename from ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp rename to src/Model/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp index 53cc60b54..f2b9b842f 100644 --- a/ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp +++ b/src/Model/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/PowerElectronicsModel.hpp b/src/Model/PowerElectronics/SystemModelPowerElectronics.hpp similarity index 99% rename from PowerElectronicsModel.hpp rename to src/Model/PowerElectronics/SystemModelPowerElectronics.hpp index 0099eaf27..32b7ddd71 100644 --- a/PowerElectronicsModel.hpp +++ b/src/Model/PowerElectronics/SystemModelPowerElectronics.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerElectronics/TransmissionLine/CMakeLists.txt b/src/Model/PowerElectronics/TransmissionLine/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/TransmissionLine/CMakeLists.txt rename to src/Model/PowerElectronics/TransmissionLine/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.cpp b/src/Model/PowerElectronics/TransmissionLine/TransmissionLine.cpp similarity index 100% rename from ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.cpp rename to src/Model/PowerElectronics/TransmissionLine/TransmissionLine.cpp diff --git a/ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.hpp b/src/Model/PowerElectronics/TransmissionLine/TransmissionLine.hpp similarity index 97% rename from ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.hpp rename to src/Model/PowerElectronics/TransmissionLine/TransmissionLine.hpp index c510d4c39..09355a8ab 100644 --- a/ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.hpp +++ b/src/Model/PowerElectronics/TransmissionLine/TransmissionLine.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronics/VoltageSource/CMakeLists.txt b/src/Model/PowerElectronics/VoltageSource/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronics/VoltageSource/CMakeLists.txt rename to src/Model/PowerElectronics/VoltageSource/CMakeLists.txt diff --git a/ComponentLib/PowerElectronics/VoltageSource/VoltageSource.cpp b/src/Model/PowerElectronics/VoltageSource/VoltageSource.cpp similarity index 100% rename from ComponentLib/PowerElectronics/VoltageSource/VoltageSource.cpp rename to src/Model/PowerElectronics/VoltageSource/VoltageSource.cpp diff --git a/ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp b/src/Model/PowerElectronics/VoltageSource/VoltageSource.hpp similarity index 96% rename from ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp rename to src/Model/PowerElectronics/VoltageSource/VoltageSource.hpp index e464feb8e..46f2ddc6f 100644 --- a/ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp +++ b/src/Model/PowerElectronics/VoltageSource/VoltageSource.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerFlow/Branch/Branch.cpp b/src/Model/PowerFlow/Branch/Branch.cpp similarity index 96% rename from ComponentLib/PowerFlow/Branch/Branch.cpp rename to src/Model/PowerFlow/Branch/Branch.cpp index f34dcf6e4..993e3dbd1 100644 --- a/ComponentLib/PowerFlow/Branch/Branch.cpp +++ b/src/Model/PowerFlow/Branch/Branch.cpp @@ -59,7 +59,7 @@ #include #include -#include +#include #include #include "Branch.hpp" diff --git a/ComponentLib/PowerFlow/Branch/Branch.hpp b/src/Model/PowerFlow/Branch/Branch.hpp similarity index 100% rename from ComponentLib/PowerFlow/Branch/Branch.hpp rename to src/Model/PowerFlow/Branch/Branch.hpp diff --git a/ComponentLib/PowerFlow/Branch/CMakeLists.txt b/src/Model/PowerFlow/Branch/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Branch/CMakeLists.txt rename to src/Model/PowerFlow/Branch/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Branch/README.md b/src/Model/PowerFlow/Branch/README.md similarity index 96% rename from ComponentLib/PowerFlow/Branch/README.md rename to src/Model/PowerFlow/Branch/README.md index ed8724ba9..5ab905161 100644 --- a/ComponentLib/PowerFlow/Branch/README.md +++ b/src/Model/PowerFlow/Branch/README.md @@ -7,7 +7,7 @@ Transmission lines and different types of transformers (traditional, Load Tap-Ch The most common circuit that is used to represent the transmission line model is $`\pi`$ circuit as shown in Figure 1. The nominal flow direction is from sending bus _s_ to receiving bus _r_.
- + Figure 1: Transmission line $`\pi`$ equivalent circuit @@ -108,7 +108,7 @@ These quantities are treated as _loads_ and are substracted from $`P`$ and $`Q`$ The branch model can be created by adding the ideal transformer in series with the $`\pi`$ circuit as shown in Figure 2 where $`\tau`$ is a tap ratio magnitude and $`\theta_{shift}`$is the phase shift angle.
- + Figure 2: Branch equivalent circuit diff --git a/ComponentLib/PowerFlow/Bus/BaseBus.hpp b/src/Model/PowerFlow/Bus/BaseBus.hpp similarity index 100% rename from ComponentLib/PowerFlow/Bus/BaseBus.hpp rename to src/Model/PowerFlow/Bus/BaseBus.hpp diff --git a/ComponentLib/PowerFlow/Bus/BusFactory.hpp b/src/Model/PowerFlow/Bus/BusFactory.hpp similarity index 96% rename from ComponentLib/PowerFlow/Bus/BusFactory.hpp rename to src/Model/PowerFlow/Bus/BusFactory.hpp index 433ae0063..9b514c297 100644 --- a/ComponentLib/PowerFlow/Bus/BusFactory.hpp +++ b/src/Model/PowerFlow/Bus/BusFactory.hpp @@ -60,9 +60,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Bus/BusPQ.cpp b/src/Model/PowerFlow/Bus/BusPQ.cpp similarity index 100% rename from ComponentLib/PowerFlow/Bus/BusPQ.cpp rename to src/Model/PowerFlow/Bus/BusPQ.cpp diff --git a/ComponentLib/PowerFlow/Bus/BusPQ.hpp b/src/Model/PowerFlow/Bus/BusPQ.hpp similarity index 100% rename from ComponentLib/PowerFlow/Bus/BusPQ.hpp rename to src/Model/PowerFlow/Bus/BusPQ.hpp diff --git a/ComponentLib/PowerFlow/Bus/BusPV.cpp b/src/Model/PowerFlow/Bus/BusPV.cpp similarity index 100% rename from ComponentLib/PowerFlow/Bus/BusPV.cpp rename to src/Model/PowerFlow/Bus/BusPV.cpp diff --git a/ComponentLib/PowerFlow/Bus/BusPV.hpp b/src/Model/PowerFlow/Bus/BusPV.hpp similarity index 100% rename from ComponentLib/PowerFlow/Bus/BusPV.hpp rename to src/Model/PowerFlow/Bus/BusPV.hpp diff --git a/ComponentLib/PowerFlow/Bus/BusSlack.cpp b/src/Model/PowerFlow/Bus/BusSlack.cpp similarity index 100% rename from ComponentLib/PowerFlow/Bus/BusSlack.cpp rename to src/Model/PowerFlow/Bus/BusSlack.cpp diff --git a/ComponentLib/PowerFlow/Bus/BusSlack.hpp b/src/Model/PowerFlow/Bus/BusSlack.hpp similarity index 100% rename from ComponentLib/PowerFlow/Bus/BusSlack.hpp rename to src/Model/PowerFlow/Bus/BusSlack.hpp diff --git a/ComponentLib/PowerFlow/Bus/CMakeLists.txt b/src/Model/PowerFlow/Bus/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Bus/CMakeLists.txt rename to src/Model/PowerFlow/Bus/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Bus/README.md b/src/Model/PowerFlow/Bus/README.md similarity index 97% rename from ComponentLib/PowerFlow/Bus/README.md rename to src/Model/PowerFlow/Bus/README.md index 9daf786c0..47a68c10b 100644 --- a/ComponentLib/PowerFlow/Bus/README.md +++ b/src/Model/PowerFlow/Bus/README.md @@ -28,7 +28,7 @@ There exist two:
- + Figure 1: Sign convention for the power flow at the bus $`i`$ diff --git a/ComponentLib/PowerFlow/CMakeLists.txt b/src/Model/PowerFlow/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/CMakeLists.txt rename to src/Model/PowerFlow/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Generator/CMakeLists.txt b/src/Model/PowerFlow/Generator/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Generator/CMakeLists.txt rename to src/Model/PowerFlow/Generator/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Generator/GeneratorBase.hpp b/src/Model/PowerFlow/Generator/GeneratorBase.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator/GeneratorBase.hpp rename to src/Model/PowerFlow/Generator/GeneratorBase.hpp diff --git a/ComponentLib/PowerFlow/Generator/GeneratorFactory.hpp b/src/Model/PowerFlow/Generator/GeneratorFactory.hpp similarity index 94% rename from ComponentLib/PowerFlow/Generator/GeneratorFactory.hpp rename to src/Model/PowerFlow/Generator/GeneratorFactory.hpp index 0395aae63..bddffc9c3 100644 --- a/ComponentLib/PowerFlow/Generator/GeneratorFactory.hpp +++ b/src/Model/PowerFlow/Generator/GeneratorFactory.hpp @@ -60,10 +60,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator/GeneratorPQ.cpp b/src/Model/PowerFlow/Generator/GeneratorPQ.cpp similarity index 99% rename from ComponentLib/PowerFlow/Generator/GeneratorPQ.cpp rename to src/Model/PowerFlow/Generator/GeneratorPQ.cpp index 2387f4bd0..a0d73ddfa 100644 --- a/ComponentLib/PowerFlow/Generator/GeneratorPQ.cpp +++ b/src/Model/PowerFlow/Generator/GeneratorPQ.cpp @@ -62,7 +62,7 @@ #include #include #include "GeneratorPQ.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator/GeneratorPQ.hpp b/src/Model/PowerFlow/Generator/GeneratorPQ.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator/GeneratorPQ.hpp rename to src/Model/PowerFlow/Generator/GeneratorPQ.hpp diff --git a/ComponentLib/PowerFlow/Generator/GeneratorPV.cpp b/src/Model/PowerFlow/Generator/GeneratorPV.cpp similarity index 99% rename from ComponentLib/PowerFlow/Generator/GeneratorPV.cpp rename to src/Model/PowerFlow/Generator/GeneratorPV.cpp index 52af4d239..036ea8c96 100644 --- a/ComponentLib/PowerFlow/Generator/GeneratorPV.cpp +++ b/src/Model/PowerFlow/Generator/GeneratorPV.cpp @@ -62,7 +62,7 @@ #include #include #include "GeneratorPV.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator/GeneratorPV.hpp b/src/Model/PowerFlow/Generator/GeneratorPV.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator/GeneratorPV.hpp rename to src/Model/PowerFlow/Generator/GeneratorPV.hpp diff --git a/ComponentLib/PowerFlow/Generator/GeneratorSlack.cpp b/src/Model/PowerFlow/Generator/GeneratorSlack.cpp similarity index 99% rename from ComponentLib/PowerFlow/Generator/GeneratorSlack.cpp rename to src/Model/PowerFlow/Generator/GeneratorSlack.cpp index a5c89892b..7d451b457 100644 --- a/ComponentLib/PowerFlow/Generator/GeneratorSlack.cpp +++ b/src/Model/PowerFlow/Generator/GeneratorSlack.cpp @@ -62,7 +62,7 @@ #include #include #include "GeneratorSlack.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator/GeneratorSlack.hpp b/src/Model/PowerFlow/Generator/GeneratorSlack.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator/GeneratorSlack.hpp rename to src/Model/PowerFlow/Generator/GeneratorSlack.hpp diff --git a/ComponentLib/PowerFlow/Generator2/CMakeLists.txt b/src/Model/PowerFlow/Generator2/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Generator2/CMakeLists.txt rename to src/Model/PowerFlow/Generator2/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Generator2/Generator2.cpp b/src/Model/PowerFlow/Generator2/Generator2.cpp similarity index 99% rename from ComponentLib/PowerFlow/Generator2/Generator2.cpp rename to src/Model/PowerFlow/Generator2/Generator2.cpp index 515cbc514..74c620385 100644 --- a/ComponentLib/PowerFlow/Generator2/Generator2.cpp +++ b/src/Model/PowerFlow/Generator2/Generator2.cpp @@ -59,7 +59,7 @@ #include #include -#include +#include #include "Generator2.hpp" namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator2/Generator2.hpp b/src/Model/PowerFlow/Generator2/Generator2.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator2/Generator2.hpp rename to src/Model/PowerFlow/Generator2/Generator2.hpp diff --git a/ComponentLib/PowerFlow/Generator4/CMakeLists.txt b/src/Model/PowerFlow/Generator4/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Generator4/CMakeLists.txt rename to src/Model/PowerFlow/Generator4/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Generator4/Generator4.cpp b/src/Model/PowerFlow/Generator4/Generator4.cpp similarity index 99% rename from ComponentLib/PowerFlow/Generator4/Generator4.cpp rename to src/Model/PowerFlow/Generator4/Generator4.cpp index 9cfdbe3d7..a8e014afb 100644 --- a/ComponentLib/PowerFlow/Generator4/Generator4.cpp +++ b/src/Model/PowerFlow/Generator4/Generator4.cpp @@ -60,7 +60,7 @@ #include #include -#include +#include #include "Generator4.hpp" namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator4/Generator4.hpp b/src/Model/PowerFlow/Generator4/Generator4.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator4/Generator4.hpp rename to src/Model/PowerFlow/Generator4/Generator4.hpp diff --git a/ComponentLib/PowerFlow/Generator4Governor/CMakeLists.txt b/src/Model/PowerFlow/Generator4Governor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Generator4Governor/CMakeLists.txt rename to src/Model/PowerFlow/Generator4Governor/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.cpp b/src/Model/PowerFlow/Generator4Governor/Generator4Governor.cpp similarity index 99% rename from ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.cpp rename to src/Model/PowerFlow/Generator4Governor/Generator4Governor.cpp index db262138a..6c5d02527 100644 --- a/ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.cpp +++ b/src/Model/PowerFlow/Generator4Governor/Generator4Governor.cpp @@ -61,7 +61,7 @@ #include #include #include "Generator4Governor.hpp" -#include "ComponentLib/PowerFlow/Bus/BaseBus.hpp" +#include "Model/PowerFlow/Bus/BaseBus.hpp" namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.hpp b/src/Model/PowerFlow/Generator4Governor/Generator4Governor.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.hpp rename to src/Model/PowerFlow/Generator4Governor/Generator4Governor.hpp diff --git a/ComponentLib/PowerFlow/Generator4Param/CMakeLists.txt b/src/Model/PowerFlow/Generator4Param/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Generator4Param/CMakeLists.txt rename to src/Model/PowerFlow/Generator4Param/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Generator4Param/Generator4Param.cpp b/src/Model/PowerFlow/Generator4Param/Generator4Param.cpp similarity index 99% rename from ComponentLib/PowerFlow/Generator4Param/Generator4Param.cpp rename to src/Model/PowerFlow/Generator4Param/Generator4Param.cpp index c8b00b308..d0bb84561 100644 --- a/ComponentLib/PowerFlow/Generator4Param/Generator4Param.cpp +++ b/src/Model/PowerFlow/Generator4Param/Generator4Param.cpp @@ -60,7 +60,7 @@ #include #include -#include +#include #include "Generator4Param.hpp" namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Generator4Param/Generator4Param.hpp b/src/Model/PowerFlow/Generator4Param/Generator4Param.hpp similarity index 100% rename from ComponentLib/PowerFlow/Generator4Param/Generator4Param.hpp rename to src/Model/PowerFlow/Generator4Param/Generator4Param.hpp diff --git a/ComponentLib/PowerFlow/Load/CMakeLists.txt b/src/Model/PowerFlow/Load/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/Load/CMakeLists.txt rename to src/Model/PowerFlow/Load/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/Load/Load.cpp b/src/Model/PowerFlow/Load/Load.cpp similarity index 99% rename from ComponentLib/PowerFlow/Load/Load.cpp rename to src/Model/PowerFlow/Load/Load.cpp index 6a2ec8849..398623657 100644 --- a/ComponentLib/PowerFlow/Load/Load.cpp +++ b/src/Model/PowerFlow/Load/Load.cpp @@ -62,7 +62,7 @@ #include #include #include "Load.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerFlow/Load/Load.hpp b/src/Model/PowerFlow/Load/Load.hpp similarity index 100% rename from ComponentLib/PowerFlow/Load/Load.hpp rename to src/Model/PowerFlow/Load/Load.hpp diff --git a/ComponentLib/PowerFlow/Load/README.md b/src/Model/PowerFlow/Load/README.md similarity index 100% rename from ComponentLib/PowerFlow/Load/README.md rename to src/Model/PowerFlow/Load/README.md diff --git a/ComponentLib/PowerFlow/MiniGrid/CMakeLists.txt b/src/Model/PowerFlow/MiniGrid/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerFlow/MiniGrid/CMakeLists.txt rename to src/Model/PowerFlow/MiniGrid/CMakeLists.txt diff --git a/ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp b/src/Model/PowerFlow/MiniGrid/MiniGrid.cpp similarity index 99% rename from ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp rename to src/Model/PowerFlow/MiniGrid/MiniGrid.cpp index 1774b2c8c..c937f3d78 100644 --- a/ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp +++ b/src/Model/PowerFlow/MiniGrid/MiniGrid.cpp @@ -62,7 +62,7 @@ #include #include #include "MiniGrid.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp b/src/Model/PowerFlow/MiniGrid/MiniGrid.hpp similarity index 100% rename from ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp rename to src/Model/PowerFlow/MiniGrid/MiniGrid.hpp diff --git a/ComponentLib/PowerFlow/README.md b/src/Model/PowerFlow/README.md similarity index 100% rename from ComponentLib/PowerFlow/README.md rename to src/Model/PowerFlow/README.md diff --git a/SystemSteadyStateModel.hpp b/src/Model/PowerFlow/SystemModelPowerFlow.hpp similarity index 100% rename from SystemSteadyStateModel.hpp rename to src/Model/PowerFlow/SystemModelPowerFlow.hpp diff --git a/ModelEvaluator.hpp b/src/ModelEvaluator.hpp similarity index 99% rename from ModelEvaluator.hpp rename to src/ModelEvaluator.hpp index ad56fbd48..f502acf25 100644 --- a/ModelEvaluator.hpp +++ b/src/ModelEvaluator.hpp @@ -62,7 +62,7 @@ #include #include -#include +#include namespace ModelLib { diff --git a/ModelEvaluatorImpl.hpp b/src/ModelEvaluatorImpl.hpp similarity index 100% rename from ModelEvaluatorImpl.hpp rename to src/ModelEvaluatorImpl.hpp diff --git a/PowerSystemData.hpp b/src/PowerSystemData.hpp similarity index 100% rename from PowerSystemData.hpp rename to src/PowerSystemData.hpp diff --git a/ScalarTraits.hpp b/src/ScalarTraits.hpp similarity index 100% rename from ScalarTraits.hpp rename to src/ScalarTraits.hpp diff --git a/Solver/CMakeLists.txt b/src/Solver/CMakeLists.txt similarity index 100% rename from Solver/CMakeLists.txt rename to src/Solver/CMakeLists.txt diff --git a/Solver/Dynamic/CMakeLists.txt b/src/Solver/Dynamic/CMakeLists.txt similarity index 100% rename from Solver/Dynamic/CMakeLists.txt rename to src/Solver/Dynamic/CMakeLists.txt diff --git a/Solver/Dynamic/DynamicSolver.hpp b/src/Solver/Dynamic/DynamicSolver.hpp similarity index 100% rename from Solver/Dynamic/DynamicSolver.hpp rename to src/Solver/Dynamic/DynamicSolver.hpp diff --git a/Solver/Dynamic/Ida.cpp b/src/Solver/Dynamic/Ida.cpp similarity index 100% rename from Solver/Dynamic/Ida.cpp rename to src/Solver/Dynamic/Ida.cpp diff --git a/Solver/Dynamic/Ida.hpp b/src/Solver/Dynamic/Ida.hpp similarity index 100% rename from Solver/Dynamic/Ida.hpp rename to src/Solver/Dynamic/Ida.hpp diff --git a/Solver/Optimization/CMakeLists.txt b/src/Solver/Optimization/CMakeLists.txt similarity index 100% rename from Solver/Optimization/CMakeLists.txt rename to src/Solver/Optimization/CMakeLists.txt diff --git a/Solver/Optimization/DynamicConstraint.cpp b/src/Solver/Optimization/DynamicConstraint.cpp similarity index 100% rename from Solver/Optimization/DynamicConstraint.cpp rename to src/Solver/Optimization/DynamicConstraint.cpp diff --git a/Solver/Optimization/DynamicConstraint.hpp b/src/Solver/Optimization/DynamicConstraint.hpp similarity index 100% rename from Solver/Optimization/DynamicConstraint.hpp rename to src/Solver/Optimization/DynamicConstraint.hpp diff --git a/Solver/Optimization/DynamicObjective.cpp b/src/Solver/Optimization/DynamicObjective.cpp similarity index 100% rename from Solver/Optimization/DynamicObjective.cpp rename to src/Solver/Optimization/DynamicObjective.cpp diff --git a/Solver/Optimization/DynamicObjective.hpp b/src/Solver/Optimization/DynamicObjective.hpp similarity index 100% rename from Solver/Optimization/DynamicObjective.hpp rename to src/Solver/Optimization/DynamicObjective.hpp diff --git a/Solver/Optimization/OptimizationSolver.hpp b/src/Solver/Optimization/OptimizationSolver.hpp similarity index 100% rename from Solver/Optimization/OptimizationSolver.hpp rename to src/Solver/Optimization/OptimizationSolver.hpp diff --git a/Solver/SteadyState/CMakeLists.txt b/src/Solver/SteadyState/CMakeLists.txt similarity index 100% rename from Solver/SteadyState/CMakeLists.txt rename to src/Solver/SteadyState/CMakeLists.txt diff --git a/Solver/SteadyState/Kinsol.cpp b/src/Solver/SteadyState/Kinsol.cpp similarity index 100% rename from Solver/SteadyState/Kinsol.cpp rename to src/Solver/SteadyState/Kinsol.cpp diff --git a/Solver/SteadyState/Kinsol.hpp b/src/Solver/SteadyState/Kinsol.hpp similarity index 100% rename from Solver/SteadyState/Kinsol.hpp rename to src/Solver/SteadyState/Kinsol.hpp diff --git a/Solver/SteadyState/SteadyStateSolver.hpp b/src/Solver/SteadyState/SteadyStateSolver.hpp similarity index 100% rename from Solver/SteadyState/SteadyStateSolver.hpp rename to src/Solver/SteadyState/SteadyStateSolver.hpp diff --git a/SystemModel.hpp b/src/SystemModel.hpp similarity index 100% rename from SystemModel.hpp rename to src/SystemModel.hpp diff --git a/Utilities/CMakeLists.txt b/src/Utilities/CMakeLists.txt similarity index 100% rename from Utilities/CMakeLists.txt rename to src/Utilities/CMakeLists.txt diff --git a/Utilities/FileIO.hpp b/src/Utilities/FileIO.hpp similarity index 100% rename from Utilities/FileIO.hpp rename to src/Utilities/FileIO.hpp diff --git a/Utilities/Testing.hpp b/src/Utilities/Testing.hpp similarity index 100% rename from Utilities/Testing.hpp rename to src/Utilities/Testing.hpp