NRSE low level design

power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/block_matrix.hpp

@@ -12,7 +12,7 @@
 #include "../power_grid_model.hpp"
 #include "../three_phase_tensor.hpp"
 
-namespace power_grid_model::math_model_impl {
+namespace power_grid_model::math_solver {
 
 template <scalar_value T, bool sym, bool is_tensor, int n_sub_block> struct block_trait {
     static constexpr int n_row = sym ? n_sub_block : n_sub_block * 3;
@@ -64,6 +64,6 @@ class Block : public block_trait<T, sym, is_tensor, n_sub_block>::ArrayType {
     }
 };
 
-} // namespace power_grid_model::math_model_impl
+} // namespace power_grid_model::math_solver
 
 #endif

power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/common_solver_functions.hpp

@@ -10,7 +10,7 @@
 
 #include "../calculation_parameters.hpp"
 
-namespace power_grid_model::common_solver_functions {
+namespace power_grid_model::math_solver::detail {
 
 template <bool sym>
 inline void add_sources(IdxRange const& sources, Idx /* bus_number */, YBus<sym> const& y_bus,
@@ -91,12 +91,12 @@ inline void calculate_result(YBus<sym> const& y_bus, PowerFlowInput<sym> const&
     output.bus_injection.resize(sources_per_bus.size());
 
     for (auto const& [bus_number, sources, load_gens] : enumerated_zip_sequence(sources_per_bus, load_gens_per_bus)) {
-        common_solver_functions::calculate_source_result<sym>(sources, bus_number, y_bus, input, output);
-        common_solver_functions::calculate_load_gen_result<sym>(load_gens, bus_number, input, output, load_gen_func);
+        calculate_source_result<sym>(sources, bus_number, y_bus, input, output);
+        calculate_load_gen_result<sym>(load_gens, bus_number, input, output, load_gen_func);
     }
     output.bus_injection = y_bus.calculate_injection(output.u);
 }
 
-} // namespace power_grid_model::common_solver_functions
+} // namespace power_grid_model::math_solver::detail
 
 #endif

power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp

@@ -69,7 +69,7 @@ Iterative Power Flow
 namespace power_grid_model {
 
 // hide implementation in inside namespace
-namespace math_model_impl {
+namespace math_solver {
 
 // solver
 template <bool sym> class IterativeCurrentPFSolver : public IterativePFSolver<sym, IterativeCurrentPFSolver<sym>> {
@@ -91,7 +91,7 @@ template <bool sym> class IterativeCurrentPFSolver : public IterativePFSolver<sy
         // re-build matrix and prefactorize Build y bus data with source admittance
         if (y_data_ptr_ != &y_bus.admittance()) {
             ComplexTensorVector<sym> mat_data(y_bus.nnz_lu());
-            common_solver_functions::copy_y_bus<sym>(y_bus, mat_data);
+            detail::copy_y_bus<sym>(y_bus, mat_data);
 
             for (auto const& [bus_number, sources] : enumerated_zip_sequence(sources_per_bus)) {
                 Idx const data_sequence = bus_entry[bus_number];
@@ -193,9 +193,9 @@ template <bool sym> class IterativeCurrentPFSolver : public IterativePFSolver<sy
 template class IterativeCurrentPFSolver<true>;
 template class IterativeCurrentPFSolver<false>;
 
-} // namespace math_model_impl
+} // namespace math_solver
 
-template <bool sym> using IterativeCurrentPFSolver = math_model_impl::IterativeCurrentPFSolver<sym>;
+template <bool sym> using IterativeCurrentPFSolver = math_solver::IterativeCurrentPFSolver<sym>;
 
 } // namespace power_grid_model
 

power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp

@@ -20,7 +20,7 @@
 #include "../three_phase_tensor.hpp"
 #include "../timer.hpp"
 
-namespace power_grid_model::math_model_impl {
+namespace power_grid_model::math_solver {
 
 // solver
 template <bool sym, typename DerivedSolver> class IterativePFSolver {
@@ -102,8 +102,8 @@ template <bool sym, typename DerivedSolver> class IterativePFSolver {
     }
 
     void calculate_result(YBus<sym> const& y_bus, PowerFlowInput<sym> const& input, MathOutput<sym>& output) {
-        common_solver_functions::calculate_result(y_bus, input, *sources_per_bus_, *load_gens_per_bus_, output,
-                                                  [this](Idx i) { return (*load_gen_type_)[i]; });
+        detail::calculate_result(y_bus, input, *sources_per_bus_, *load_gens_per_bus_, output,
+                                 [this](Idx i) { return (*load_gen_type_)[i]; });
     }
 
   private:
@@ -120,6 +120,6 @@ template <bool sym, typename DerivedSolver> class IterativePFSolver {
           load_gen_type_{topo_ptr, &topo_ptr->load_gen_type} {}
 };
 
-} // namespace power_grid_model::math_model_impl
+} // namespace power_grid_model::math_solver
 
 #endif

power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp

@@ -42,6 +42,8 @@ if there are sources
 
 namespace power_grid_model {
 
+namespace math_solver {
+
 template <bool sym> class LinearPFSolver {
 
   public:
@@ -63,7 +65,7 @@ template <bool sym> class LinearPFSolver {
 
         // prepare matrix
         Timer sub_timer(calculation_info, 2221, "Prepare matrix");
-        common_solver_functions::copy_y_bus<sym>(y_bus, mat_data_);
+        detail::copy_y_bus<sym>(y_bus, mat_data_);
         prepare_matrix_and_rhs(y_bus, input, output);
 
         // solve
@@ -91,7 +93,7 @@ template <bool sym> class LinearPFSolver {
     typename SparseLUSolver<ComplexTensor<sym>, ComplexValue<sym>, ComplexValue<sym>>::BlockPermArray perm_;
 
     void prepare_matrix_and_rhs(YBus<sym> const& y_bus, PowerFlowInput<sym> const& input, MathOutput<sym>& output) {
-        using common_solver_functions::add_sources;
+        using detail::add_sources;
 
         IdxVector const& bus_entry = y_bus.lu_diag();
         for (auto const& [bus_number, load_gens, sources] :
@@ -113,13 +115,16 @@ template <bool sym> class LinearPFSolver {
     }
 
     void calculate_result(YBus<sym> const& y_bus, PowerFlowInput<sym> const& input, MathOutput<sym>& output) {
-        common_solver_functions::calculate_result(y_bus, input, *sources_per_bus_, *load_gens_per_bus_, output,
-                                                  [](Idx /*i*/) { return LoadGenType::const_y; });
+        detail::calculate_result(y_bus, input, *sources_per_bus_, *load_gens_per_bus_, output,
+                                 [](Idx /*i*/) { return LoadGenType::const_y; });
     }
 };
 
 template class LinearPFSolver<true>;
 template class LinearPFSolver<false>;
+} // namespace math_solver
+
+template <bool sym> using LinearPFSolver = math_solver::LinearPFSolver<sym>;
 
 } // namespace power_grid_model
 

power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp

@@ -24,6 +24,8 @@
 
 namespace power_grid_model {
 
+namespace math_solver {
+
 template <bool sym> class MathSolver {
   public:
     explicit MathSolver(std::shared_ptr<MathModelTopology const> const& topo_ptr)
@@ -171,6 +173,9 @@ template <bool sym> class MathSolver {
 
 template class MathSolver<true>;
 template class MathSolver<false>;
+} // namespace math_solver
+
+template <bool sym> using MathSolver = math_solver::MathSolver<sym>;
 
 } // namespace power_grid_model