diff --git a/include/micm/solver/lu_decomposition.hpp b/include/micm/solver/lu_decomposition.hpp index 9c04fb8c8..66861fea7 100644 --- a/include/micm/solver/lu_decomposition.hpp +++ b/include/micm/solver/lu_decomposition.hpp @@ -3,8 +3,8 @@ #pragma once #include "lu_decomposition_doolittle.hpp" -#include "lu_decomposition_mozart.hpp" #include "lu_decomposition_doolittle_in_place.hpp" +#include "lu_decomposition_mozart.hpp" #include "lu_decomposition_mozart_in_place.hpp" #include diff --git a/include/micm/solver/lu_decomposition_doolittle_in_place.inl b/include/micm/solver/lu_decomposition_doolittle_in_place.inl index 514ead06c..93535029c 100644 --- a/include/micm/solver/lu_decomposition_doolittle_in_place.inl +++ b/include/micm/solver/lu_decomposition_doolittle_in_place.inl @@ -179,16 +179,16 @@ namespace micm const std::size_t ALU_BlockSize = ALU.NumberOfBlocks(); constexpr std::size_t ALU_GroupVectorSize = SparseMatrixPolicy::GroupVectorSize(); const std::size_t ALU_GroupSizeOfFlatBlockSize = ALU.GroupSize(); - + // Loop over groups of blocks for (std::size_t i_group = 0; i_group < ALU.NumberOfGroups(ALU_BlockSize); ++i_group) { - auto ALU_vector = std::next(ALU.AsVector().begin(), i_group * ALU_GroupSizeOfFlatBlockSize); + auto ALU_vector = std::next(ALU.AsVector().begin(), i_group * ALU_GroupSizeOfFlatBlockSize); const std::size_t n_cells = std::min(ALU_GroupVectorSize, ALU_BlockSize - i_group * ALU_GroupVectorSize); auto aik_njk = aik_njk_.begin(); auto aij_ajk = aij_ajk_.begin(); auto aki_nji = aki_nji_.begin(); - auto akj_aji = akj_aji_.begin(); + auto akj_aji = akj_aji_.begin(); for (const auto& nik_nki_aii : nik_nki_aii_) { for (std::size_t ik = 0; ik < std::get<0>(nik_nki_aii); ++ik) @@ -213,7 +213,7 @@ namespace micm ALU_vector[aki_nji->first + i] /= ALU_vector[std::get<2>(nik_nki_aii) + i]; ++aki_nji; } - } + } } } diff --git a/include/micm/solver/solver_builder.hpp b/include/micm/solver/solver_builder.hpp index 0f6c33f2f..066871bc8 100644 --- a/include/micm/solver/solver_builder.hpp +++ b/include/micm/solver/solver_builder.hpp @@ -137,7 +137,7 @@ namespace micm State>; /// @brief Builder of CPU-based general solvers with in-place LU decomposition - /// @tparam SolverParametersPolicy Parameters for the ODE solver + /// @tparam SolverParametersPolicy Parameters for the ODE solver /// @tparam DenseMatrixPolicy Policy for dense matrices /// @tparam SparseMatrixPolicy Policy for sparse matrices /// @tparam LuDecompositionPolicy Policy for the LU decomposition diff --git a/test/integration/test_analytical_backward_euler.cpp b/test/integration/test_analytical_backward_euler.cpp index 5337c7213..9ed9653ad 100644 --- a/test/integration/test_analytical_backward_euler.cpp +++ b/test/integration/test_analytical_backward_euler.cpp @@ -99,16 +99,19 @@ auto backward_euler_vector_mozart_csc_1 = VectorBackwardEulerMozartCSC<1>(micm:: auto backward_euler_vector_mozart_csc_2 = VectorBackwardEulerMozartCSC<2>(micm::BackwardEulerSolverParameters()); auto backward_euler_vector_mozart_csc_3 = VectorBackwardEulerMozartCSC<3>(micm::BackwardEulerSolverParameters()); auto backward_euler_vector_mozart_csc_4 = VectorBackwardEulerMozartCSC<4>(micm::BackwardEulerSolverParameters()); -auto backward_euler_vector_doolittle_in_place_1 = VectorBackwardEulerDoolittleInPlace<1>(micm::BackwardEulerSolverParameters()); -auto backward_euler_vector_doolittle_in_place_2 = VectorBackwardEulerDoolittleInPlace<2>(micm::BackwardEulerSolverParameters()); -auto backward_euler_vector_doolittle_in_place_3 = VectorBackwardEulerDoolittleInPlace<3>(micm::BackwardEulerSolverParameters()); -auto backward_euler_vector_doolittle_in_place_4 = VectorBackwardEulerDoolittleInPlace<4>(micm::BackwardEulerSolverParameters()); +auto backward_euler_vector_doolittle_in_place_1 = + VectorBackwardEulerDoolittleInPlace<1>(micm::BackwardEulerSolverParameters()); +auto backward_euler_vector_doolittle_in_place_2 = + VectorBackwardEulerDoolittleInPlace<2>(micm::BackwardEulerSolverParameters()); +auto backward_euler_vector_doolittle_in_place_3 = + VectorBackwardEulerDoolittleInPlace<3>(micm::BackwardEulerSolverParameters()); +auto backward_euler_vector_doolittle_in_place_4 = + VectorBackwardEulerDoolittleInPlace<4>(micm::BackwardEulerSolverParameters()); auto backward_euler_vector_mozart_in_place_1 = VectorBackwardEulerMozartInPlace<1>(micm::BackwardEulerSolverParameters()); auto backward_euler_vector_mozart_in_place_2 = VectorBackwardEulerMozartInPlace<2>(micm::BackwardEulerSolverParameters()); auto backward_euler_vector_mozart_in_place_3 = VectorBackwardEulerMozartInPlace<3>(micm::BackwardEulerSolverParameters()); auto backward_euler_vector_mozart_in_place_4 = VectorBackwardEulerMozartInPlace<4>(micm::BackwardEulerSolverParameters()); - TEST(AnalyticalExamples, Troe) { test_analytical_troe(backward_euler, 1e-6);