diff --git a/ComponentLib/CMakeLists.txt b/ComponentLib/CMakeLists.txt index 29a5a7988..a97c9734b 100644 --- a/ComponentLib/CMakeLists.txt +++ b/ComponentLib/CMakeLists.txt @@ -60,14 +60,6 @@ # - Cameron Rutherford #]] -add_subdirectory(Branch) -add_subdirectory(Bus) -add_subdirectory(Generator) -add_subdirectory(Generator2) -add_subdirectory(Generator4) -add_subdirectory(Generator4Governor) -add_subdirectory(Generator4Param) -add_subdirectory(Load) -add_subdirectory(MiniGrid) -add_subdirectory(PowerElectronicsComponents) +add_subdirectory(PowerFlow) +add_subdirectory(PowerElectronics) diff --git a/ComponentLib/Exciter/README.md b/ComponentLib/DynamicPhasor/Exciter/README.md similarity index 100% rename from ComponentLib/Exciter/README.md rename to ComponentLib/DynamicPhasor/Exciter/README.md diff --git a/ComponentLib/Governor/README.md b/ComponentLib/DynamicPhasor/Governor/README.md similarity index 100% rename from ComponentLib/Governor/README.md rename to ComponentLib/DynamicPhasor/Governor/README.md diff --git a/ComponentLib/Stabilizer/README.md b/ComponentLib/DynamicPhasor/Stabilizer/README.md similarity index 100% rename from ComponentLib/Stabilizer/README.md rename to ComponentLib/DynamicPhasor/Stabilizer/README.md diff --git a/ComponentLib/SynchronousMachine/GENROUwS/README.md b/ComponentLib/DynamicPhasor/SynchronousMachine/GENROUwS/README.md similarity index 100% rename from ComponentLib/SynchronousMachine/GENROUwS/README.md rename to ComponentLib/DynamicPhasor/SynchronousMachine/GENROUwS/README.md diff --git a/ComponentLib/SynchronousMachine/GENSALwS/README.md b/ComponentLib/DynamicPhasor/SynchronousMachine/GENSALwS/README.md similarity index 100% rename from ComponentLib/SynchronousMachine/GENSALwS/README.md rename to ComponentLib/DynamicPhasor/SynchronousMachine/GENSALwS/README.md diff --git a/ComponentLib/SynchronousMachine/README.md b/ComponentLib/DynamicPhasor/SynchronousMachine/README.md similarity index 100% rename from ComponentLib/SynchronousMachine/README.md rename to ComponentLib/DynamicPhasor/SynchronousMachine/README.md diff --git a/ComponentLib/PowerElectronicsComponents/CMakeLists.txt b/ComponentLib/PowerElectronics/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/CMakeLists.txt rename to ComponentLib/PowerElectronics/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/Capacitor/CMakeLists.txt b/ComponentLib/PowerElectronics/Capacitor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/Capacitor/CMakeLists.txt rename to ComponentLib/PowerElectronics/Capacitor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/Capacitor/Capacitor.cpp b/ComponentLib/PowerElectronics/Capacitor/Capacitor.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/Capacitor/Capacitor.cpp rename to ComponentLib/PowerElectronics/Capacitor/Capacitor.cpp diff --git a/ComponentLib/PowerElectronicsComponents/Capacitor/Capacitor.hpp b/ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/Capacitor/Capacitor.hpp rename to ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp index 5b5fb7132..9a54b6634 100644 --- a/ComponentLib/PowerElectronicsComponents/Capacitor/Capacitor.hpp +++ b/ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp b/ComponentLib/PowerElectronics/CircuitComponent.hpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp rename to ComponentLib/PowerElectronics/CircuitComponent.hpp diff --git a/ComponentLib/PowerElectronicsComponents/DistributedGenerator/CMakeLists.txt b/ComponentLib/PowerElectronics/DistributedGenerator/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/DistributedGenerator/CMakeLists.txt rename to ComponentLib/PowerElectronics/DistributedGenerator/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.cpp b/ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.cpp rename to ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp diff --git a/ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.hpp b/ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp similarity index 97% rename from ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.hpp rename to ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp index 9946f9a26..69f8e41a9 100644 --- a/ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.hpp +++ b/ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/InductionMotor/CMakeLists.txt b/ComponentLib/PowerElectronics/InductionMotor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/InductionMotor/CMakeLists.txt rename to ComponentLib/PowerElectronics/InductionMotor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/InductionMotor/InductionMotor.cpp b/ComponentLib/PowerElectronics/InductionMotor/InductionMotor.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/InductionMotor/InductionMotor.cpp rename to ComponentLib/PowerElectronics/InductionMotor/InductionMotor.cpp diff --git a/ComponentLib/PowerElectronicsComponents/InductionMotor/InductionMotor.hpp b/ComponentLib/PowerElectronics/InductionMotor/InductionMotor.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/InductionMotor/InductionMotor.hpp rename to ComponentLib/PowerElectronics/InductionMotor/InductionMotor.hpp index cb49f761f..5072a02f2 100644 --- a/ComponentLib/PowerElectronicsComponents/InductionMotor/InductionMotor.hpp +++ b/ComponentLib/PowerElectronics/InductionMotor/InductionMotor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/Inductor/CMakeLists.txt b/ComponentLib/PowerElectronics/Inductor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/Inductor/CMakeLists.txt rename to ComponentLib/PowerElectronics/Inductor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/Inductor/Inductor.cpp b/ComponentLib/PowerElectronics/Inductor/Inductor.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/Inductor/Inductor.cpp rename to ComponentLib/PowerElectronics/Inductor/Inductor.cpp diff --git a/ComponentLib/PowerElectronicsComponents/Inductor/Inductor.hpp b/ComponentLib/PowerElectronics/Inductor/Inductor.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/Inductor/Inductor.hpp rename to ComponentLib/PowerElectronics/Inductor/Inductor.hpp index 2b0f8ec69..e69e2aaf4 100644 --- a/ComponentLib/PowerElectronicsComponents/Inductor/Inductor.hpp +++ b/ComponentLib/PowerElectronics/Inductor/Inductor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/LinearTransformer/CMakeLists.txt b/ComponentLib/PowerElectronics/LinearTransformer/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/LinearTransformer/CMakeLists.txt rename to ComponentLib/PowerElectronics/LinearTransformer/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/LinearTransformer/LinearTransformer.cpp b/ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/LinearTransformer/LinearTransformer.cpp rename to ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.cpp diff --git a/ComponentLib/PowerElectronicsComponents/LinearTransformer/LinearTransformer.hpp b/ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/LinearTransformer/LinearTransformer.hpp rename to ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.hpp index 6d9a920c5..487f2de6e 100644 --- a/ComponentLib/PowerElectronicsComponents/LinearTransformer/LinearTransformer.hpp +++ b/ComponentLib/PowerElectronics/LinearTransformer/LinearTransformer.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/CMakeLists.txt b/ComponentLib/PowerElectronics/MicrogridBusDQ/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/CMakeLists.txt rename to ComponentLib/PowerElectronics/MicrogridBusDQ/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/MicrogridBusDQ.cpp b/ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/MicrogridBusDQ.cpp rename to ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.cpp diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/MicrogridBusDQ.hpp b/ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/MicrogridBusDQ.hpp rename to ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp index cc5280fa7..63d33ef4e 100644 --- a/ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/MicrogridBusDQ.hpp +++ b/ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridLine/CMakeLists.txt b/ComponentLib/PowerElectronics/MicrogridLine/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/MicrogridLine/CMakeLists.txt rename to ComponentLib/PowerElectronics/MicrogridLine/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridLine/MicrogridLine.cpp b/ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/MicrogridLine/MicrogridLine.cpp rename to ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.cpp diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridLine/MicrogridLine.hpp b/ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/MicrogridLine/MicrogridLine.hpp rename to ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp index 362cb4b63..ff25bd98c 100644 --- a/ComponentLib/PowerElectronicsComponents/MicrogridLine/MicrogridLine.hpp +++ b/ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib { diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridLoad/CMakeLists.txt b/ComponentLib/PowerElectronics/MicrogridLoad/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/MicrogridLoad/CMakeLists.txt rename to ComponentLib/PowerElectronics/MicrogridLoad/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridLoad/MicrogridLoad.cpp b/ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/MicrogridLoad/MicrogridLoad.cpp rename to ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.cpp diff --git a/ComponentLib/PowerElectronicsComponents/MicrogridLoad/MicrogridLoad.hpp b/ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/MicrogridLoad/MicrogridLoad.hpp rename to ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp index 69ad822a7..1ecd18f3b 100644 --- a/ComponentLib/PowerElectronicsComponents/MicrogridLoad/MicrogridLoad.hpp +++ b/ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/Resistor/CMakeLists.txt b/ComponentLib/PowerElectronics/Resistor/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/Resistor/CMakeLists.txt rename to ComponentLib/PowerElectronics/Resistor/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/Resistor/Resistor.cpp b/ComponentLib/PowerElectronics/Resistor/Resistor.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/Resistor/Resistor.cpp rename to ComponentLib/PowerElectronics/Resistor/Resistor.cpp diff --git a/ComponentLib/PowerElectronicsComponents/Resistor/Resistor.hpp b/ComponentLib/PowerElectronics/Resistor/Resistor.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/Resistor/Resistor.hpp rename to ComponentLib/PowerElectronics/Resistor/Resistor.hpp index 5ec5587b7..64995cba9 100644 --- a/ComponentLib/PowerElectronicsComponents/Resistor/Resistor.hpp +++ b/ComponentLib/PowerElectronics/Resistor/Resistor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/SynchronousMachine/CMakeLists.txt b/ComponentLib/PowerElectronics/SynchronousMachine/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/SynchronousMachine/CMakeLists.txt rename to ComponentLib/PowerElectronics/SynchronousMachine/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/SynchronousMachine/SynchronousMachine.cpp b/ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/SynchronousMachine/SynchronousMachine.cpp rename to ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.cpp diff --git a/ComponentLib/PowerElectronicsComponents/SynchronousMachine/SynchronousMachine.hpp b/ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp similarity index 97% rename from ComponentLib/PowerElectronicsComponents/SynchronousMachine/SynchronousMachine.hpp rename to ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp index 4681cb6fa..53cc60b54 100644 --- a/ComponentLib/PowerElectronicsComponents/SynchronousMachine/SynchronousMachine.hpp +++ b/ComponentLib/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/ComponentLib/PowerElectronicsComponents/TransmissionLine/CMakeLists.txt b/ComponentLib/PowerElectronics/TransmissionLine/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/TransmissionLine/CMakeLists.txt rename to ComponentLib/PowerElectronics/TransmissionLine/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/TransmissionLine/TransmissionLine.cpp b/ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/TransmissionLine/TransmissionLine.cpp rename to ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.cpp diff --git a/ComponentLib/PowerElectronicsComponents/TransmissionLine/TransmissionLine.hpp b/ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/TransmissionLine/TransmissionLine.hpp rename to ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.hpp index 63cd1e88d..c510d4c39 100644 --- a/ComponentLib/PowerElectronicsComponents/TransmissionLine/TransmissionLine.hpp +++ b/ComponentLib/PowerElectronics/TransmissionLine/TransmissionLine.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/PowerElectronicsComponents/VoltageSource/CMakeLists.txt b/ComponentLib/PowerElectronics/VoltageSource/CMakeLists.txt similarity index 100% rename from ComponentLib/PowerElectronicsComponents/VoltageSource/CMakeLists.txt rename to ComponentLib/PowerElectronics/VoltageSource/CMakeLists.txt diff --git a/ComponentLib/PowerElectronicsComponents/VoltageSource/VoltageSource.cpp b/ComponentLib/PowerElectronics/VoltageSource/VoltageSource.cpp similarity index 100% rename from ComponentLib/PowerElectronicsComponents/VoltageSource/VoltageSource.cpp rename to ComponentLib/PowerElectronics/VoltageSource/VoltageSource.cpp diff --git a/ComponentLib/PowerElectronicsComponents/VoltageSource/VoltageSource.hpp b/ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp similarity index 96% rename from ComponentLib/PowerElectronicsComponents/VoltageSource/VoltageSource.hpp rename to ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp index 89c13d3f0..e464feb8e 100644 --- a/ComponentLib/PowerElectronicsComponents/VoltageSource/VoltageSource.hpp +++ b/ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace ModelLib diff --git a/ComponentLib/Branch/Branch.cpp b/ComponentLib/PowerFlow/Branch/Branch.cpp similarity index 96% rename from ComponentLib/Branch/Branch.cpp rename to ComponentLib/PowerFlow/Branch/Branch.cpp index 5adf0268a..f34dcf6e4 100644 --- a/ComponentLib/Branch/Branch.cpp +++ b/ComponentLib/PowerFlow/Branch/Branch.cpp @@ -59,7 +59,7 @@ #include #include -#include +#include #include #include "Branch.hpp" diff --git a/ComponentLib/Branch/Branch.hpp b/ComponentLib/PowerFlow/Branch/Branch.hpp similarity index 100% rename from ComponentLib/Branch/Branch.hpp rename to ComponentLib/PowerFlow/Branch/Branch.hpp diff --git a/ComponentLib/Branch/CMakeLists.txt b/ComponentLib/PowerFlow/Branch/CMakeLists.txt similarity index 100% rename from ComponentLib/Branch/CMakeLists.txt rename to ComponentLib/PowerFlow/Branch/CMakeLists.txt diff --git a/ComponentLib/Branch/README.md b/ComponentLib/PowerFlow/Branch/README.md similarity index 100% rename from ComponentLib/Branch/README.md rename to ComponentLib/PowerFlow/Branch/README.md diff --git a/ComponentLib/Bus/BaseBus.hpp b/ComponentLib/PowerFlow/Bus/BaseBus.hpp similarity index 100% rename from ComponentLib/Bus/BaseBus.hpp rename to ComponentLib/PowerFlow/Bus/BaseBus.hpp diff --git a/ComponentLib/Bus/BusFactory.hpp b/ComponentLib/PowerFlow/Bus/BusFactory.hpp similarity index 96% rename from ComponentLib/Bus/BusFactory.hpp rename to ComponentLib/PowerFlow/Bus/BusFactory.hpp index 68fc5578e..433ae0063 100644 --- a/ComponentLib/Bus/BusFactory.hpp +++ b/ComponentLib/PowerFlow/Bus/BusFactory.hpp @@ -60,9 +60,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace ModelLib { diff --git a/ComponentLib/Bus/BusPQ.cpp b/ComponentLib/PowerFlow/Bus/BusPQ.cpp similarity index 100% rename from ComponentLib/Bus/BusPQ.cpp rename to ComponentLib/PowerFlow/Bus/BusPQ.cpp diff --git a/ComponentLib/Bus/BusPQ.hpp b/ComponentLib/PowerFlow/Bus/BusPQ.hpp similarity index 100% rename from ComponentLib/Bus/BusPQ.hpp rename to ComponentLib/PowerFlow/Bus/BusPQ.hpp diff --git a/ComponentLib/Bus/BusPV.cpp b/ComponentLib/PowerFlow/Bus/BusPV.cpp similarity index 100% rename from ComponentLib/Bus/BusPV.cpp rename to ComponentLib/PowerFlow/Bus/BusPV.cpp diff --git a/ComponentLib/Bus/BusPV.hpp b/ComponentLib/PowerFlow/Bus/BusPV.hpp similarity index 100% rename from ComponentLib/Bus/BusPV.hpp rename to ComponentLib/PowerFlow/Bus/BusPV.hpp diff --git a/ComponentLib/Bus/BusSlack.cpp b/ComponentLib/PowerFlow/Bus/BusSlack.cpp similarity index 100% rename from ComponentLib/Bus/BusSlack.cpp rename to ComponentLib/PowerFlow/Bus/BusSlack.cpp diff --git a/ComponentLib/Bus/BusSlack.hpp b/ComponentLib/PowerFlow/Bus/BusSlack.hpp similarity index 100% rename from ComponentLib/Bus/BusSlack.hpp rename to ComponentLib/PowerFlow/Bus/BusSlack.hpp diff --git a/ComponentLib/Bus/CMakeLists.txt b/ComponentLib/PowerFlow/Bus/CMakeLists.txt similarity index 100% rename from ComponentLib/Bus/CMakeLists.txt rename to ComponentLib/PowerFlow/Bus/CMakeLists.txt diff --git a/ComponentLib/Bus/README.md b/ComponentLib/PowerFlow/Bus/README.md similarity index 100% rename from ComponentLib/Bus/README.md rename to ComponentLib/PowerFlow/Bus/README.md diff --git a/ComponentLib/PowerFlow/CMakeLists.txt b/ComponentLib/PowerFlow/CMakeLists.txt new file mode 100644 index 000000000..6d5c15728 --- /dev/null +++ b/ComponentLib/PowerFlow/CMakeLists.txt @@ -0,0 +1,14 @@ +# [[ +# Author(s): +# - Cameron Rutherford +#]] + +add_subdirectory(Branch) +add_subdirectory(Bus) +add_subdirectory(Generator) +add_subdirectory(Generator2) +add_subdirectory(Generator4) +add_subdirectory(Generator4Governor) +add_subdirectory(Generator4Param) +add_subdirectory(Load) +add_subdirectory(MiniGrid) diff --git a/ComponentLib/Generator/CMakeLists.txt b/ComponentLib/PowerFlow/Generator/CMakeLists.txt similarity index 100% rename from ComponentLib/Generator/CMakeLists.txt rename to ComponentLib/PowerFlow/Generator/CMakeLists.txt diff --git a/ComponentLib/Generator/GeneratorBase.hpp b/ComponentLib/PowerFlow/Generator/GeneratorBase.hpp similarity index 100% rename from ComponentLib/Generator/GeneratorBase.hpp rename to ComponentLib/PowerFlow/Generator/GeneratorBase.hpp diff --git a/ComponentLib/Generator/GeneratorFactory.hpp b/ComponentLib/PowerFlow/Generator/GeneratorFactory.hpp similarity index 94% rename from ComponentLib/Generator/GeneratorFactory.hpp rename to ComponentLib/PowerFlow/Generator/GeneratorFactory.hpp index ccb2c07e1..0395aae63 100644 --- a/ComponentLib/Generator/GeneratorFactory.hpp +++ b/ComponentLib/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/Generator/GeneratorPQ.cpp b/ComponentLib/PowerFlow/Generator/GeneratorPQ.cpp similarity index 99% rename from ComponentLib/Generator/GeneratorPQ.cpp rename to ComponentLib/PowerFlow/Generator/GeneratorPQ.cpp index 981ec786b..2387f4bd0 100644 --- a/ComponentLib/Generator/GeneratorPQ.cpp +++ b/ComponentLib/PowerFlow/Generator/GeneratorPQ.cpp @@ -62,7 +62,7 @@ #include #include #include "GeneratorPQ.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/Generator/GeneratorPQ.hpp b/ComponentLib/PowerFlow/Generator/GeneratorPQ.hpp similarity index 100% rename from ComponentLib/Generator/GeneratorPQ.hpp rename to ComponentLib/PowerFlow/Generator/GeneratorPQ.hpp diff --git a/ComponentLib/Generator/GeneratorPV.cpp b/ComponentLib/PowerFlow/Generator/GeneratorPV.cpp similarity index 99% rename from ComponentLib/Generator/GeneratorPV.cpp rename to ComponentLib/PowerFlow/Generator/GeneratorPV.cpp index f6e4bd447..52af4d239 100644 --- a/ComponentLib/Generator/GeneratorPV.cpp +++ b/ComponentLib/PowerFlow/Generator/GeneratorPV.cpp @@ -62,7 +62,7 @@ #include #include #include "GeneratorPV.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/Generator/GeneratorPV.hpp b/ComponentLib/PowerFlow/Generator/GeneratorPV.hpp similarity index 100% rename from ComponentLib/Generator/GeneratorPV.hpp rename to ComponentLib/PowerFlow/Generator/GeneratorPV.hpp diff --git a/ComponentLib/Generator/GeneratorSlack.cpp b/ComponentLib/PowerFlow/Generator/GeneratorSlack.cpp similarity index 99% rename from ComponentLib/Generator/GeneratorSlack.cpp rename to ComponentLib/PowerFlow/Generator/GeneratorSlack.cpp index de97c4752..a5c89892b 100644 --- a/ComponentLib/Generator/GeneratorSlack.cpp +++ b/ComponentLib/PowerFlow/Generator/GeneratorSlack.cpp @@ -62,7 +62,7 @@ #include #include #include "GeneratorSlack.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/Generator/GeneratorSlack.hpp b/ComponentLib/PowerFlow/Generator/GeneratorSlack.hpp similarity index 100% rename from ComponentLib/Generator/GeneratorSlack.hpp rename to ComponentLib/PowerFlow/Generator/GeneratorSlack.hpp diff --git a/ComponentLib/Generator2/CMakeLists.txt b/ComponentLib/PowerFlow/Generator2/CMakeLists.txt similarity index 100% rename from ComponentLib/Generator2/CMakeLists.txt rename to ComponentLib/PowerFlow/Generator2/CMakeLists.txt diff --git a/ComponentLib/Generator2/Generator2.cpp b/ComponentLib/PowerFlow/Generator2/Generator2.cpp similarity index 99% rename from ComponentLib/Generator2/Generator2.cpp rename to ComponentLib/PowerFlow/Generator2/Generator2.cpp index 132475937..515cbc514 100644 --- a/ComponentLib/Generator2/Generator2.cpp +++ b/ComponentLib/PowerFlow/Generator2/Generator2.cpp @@ -59,7 +59,7 @@ #include #include -#include +#include #include "Generator2.hpp" namespace ModelLib { diff --git a/ComponentLib/Generator2/Generator2.hpp b/ComponentLib/PowerFlow/Generator2/Generator2.hpp similarity index 100% rename from ComponentLib/Generator2/Generator2.hpp rename to ComponentLib/PowerFlow/Generator2/Generator2.hpp diff --git a/ComponentLib/Generator4/CMakeLists.txt b/ComponentLib/PowerFlow/Generator4/CMakeLists.txt similarity index 100% rename from ComponentLib/Generator4/CMakeLists.txt rename to ComponentLib/PowerFlow/Generator4/CMakeLists.txt diff --git a/ComponentLib/Generator4/Generator4.cpp b/ComponentLib/PowerFlow/Generator4/Generator4.cpp similarity index 99% rename from ComponentLib/Generator4/Generator4.cpp rename to ComponentLib/PowerFlow/Generator4/Generator4.cpp index f6a70e7b2..9cfdbe3d7 100644 --- a/ComponentLib/Generator4/Generator4.cpp +++ b/ComponentLib/PowerFlow/Generator4/Generator4.cpp @@ -60,7 +60,7 @@ #include #include -#include +#include #include "Generator4.hpp" namespace ModelLib { diff --git a/ComponentLib/Generator4/Generator4.hpp b/ComponentLib/PowerFlow/Generator4/Generator4.hpp similarity index 100% rename from ComponentLib/Generator4/Generator4.hpp rename to ComponentLib/PowerFlow/Generator4/Generator4.hpp diff --git a/ComponentLib/Generator4Governor/CMakeLists.txt b/ComponentLib/PowerFlow/Generator4Governor/CMakeLists.txt similarity index 100% rename from ComponentLib/Generator4Governor/CMakeLists.txt rename to ComponentLib/PowerFlow/Generator4Governor/CMakeLists.txt diff --git a/ComponentLib/Generator4Governor/Generator4Governor.cpp b/ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.cpp similarity index 99% rename from ComponentLib/Generator4Governor/Generator4Governor.cpp rename to ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.cpp index 0bd2fc1fb..db262138a 100644 --- a/ComponentLib/Generator4Governor/Generator4Governor.cpp +++ b/ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.cpp @@ -61,7 +61,7 @@ #include #include #include "Generator4Governor.hpp" -#include "ComponentLib/Bus/BaseBus.hpp" +#include "ComponentLib/PowerFlow/Bus/BaseBus.hpp" namespace ModelLib { diff --git a/ComponentLib/Generator4Governor/Generator4Governor.hpp b/ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.hpp similarity index 100% rename from ComponentLib/Generator4Governor/Generator4Governor.hpp rename to ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.hpp diff --git a/ComponentLib/Generator4Param/CMakeLists.txt b/ComponentLib/PowerFlow/Generator4Param/CMakeLists.txt similarity index 100% rename from ComponentLib/Generator4Param/CMakeLists.txt rename to ComponentLib/PowerFlow/Generator4Param/CMakeLists.txt diff --git a/ComponentLib/Generator4Param/Generator4Param.cpp b/ComponentLib/PowerFlow/Generator4Param/Generator4Param.cpp similarity index 99% rename from ComponentLib/Generator4Param/Generator4Param.cpp rename to ComponentLib/PowerFlow/Generator4Param/Generator4Param.cpp index 36e3c193c..c8b00b308 100644 --- a/ComponentLib/Generator4Param/Generator4Param.cpp +++ b/ComponentLib/PowerFlow/Generator4Param/Generator4Param.cpp @@ -60,7 +60,7 @@ #include #include -#include +#include #include "Generator4Param.hpp" namespace ModelLib { diff --git a/ComponentLib/Generator4Param/Generator4Param.hpp b/ComponentLib/PowerFlow/Generator4Param/Generator4Param.hpp similarity index 100% rename from ComponentLib/Generator4Param/Generator4Param.hpp rename to ComponentLib/PowerFlow/Generator4Param/Generator4Param.hpp diff --git a/ComponentLib/Generator4Param/static_data.hpp b/ComponentLib/PowerFlow/Generator4Param/static_data.hpp similarity index 100% rename from ComponentLib/Generator4Param/static_data.hpp rename to ComponentLib/PowerFlow/Generator4Param/static_data.hpp diff --git a/ComponentLib/Load/CMakeLists.txt b/ComponentLib/PowerFlow/Load/CMakeLists.txt similarity index 100% rename from ComponentLib/Load/CMakeLists.txt rename to ComponentLib/PowerFlow/Load/CMakeLists.txt diff --git a/ComponentLib/Load/Load.cpp b/ComponentLib/PowerFlow/Load/Load.cpp similarity index 99% rename from ComponentLib/Load/Load.cpp rename to ComponentLib/PowerFlow/Load/Load.cpp index 65d44cfc5..6a2ec8849 100644 --- a/ComponentLib/Load/Load.cpp +++ b/ComponentLib/PowerFlow/Load/Load.cpp @@ -62,7 +62,7 @@ #include #include #include "Load.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/Load/Load.hpp b/ComponentLib/PowerFlow/Load/Load.hpp similarity index 100% rename from ComponentLib/Load/Load.hpp rename to ComponentLib/PowerFlow/Load/Load.hpp diff --git a/ComponentLib/Load/README.md b/ComponentLib/PowerFlow/Load/README.md similarity index 100% rename from ComponentLib/Load/README.md rename to ComponentLib/PowerFlow/Load/README.md diff --git a/ComponentLib/MiniGrid/CMakeLists.txt b/ComponentLib/PowerFlow/MiniGrid/CMakeLists.txt similarity index 100% rename from ComponentLib/MiniGrid/CMakeLists.txt rename to ComponentLib/PowerFlow/MiniGrid/CMakeLists.txt diff --git a/ComponentLib/MiniGrid/MiniGrid.cpp b/ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp similarity index 99% rename from ComponentLib/MiniGrid/MiniGrid.cpp rename to ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp index fbcfe1491..1774b2c8c 100644 --- a/ComponentLib/MiniGrid/MiniGrid.cpp +++ b/ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp @@ -62,7 +62,7 @@ #include #include #include "MiniGrid.hpp" -#include +#include namespace ModelLib { diff --git a/ComponentLib/MiniGrid/MiniGrid.hpp b/ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp similarity index 100% rename from ComponentLib/MiniGrid/MiniGrid.hpp rename to ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp diff --git a/ComponentLib/README.md b/ComponentLib/PowerFlow/README.md similarity index 99% rename from ComponentLib/README.md rename to ComponentLib/PowerFlow/README.md index 93c2bc349..7162738fc 100644 --- a/ComponentLib/README.md +++ b/ComponentLib/PowerFlow/README.md @@ -1,6 +1,7 @@ ## Component Models GridKit™ provides component models for power flow and electromechanical transient simulations, as well as experimental component models for dynamic constrained optimal power flow analysis. GridKit™ assembles components into a grid model using power flow equations. + ## Network Equations The relation between all the bus current injections and bus voltage is given by the following node equation: diff --git a/Examples/AdjointSensitivity/AdjointSensitivity.cpp b/Examples/AdjointSensitivity/AdjointSensitivity.cpp index 9c35d2006..78c57bfc6 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/DistributedGeneratorTest/DGTest.cpp b/Examples/DistributedGeneratorTest/DGTest.cpp index d1f58c5c8..c33f1f481 100644 --- a/Examples/DistributedGeneratorTest/DGTest.cpp +++ b/Examples/DistributedGeneratorTest/DGTest.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include /** diff --git a/Examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp b/Examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp index 80f36fc13..f765647b0 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/GenConstLoad/GenConstLoad.cpp b/Examples/GenConstLoad/GenConstLoad.cpp index 744f0a86b..fbbc271ec 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/GenInfiniteBus.cpp b/Examples/GenInfiniteBus/GenInfiniteBus.cpp index f366a5a8a..938132ed8 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/Grid3BusSys.cpp b/Examples/Grid3Bus/Grid3BusSys.cpp index 1248f6aa8..e34827cf2 100644 --- a/Examples/Grid3Bus/Grid3BusSys.cpp +++ b/Examples/Grid3Bus/Grid3BusSys.cpp @@ -73,11 +73,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/Examples/Microgrid/Microgrid.cpp b/Examples/Microgrid/Microgrid.cpp index 306394378..ea6d203b5 100644 --- a/Examples/Microgrid/Microgrid.cpp +++ b/Examples/Microgrid/Microgrid.cpp @@ -8,10 +8,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/Examples/ParameterEstimation/ParameterEstimation.cpp b/Examples/ParameterEstimation/ParameterEstimation.cpp index 874195552..5e69e600d 100644 --- a/Examples/ParameterEstimation/ParameterEstimation.cpp +++ b/Examples/ParameterEstimation/ParameterEstimation.cpp @@ -61,8 +61,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/Examples/RLCircuit/RLCircuit.cpp b/Examples/RLCircuit/RLCircuit.cpp index 770307d8c..f1c5a6b3f 100644 --- a/Examples/RLCircuit/RLCircuit.cpp +++ b/Examples/RLCircuit/RLCircuit.cpp @@ -6,10 +6,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp b/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp index 7a4b997ef..3e978a711 100644 --- a/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp +++ b/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp @@ -8,10 +8,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/PowerElectronicsModel.hpp b/PowerElectronicsModel.hpp index ef109b926..0099eaf27 100644 --- a/PowerElectronicsModel.hpp +++ b/PowerElectronicsModel.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace ModelLib {