From 6c8875d069624197ffb576be02225e599d3a62cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 03:35:46 -0600 Subject: [PATCH] Auto-format code changes (#656) Auto-format code using Clang-Format Co-authored-by: GitHub Actions --- include/micm/solver/backward_euler.hpp | 2 +- include/micm/solver/backward_euler.inl | 3 +- .../backward_euler_temporary_variables.hpp | 30 ++++++------ include/micm/solver/rosenbrock.hpp | 2 +- include/micm/solver/rosenbrock.inl | 3 +- .../solver/rosenbrock_temporary_variables.hpp | 49 ++++++++++--------- include/micm/solver/solver.hpp | 15 +++--- include/micm/solver/state.hpp | 2 +- include/micm/solver/temporary_variables.hpp | 23 ++++----- 9 files changed, 68 insertions(+), 61 deletions(-) diff --git a/include/micm/solver/backward_euler.hpp b/include/micm/solver/backward_euler.hpp index 9c5765454..808ce8d05 100644 --- a/include/micm/solver/backward_euler.hpp +++ b/include/micm/solver/backward_euler.hpp @@ -4,13 +4,13 @@ #include #include +#include #include #include #include #include #include #include -#include #include #include diff --git a/include/micm/solver/backward_euler.inl b/include/micm/solver/backward_euler.inl index 6b9bf5fc9..ec7e4b9aa 100644 --- a/include/micm/solver/backward_euler.inl +++ b/include/micm/solver/backward_euler.inl @@ -68,7 +68,8 @@ namespace micm bool singular = false; - auto derived_class_temporary_variables = static_cast*>(state.temporary_variables_.get()); + auto derived_class_temporary_variables = + static_cast*>(state.temporary_variables_.get()); auto& Yn = derived_class_temporary_variables->Yn_; auto& Yn1 = state.variables_; // Yn1 will hold the new solution at the end of the solve auto& forcing = derived_class_temporary_variables->forcing_; diff --git a/include/micm/solver/backward_euler_temporary_variables.hpp b/include/micm/solver/backward_euler_temporary_variables.hpp index 8297e94fc..8ca9be689 100644 --- a/include/micm/solver/backward_euler_temporary_variables.hpp +++ b/include/micm/solver/backward_euler_temporary_variables.hpp @@ -5,26 +5,26 @@ #include -namespace micm +namespace micm { template class BackwardEulerTemporaryVariables : public TemporaryVariables { - public: - DenseMatrixPolicy Yn_; - DenseMatrixPolicy forcing_; + public: + DenseMatrixPolicy Yn_; + DenseMatrixPolicy forcing_; - BackwardEulerTemporaryVariables() = default; - BackwardEulerTemporaryVariables(const BackwardEulerTemporaryVariables& other) = default; - BackwardEulerTemporaryVariables(BackwardEulerTemporaryVariables&& other) = default; - BackwardEulerTemporaryVariables& operator=(const BackwardEulerTemporaryVariables& other) = default; - BackwardEulerTemporaryVariables& operator=(BackwardEulerTemporaryVariables&& other) = default; - ~BackwardEulerTemporaryVariables() = default; + BackwardEulerTemporaryVariables() = default; + BackwardEulerTemporaryVariables(const BackwardEulerTemporaryVariables& other) = default; + BackwardEulerTemporaryVariables(BackwardEulerTemporaryVariables&& other) = default; + BackwardEulerTemporaryVariables& operator=(const BackwardEulerTemporaryVariables& other) = default; + BackwardEulerTemporaryVariables& operator=(BackwardEulerTemporaryVariables&& other) = default; + ~BackwardEulerTemporaryVariables() = default; - BackwardEulerTemporaryVariables(const auto& state_parameters): - Yn_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_), + BackwardEulerTemporaryVariables(const auto& state_parameters) + : Yn_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_), forcing_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_) - { - } + { + } }; -} // namespace name \ No newline at end of file +} // namespace micm \ No newline at end of file diff --git a/include/micm/solver/rosenbrock.hpp b/include/micm/solver/rosenbrock.hpp index 121623c75..714dce978 100644 --- a/include/micm/solver/rosenbrock.hpp +++ b/include/micm/solver/rosenbrock.hpp @@ -15,13 +15,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include diff --git a/include/micm/solver/rosenbrock.inl b/include/micm/solver/rosenbrock.inl index 565c2c112..4cdf004f4 100644 --- a/include/micm/solver/rosenbrock.inl +++ b/include/micm/solver/rosenbrock.inl @@ -14,7 +14,8 @@ namespace micm SolverResult result{}; result.state_ = SolverState::Running; auto& Y = state.variables_; // Y will hold the new solution at the end of the solve - auto derived_class_temporary_variables = static_cast*>(state.temporary_variables_.get()); + auto derived_class_temporary_variables = + static_cast*>(state.temporary_variables_.get()); auto& Ynew = derived_class_temporary_variables->Ynew_; auto& initial_forcing = derived_class_temporary_variables->initial_forcing_; auto& K = derived_class_temporary_variables->K_; diff --git a/include/micm/solver/rosenbrock_temporary_variables.hpp b/include/micm/solver/rosenbrock_temporary_variables.hpp index e5afb4af1..84e932bea 100644 --- a/include/micm/solver/rosenbrock_temporary_variables.hpp +++ b/include/micm/solver/rosenbrock_temporary_variables.hpp @@ -4,34 +4,35 @@ #pragma once #include + #include namespace micm { - template - class RosenbrockTemporaryVariables : public TemporaryVariables - { - public: - DenseMatrixPolicy Ynew_; - DenseMatrixPolicy initial_forcing_; - std::vector K_; - DenseMatrixPolicy Yerror_; + template + class RosenbrockTemporaryVariables : public TemporaryVariables + { + public: + DenseMatrixPolicy Ynew_; + DenseMatrixPolicy initial_forcing_; + std::vector K_; + DenseMatrixPolicy Yerror_; - RosenbrockTemporaryVariables() = default; - RosenbrockTemporaryVariables(const RosenbrockTemporaryVariables& other) = default; - RosenbrockTemporaryVariables(RosenbrockTemporaryVariables&& other) = default; - RosenbrockTemporaryVariables& operator=(const RosenbrockTemporaryVariables& other) = default; - RosenbrockTemporaryVariables& operator=(RosenbrockTemporaryVariables&& other) = default; - ~RosenbrockTemporaryVariables() = default; + RosenbrockTemporaryVariables() = default; + RosenbrockTemporaryVariables(const RosenbrockTemporaryVariables& other) = default; + RosenbrockTemporaryVariables(RosenbrockTemporaryVariables&& other) = default; + RosenbrockTemporaryVariables& operator=(const RosenbrockTemporaryVariables& other) = default; + RosenbrockTemporaryVariables& operator=(RosenbrockTemporaryVariables&& other) = default; + ~RosenbrockTemporaryVariables() = default; - RosenbrockTemporaryVariables(const auto& state_parameters, const auto& solver_parameters): - Ynew_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_), - initial_forcing_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_), - Yerror_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_) - { - K_.reserve(solver_parameters.stages_); - for (std::size_t i = 0; i < solver_parameters.stages_; ++i) - K_.emplace_back(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_); - } - }; + RosenbrockTemporaryVariables(const auto& state_parameters, const auto& solver_parameters) + : Ynew_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_), + initial_forcing_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_), + Yerror_(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_) + { + K_.reserve(solver_parameters.stages_); + for (std::size_t i = 0; i < solver_parameters.stages_; ++i) + K_.emplace_back(state_parameters.number_of_grid_cells_, state_parameters.number_of_species_); + } + }; } // namespace micm \ No newline at end of file diff --git a/include/micm/solver/solver.hpp b/include/micm/solver/solver.hpp index 143f35a32..8d7dc2df1 100644 --- a/include/micm/solver/solver.hpp +++ b/include/micm/solver/solver.hpp @@ -3,11 +3,11 @@ #pragma once #include -#include -#include -#include #include +#include #include +#include +#include #include @@ -60,7 +60,7 @@ namespace micm SolverResult Solve(double time_step, StatePolicy& state) { - return solver_.Solve(time_step, state); + return solver_.Solve(time_step, state); } /// @brief Returns the number of grid cells @@ -82,7 +82,8 @@ namespace micm auto state = std::move(StatePolicy(state_parameters_)); if constexpr (std::is_convertible_v) { - state.temporary_variables_ = std::make_unique>(state_parameters_, solver_parameters_); + state.temporary_variables_ = + std::make_unique>(state_parameters_, solver_parameters_); } else if constexpr (std::is_same_v) { @@ -90,7 +91,9 @@ namespace micm } else { - throw std::runtime_error("Solver type not supported! Parameter type: " + std::string(typeid(typename SolverPolicy::ParametersType).name())); + throw std::runtime_error( + "Solver type not supported! Parameter type: " + + std::string(typeid(typename SolverPolicy::ParametersType).name())); } return state; } diff --git a/include/micm/solver/state.hpp b/include/micm/solver/state.hpp index b6619adb8..29bd50d37 100644 --- a/include/micm/solver/state.hpp +++ b/include/micm/solver/state.hpp @@ -3,12 +3,12 @@ #pragma once #include +#include #include #include #include #include #include -#include #include #include diff --git a/include/micm/solver/temporary_variables.hpp b/include/micm/solver/temporary_variables.hpp index 97458b1c4..5ab0c825d 100644 --- a/include/micm/solver/temporary_variables.hpp +++ b/include/micm/solver/temporary_variables.hpp @@ -5,15 +5,16 @@ namespace micm { - /// @brief This is the base class for temporary variables; currently it is empty and will be expanded by a specific solver later. - class TemporaryVariables - { - public: - TemporaryVariables() = default; - TemporaryVariables(const TemporaryVariables& other) = default; - TemporaryVariables(TemporaryVariables&& other) = default; - TemporaryVariables& operator=(const TemporaryVariables& other) = default; - TemporaryVariables& operator=(TemporaryVariables&& other) = default; - virtual ~TemporaryVariables() = default; - }; + /// @brief This is the base class for temporary variables; currently it is empty and will be expanded by a specific solver + /// later. + class TemporaryVariables + { + public: + TemporaryVariables() = default; + TemporaryVariables(const TemporaryVariables& other) = default; + TemporaryVariables(TemporaryVariables&& other) = default; + TemporaryVariables& operator=(const TemporaryVariables& other) = default; + TemporaryVariables& operator=(TemporaryVariables&& other) = default; + virtual ~TemporaryVariables() = default; + }; } // namespace micm \ No newline at end of file