Separate compilation units and targets for SystemModel

GridKit/Model/PhasorDynamics/CMakeLists.txt

@@ -8,33 +8,50 @@ add_library(phasor_dynamics_components_dependency_tracking INTERFACE)
 
 gridkit_add_library(
   phasor_dynamics_core
-  SOURCES SystemModelData.cpp
+  INTERFACE_TARGET
   HEADERS BusBase.hpp
           Component.hpp
           ComponentData.hpp
           ComponentLibrary.hpp
           ComponentSignals.hpp
-          SystemModel.hpp
-          SystemModelData.hpp
   LINK_LIBRARIES
-    PUBLIC
+    INTERFACE
     GridKit::definitions
-    PUBLIC
+    INTERFACE
     GridKit::utilities_logger
-    PUBLIC
-    GridKit::sparse_matrix
+    INTERFACE
+    GridKit::sparse_matrix)
+
+target_link_libraries(
+  phasor_dynamics_components
+  INTERFACE GridKit::phasor_dynamics_core)
+target_link_libraries(
+  phasor_dynamics_components_dependency_tracking
+  INTERFACE GridKit::phasor_dynamics_core)
+
+gridkit_add_library(
+  phasor_dynamics_systemmodel
+  SOURCES SystemModel.cpp SystemModelData.cpp
+  HEADERS SystemModel.hpp SystemModelData.hpp
+  LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core
   INCLUDE_DIRECTORIES
     PRIVATE
     ${GRIDKIT_THIRD_PARTY_DIR}/nlohmann-json/include
     PRIVATE
     ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include)
 
+gridkit_add_library(
+  phasor_dynamics_systemmodel_dependency_tracking
+  SOURCES SystemModelDependencyTracking.cpp
+  HEADERS SystemModel.hpp
+  LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core)
+
 target_link_libraries(
   phasor_dynamics_components
-  INTERFACE GridKit::phasor_dynamics_core)
+  INTERFACE GridKit::phasor_dynamics_systemmodel)
 target_link_libraries(
   phasor_dynamics_components_dependency_tracking
-  INTERFACE GridKit::phasor_dynamics_core)
+  INTERFACE GridKit::phasor_dynamics_systemmodel_dependency_tracking)
 
 add_subdirectory(Branch)
 add_subdirectory(Bus)

GridKit/Model/PhasorDynamics/ComponentLibrary.hpp

@@ -2,6 +2,7 @@
 
 #include <GridKit/Model/PhasorDynamics/Branch/Branch.hpp>
 #include <GridKit/Model/PhasorDynamics/Bus/Bus.hpp>
+#include <GridKit/Model/PhasorDynamics/Bus/BusInfinite.hpp>
 #include <GridKit/Model/PhasorDynamics/BusFault/BusFault.hpp>
 #include <GridKit/Model/PhasorDynamics/BusToSignalAdapter/BusToSignalAdapter.hpp>
 #include <GridKit/Model/PhasorDynamics/Exciter/IEEET1/Ieeet1.hpp>

GridKit/Model/PhasorDynamics/SystemModel.cpp

@@ -0,0 +1,12 @@
+#include "SystemModelImpl.hpp"
+
+namespace GridKit
+{
+  namespace PhasorDynamics
+  {
+    // Available template instantiations
+    // template class SystemModel<double, long int>;
+    template class SystemModel<double, size_t>;
+
+  } // namespace PhasorDynamics
+} // namespace GridKit