From 0256143db3a50504736ae95c932e47160e9902cd Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 5 May 2025 16:11:48 -0500 Subject: [PATCH] Solver(F|MP)GMRES: make order of AdditionalData fields consistent --- include/deal.II/lac/solver_gmres.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h index 739dd330da..1a91447193 100644 --- a/include/deal.II/lac/solver_gmres.h +++ b/include/deal.II/lac/solver_gmres.h @@ -710,15 +710,15 @@ public: /** * Constructor. By default, set the maximum basis size to 30. */ - explicit AdditionalData(const unsigned int max_basis_size = 30, - const bool use_truncated_mpgmres_strategy = true, + explicit AdditionalData(const unsigned int max_basis_size = 30, const LinearAlgebra::OrthogonalizationStrategy orthogonalization_strategy = LinearAlgebra::OrthogonalizationStrategy:: - delayed_classical_gram_schmidt) + delayed_classical_gram_schmidt, + const bool use_truncated_mpgmres_strategy = true) : max_basis_size(max_basis_size) - , use_truncated_mpgmres_strategy(use_truncated_mpgmres_strategy) , orthogonalization_strategy(orthogonalization_strategy) + , use_truncated_mpgmres_strategy(use_truncated_mpgmres_strategy) {} /** @@ -726,6 +726,11 @@ public: */ unsigned int max_basis_size; + /** + * Strategy to orthogonalize vectors. + */ + LinearAlgebra::OrthogonalizationStrategy orthogonalization_strategy; + /** * If set to true (the default) a "truncated" search space is * constructed consisting of the span of independent Krylov space @@ -736,11 +741,6 @@ public: * for details. */ bool use_truncated_mpgmres_strategy; - - /** - * Strategy to orthogonalize vectors. - */ - LinearAlgebra::OrthogonalizationStrategy orthogonalization_strategy; }; /** @@ -2363,8 +2363,8 @@ SolverFGMRES::SolverFGMRES(SolverControl &cn, mem, typename SolverMPGMRES::AdditionalData{ data.max_basis_size, - true, - data.orthogonalization_strategy}) + data.orthogonalization_strategy, + true}) {} @@ -2377,8 +2377,8 @@ SolverFGMRES::SolverFGMRES(SolverControl &cn, cn, typename SolverMPGMRES::AdditionalData{ data.max_basis_size, - true, - data.orthogonalization_strategy}) + data.orthogonalization_strategy, + true}) {} -- 2.39.5