From c06ecff4d5c82f5e954a1f4a49690d618c48d333 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sun, 1 Nov 2015 16:46:06 -0500 Subject: [PATCH] More MATRIX -> MatrixType --- source/lac/sparse_direct.cc | 26 ++++++------ tests/bits/deal_solver_04.cc | 4 +- tests/bits/deal_solver_05.cc | 4 +- .../integrators/assembler_simple_matrix_01.cc | 4 +- .../assembler_simple_matrix_01m.cc | 4 +- .../assembler_simple_mgmatrix_01.cc | 4 +- tests/lac/linear_operator_08.cc | 4 +- tests/lac/solver.cc | 8 ++-- tests/lac/solver_memorytest.cc | 8 ++-- tests/lac/solver_monitor.cc | 4 +- tests/lac/solver_monitor_disconnect.cc | 4 +- tests/lac/solver_relaxation_01.cc | 4 +- tests/lac/solver_relaxation_02.cc | 4 +- tests/lac/solver_relaxation_03.cc | 4 +- tests/lac/solver_selector_01.cc | 4 +- tests/lac/solver_selector_02.cc | 4 +- tests/lac/solver_signals.cc | 4 +- tests/lac/sparse_matrices.cc | 42 +++++++++---------- tests/lac/testmatrix.h | 24 +++++------ tests/lapack/solver_cg.cc | 8 ++-- tests/matrix_free/parallel_multigrid.cc | 12 +++--- tests/multigrid/smoother_block.cc | 6 +-- tests/petsc/deal_solver_01.cc | 4 +- tests/petsc/deal_solver_02.cc | 4 +- tests/petsc/deal_solver_03.cc | 4 +- tests/petsc/deal_solver_04.cc | 4 +- tests/petsc/deal_solver_05.cc | 4 +- tests/petsc/solver_01.cc | 4 +- tests/petsc/solver_02.cc | 4 +- tests/petsc/solver_03.cc | 4 +- tests/petsc/solver_03_mf.cc | 4 +- .../petsc/solver_03_precondition_boomeramg.cc | 4 +- ...ver_03_precondition_boomeramg_symmetric.cc | 4 +- .../petsc/solver_03_precondition_eisenstat.cc | 4 +- tests/petsc/solver_03_precondition_icc.cc | 4 +- tests/petsc/solver_03_precondition_ilu.cc | 4 +- tests/petsc/solver_03_precondition_lu.cc | 4 +- .../petsc/solver_03_precondition_parasails.cc | 4 +- tests/petsc/solver_03_precondition_sor.cc | 4 +- tests/petsc/solver_03_precondition_ssor.cc | 4 +- tests/petsc/solver_04.cc | 4 +- tests/petsc/solver_05.cc | 4 +- tests/petsc/solver_06.cc | 4 +- tests/petsc/solver_07.cc | 4 +- tests/petsc/solver_08.cc | 4 +- tests/petsc/solver_09.cc | 4 +- tests/petsc/solver_10.cc | 4 +- tests/petsc/solver_11.cc | 4 +- tests/petsc/solver_12.cc | 6 +-- tests/petsc/solver_13.cc | 4 +- tests/trilinos/deal_solver_01.cc | 4 +- tests/trilinos/deal_solver_02.cc | 4 +- tests/trilinos/deal_solver_03.cc | 12 +++--- tests/trilinos/deal_solver_04.cc | 4 +- tests/trilinos/deal_solver_05.cc | 4 +- tests/trilinos/deal_solver_06.cc | 4 +- tests/trilinos/solver_03.cc | 4 +- tests/trilinos/solver_05.cc | 4 +- tests/trilinos/solver_07.cc | 4 +- tests/umfpack/umfpack_04.cc | 7 +++- 60 files changed, 179 insertions(+), 176 deletions(-) diff --git a/source/lac/sparse_direct.cc b/source/lac/sparse_direct.cc index a8641c30c5..225b8d82d3 100644 --- a/source/lac/sparse_direct.cc +++ b/source/lac/sparse_direct.cc @@ -489,19 +489,19 @@ SparseDirectUMFPACK::n () const // explicit instantiations for SparseMatrixUMFPACK -#define InstantiateUMFPACK(MATRIX) \ - template \ - void SparseDirectUMFPACK::factorize (const MATRIX &); \ - template \ - void SparseDirectUMFPACK::solve (const MATRIX &, \ - Vector &, \ - bool); \ - template \ - void SparseDirectUMFPACK::solve (const MATRIX &, \ - BlockVector &, \ - bool); \ - template \ - void SparseDirectUMFPACK::initialize (const MATRIX &, \ +#define InstantiateUMFPACK(MatrixType) \ + template \ + void SparseDirectUMFPACK::factorize (const MatrixType &); \ + template \ + void SparseDirectUMFPACK::solve (const MatrixType &, \ + Vector &, \ + bool); \ + template \ + void SparseDirectUMFPACK::solve (const MatrixType &, \ + BlockVector &, \ + bool); \ + template \ + void SparseDirectUMFPACK::initialize (const MatrixType &, \ const AdditionalData); InstantiateUMFPACK(SparseMatrix) diff --git a/tests/bits/deal_solver_04.cc b/tests/bits/deal_solver_04.cc index 4539b61f4c..c37e564262 100644 --- a/tests/bits/deal_solver_04.cc +++ b/tests/bits/deal_solver_04.cc @@ -37,11 +37,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/bits/deal_solver_05.cc b/tests/bits/deal_solver_05.cc index 8c9268b8c8..edfc14e2a2 100644 --- a/tests/bits/deal_solver_05.cc +++ b/tests/bits/deal_solver_05.cc @@ -36,11 +36,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/integrators/assembler_simple_matrix_01.cc b/tests/integrators/assembler_simple_matrix_01.cc index 92629f7b66..8eca5a720d 100644 --- a/tests/integrators/assembler_simple_matrix_01.cc +++ b/tests/integrators/assembler_simple_matrix_01.cc @@ -35,8 +35,8 @@ using namespace dealii; -template -void test(DOFINFO &info, MeshWorker::Assembler::MatrixSimple &ass) +template +void test(DOFINFO &info, MeshWorker::Assembler::MatrixSimple &ass) { ass.initialize_info(info, false); deallog << "No faces" << std::endl; diff --git a/tests/integrators/assembler_simple_matrix_01m.cc b/tests/integrators/assembler_simple_matrix_01m.cc index a23422ea03..4132def1f0 100644 --- a/tests/integrators/assembler_simple_matrix_01m.cc +++ b/tests/integrators/assembler_simple_matrix_01m.cc @@ -35,8 +35,8 @@ using namespace dealii; -template -void test(DOFINFO &info, MeshWorker::Assembler::MatrixSimple &ass) +template +void test(DOFINFO &info, MeshWorker::Assembler::MatrixSimple &ass) { ass.initialize_info(info, false); deallog << "No faces" << std::endl; diff --git a/tests/integrators/assembler_simple_mgmatrix_01.cc b/tests/integrators/assembler_simple_mgmatrix_01.cc index 5cbdc7579a..8b2d9acc73 100644 --- a/tests/integrators/assembler_simple_mgmatrix_01.cc +++ b/tests/integrators/assembler_simple_mgmatrix_01.cc @@ -35,8 +35,8 @@ using namespace dealii; -template -void test(DOFINFO &info, MeshWorker::Assembler::MGMatrixSimple &ass) +template +void test(DOFINFO &info, MeshWorker::Assembler::MGMatrixSimple &ass) { ass.initialize_info(info, false); deallog << "No faces" << std::endl; diff --git a/tests/lac/linear_operator_08.cc b/tests/lac/linear_operator_08.cc index d3c5526097..67214e7997 100644 --- a/tests/lac/linear_operator_08.cc +++ b/tests/lac/linear_operator_08.cc @@ -49,10 +49,10 @@ using namespace dealii; -template void -test_preconditioner (const MATRIX &A, +test_preconditioner (const MatrixType &A, const VectorType &b, const ADDITIONAL_DATA &data = ADDITIONAL_DATA()) { diff --git a/tests/lac/solver.cc b/tests/lac/solver.cc index b5da2d6541..d6573c9ed0 100644 --- a/tests/lac/solver.cc +++ b/tests/lac/solver.cc @@ -33,10 +33,10 @@ #include #include -template +template void check_solve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) @@ -53,10 +53,10 @@ check_solve (SOLVER &solver, } } -template +template void check_Tsolve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/lac/solver_memorytest.cc b/tests/lac/solver_memorytest.cc index 935afb8742..d4898feddf 100644 --- a/tests/lac/solver_memorytest.cc +++ b/tests/lac/solver_memorytest.cc @@ -39,11 +39,11 @@ #include #include -template +template void -check_solve (const MATRIX &A, - VectorType &u, - VectorType &f, +check_solve (const MatrixType &A, + VectorType &u, + VectorType &f, const typename SOLVER::AdditionalData &additional_data = typename SOLVER::AdditionalData()) { GrowingVectorMemory<> mem; diff --git a/tests/lac/solver_monitor.cc b/tests/lac/solver_monitor.cc index b2a888f2dc..95117e362d 100644 --- a/tests/lac/solver_monitor.cc +++ b/tests/lac/solver_monitor.cc @@ -56,10 +56,10 @@ SolverControl::State monitor_mean (const unsigned int iteration, -template +template void check_solve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/lac/solver_monitor_disconnect.cc b/tests/lac/solver_monitor_disconnect.cc index e95b7d7fd8..5f24c537ef 100644 --- a/tests/lac/solver_monitor_disconnect.cc +++ b/tests/lac/solver_monitor_disconnect.cc @@ -57,10 +57,10 @@ SolverControl::State monitor_mean (const unsigned int iteration, -template +template void check_solve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/lac/solver_relaxation_01.cc b/tests/lac/solver_relaxation_01.cc index dbbe821f00..ed65e00f4a 100644 --- a/tests/lac/solver_relaxation_01.cc +++ b/tests/lac/solver_relaxation_01.cc @@ -31,10 +31,10 @@ #include #include -template +template double check_solve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/lac/solver_relaxation_02.cc b/tests/lac/solver_relaxation_02.cc index 785c02deff..6dc2f2488d 100644 --- a/tests/lac/solver_relaxation_02.cc +++ b/tests/lac/solver_relaxation_02.cc @@ -32,10 +32,10 @@ #include #include -template +template double check_solve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/lac/solver_relaxation_03.cc b/tests/lac/solver_relaxation_03.cc index e332339d16..732025f8cf 100644 --- a/tests/lac/solver_relaxation_03.cc +++ b/tests/lac/solver_relaxation_03.cc @@ -33,10 +33,10 @@ #include #include -template +template double check_solve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/lac/solver_selector_01.cc b/tests/lac/solver_selector_01.cc index c3a5aab4f3..53e4249e44 100644 --- a/tests/lac/solver_selector_01.cc +++ b/tests/lac/solver_selector_01.cc @@ -26,9 +26,9 @@ #include -template +template void -check (const MATRIX &A, const VectorType &f) +check (const MatrixType &A, const VectorType &f) { std::vector names; names.push_back("cg"); diff --git a/tests/lac/solver_selector_02.cc b/tests/lac/solver_selector_02.cc index b92608e199..413eff8bab 100644 --- a/tests/lac/solver_selector_02.cc +++ b/tests/lac/solver_selector_02.cc @@ -41,9 +41,9 @@ public: -template +template void -check(const MATRIX &A, const VectorType &f) +check(const MatrixType &A, const VectorType &f) { std::vector names; names.push_back("cg"); diff --git a/tests/lac/solver_signals.cc b/tests/lac/solver_signals.cc index 695ec589ae..0a3403d577 100644 --- a/tests/lac/solver_signals.cc +++ b/tests/lac/solver_signals.cc @@ -56,10 +56,10 @@ void output_eigenvalues(const std::vector &eigenvalues,const std::string deallog << std::endl; } -template +template void check_solve(SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc index 0a9ec57e3f..e90a00b19b 100644 --- a/tests/lac/sparse_matrices.cc +++ b/tests/lac/sparse_matrices.cc @@ -41,11 +41,11 @@ deallog.pop(); \ residuals.push_back(control.last_value()) -template +template void -check_vmult_quadratic(std::vector &residuals, - const MATRIX &A, - const char *prefix) +check_vmult_quadratic (std::vector &residuals, + const MatrixType &A, + const char *prefix) { deallog.push(prefix); @@ -60,7 +60,7 @@ check_vmult_quadratic(std::vector &residuals, const types::global_dof_index block_size = (types::global_dof_index) std::sqrt(A.n()+.3); const unsigned int n_blocks = A.n()/block_size; - typename PreconditionBlock::AdditionalData + typename PreconditionBlock::AdditionalData data(block_size, 1.2); std::vector perm(A.n()); std::vector iperm(A.n()); @@ -72,22 +72,22 @@ check_vmult_quadratic(std::vector &residuals, } PreconditionIdentity identity; - PreconditionJacobi jacobi; + PreconditionJacobi jacobi; jacobi.initialize(A, .5); - PreconditionSOR sor; + PreconditionSOR sor; sor.initialize(A, 1.2); -// PreconditionPSOR psor; +// PreconditionPSOR psor; // psor.initialize(A, perm, iperm, 1.2); - PreconditionSSOR ssor; + PreconditionSSOR ssor; ssor.initialize(A, 1.2); - PreconditionBlockJacobi block_jacobi; + PreconditionBlockJacobi block_jacobi; block_jacobi.initialize(A, data); - PreconditionBlockSSOR block_ssor; + PreconditionBlockSSOR block_ssor; block_ssor.initialize(A, data); - PreconditionBlockSOR block_sor; + PreconditionBlockSOR block_sor; block_sor.initialize(A, data); - PreconditionBlockSOR block_psor; + PreconditionBlockSOR block_psor; block_psor.set_permutation(perm, iperm); block_psor.initialize(A, data); @@ -160,18 +160,18 @@ check_vmult_quadratic(std::vector &residuals, } -template +template void -check_iterator (const MATRIX &A) +check_iterator (const MatrixType &A) { // deallog.push("it"); - typename MATRIX::const_iterator E = A.end(); + typename MatrixType::const_iterator E = A.end(); if (A.m() < 10) for (unsigned int r=0; rcolumn() << '\t' << b->value() << std::endl; - typename MATRIX::const_iterator e = A.end(r); + typename MatrixType::const_iterator e = A.end(r); if (e == E) deallog << "Final" << std::endl; else @@ -188,17 +188,17 @@ check_iterator (const MATRIX &A) << std::endl; deallog << "cols:"; - for (typename MATRIX::const_iterator i=b; i!=e; ++i) + for (typename MatrixType::const_iterator i=b; i!=e; ++i) deallog << '\t' << ',' << i->column(); deallog << std::endl; } - for (typename MATRIX::const_iterator i = A.begin(); i!= A.end(); ++i) + for (typename MatrixType::const_iterator i = A.begin(); i!= A.end(); ++i) deallog << '\t' << i->row() << '\t' << i->column() << '\t' << i->value() << std::endl; deallog << "Repeat row 2" << std::endl; - for (typename MATRIX::const_iterator i = A.begin(2); i!= A.end(2); ++i) + for (typename MatrixType::const_iterator i = A.begin(2); i!= A.end(2); ++i) deallog << '\t' << i->row() << '\t' << i->column() << '\t' << i->value() diff --git a/tests/lac/testmatrix.h b/tests/lac/testmatrix.h index 8f1e5dfa5d..54cb5e6b20 100644 --- a/tests/lac/testmatrix.h +++ b/tests/lac/testmatrix.h @@ -36,20 +36,20 @@ public: /** * Fill the matrix with values. */ - template - void five_point(MATRIX &, bool nonsymmetric = false) const; + template + void five_point(MatrixType &, bool nonsymmetric = false) const; /** * Fill the matrix with values. */ - template - void nine_point(MATRIX &, bool nonsymmetric = false) const; + template + void nine_point(MatrixType &, bool nonsymmetric = false) const; /** * Fill the matrix with values. */ - template - void upwind(MATRIX &, bool back = false) const; + template + void upwind(MatrixType &, bool back = false) const; template void gnuplot_print(std::ostream &, const Vector &) const; @@ -173,9 +173,9 @@ FDMatrix::nine_point_structure(SP &structure) const -template +template void -FDMatrix::nine_point(MATRIX &A, bool) const +FDMatrix::nine_point(MatrixType &A, bool) const { for (unsigned int i=0; i<=ny-2; i++) { @@ -229,10 +229,10 @@ FDMatrix::nine_point(MATRIX &A, bool) const } } -template +template inline void -FDMatrix::five_point(MATRIX &A, bool nonsymmetric) const +FDMatrix::five_point(MatrixType &A, bool nonsymmetric) const { for (unsigned int i=0; i<=ny-2; i++) { @@ -273,10 +273,10 @@ FDMatrix::five_point(MATRIX &A, bool nonsymmetric) const -template +template inline void -FDMatrix::upwind(MATRIX &A, bool back) const +FDMatrix::upwind(MatrixType &A, bool back) const { for (unsigned int i=0; i<=ny-2; i++) { diff --git a/tests/lapack/solver_cg.cc b/tests/lapack/solver_cg.cc index e0ff8b84ae..6fd86f7f8f 100644 --- a/tests/lapack/solver_cg.cc +++ b/tests/lapack/solver_cg.cc @@ -31,10 +31,10 @@ #include #include -template +template void check_solve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) @@ -51,10 +51,10 @@ check_solve (SOLVER &solver, } } -template +template void check_Tsolve (SOLVER &solver, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index bb0b46328e..8ce6dfb96f 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -247,11 +247,11 @@ private: -template +template class MGTransferPrebuiltMF : public MGTransferPrebuilt > { public: - MGTransferPrebuiltMF(const MGLevelObject &laplace) + MGTransferPrebuiltMF(const MGLevelObject &laplace) : laplace_operator (laplace) {}; @@ -273,18 +273,18 @@ public: } private: - const MGLevelObject &laplace_operator; + const MGLevelObject &laplace_operator; }; -template +template class MGCoarseIterative : public MGCoarseGridBase > { public: MGCoarseIterative() {} - void initialize(const MATRIX &matrix) + void initialize(const MatrixType &matrix) { coarse_matrix = &matrix; } @@ -298,7 +298,7 @@ public: solver_coarse.solve (*coarse_matrix, dst, src, PreconditionIdentity()); } - const MATRIX *coarse_matrix; + const MatrixType *coarse_matrix; }; diff --git a/tests/multigrid/smoother_block.cc b/tests/multigrid/smoother_block.cc index d355e23ab7..dd7015f4c0 100644 --- a/tests/multigrid/smoother_block.cc +++ b/tests/multigrid/smoother_block.cc @@ -121,12 +121,12 @@ ScalingMatrix::Tvmult_add (VectorType &dst, const VectorType &src) const //----------------------------------------------------------------------// -template -void check_smoother(const MGLevelObject &m, +template +void check_smoother(const MGLevelObject &m, const MGLevelObject &r) { GrowingVectorMemory > mem; - MGSmootherBlock smoother(mem); + MGSmootherBlock smoother(mem); smoother.initialize(m, r); diff --git a/tests/petsc/deal_solver_01.cc b/tests/petsc/deal_solver_01.cc index b27301ef5d..9288c2ba7e 100644 --- a/tests/petsc/deal_solver_01.cc +++ b/tests/petsc/deal_solver_01.cc @@ -36,11 +36,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/deal_solver_02.cc b/tests/petsc/deal_solver_02.cc index 25b0b6f20e..a14c05b22d 100644 --- a/tests/petsc/deal_solver_02.cc +++ b/tests/petsc/deal_solver_02.cc @@ -38,11 +38,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/deal_solver_03.cc b/tests/petsc/deal_solver_03.cc index 17f9d6b1b6..135450af64 100644 --- a/tests/petsc/deal_solver_03.cc +++ b/tests/petsc/deal_solver_03.cc @@ -38,11 +38,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/deal_solver_04.cc b/tests/petsc/deal_solver_04.cc index 2664e59b73..e6445e3957 100644 --- a/tests/petsc/deal_solver_04.cc +++ b/tests/petsc/deal_solver_04.cc @@ -37,11 +37,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/deal_solver_05.cc b/tests/petsc/deal_solver_05.cc index 25431fe39a..140c05d79f 100644 --- a/tests/petsc/deal_solver_05.cc +++ b/tests/petsc/deal_solver_05.cc @@ -36,11 +36,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_01.cc b/tests/petsc/solver_01.cc index ffbdbc8807..9d73715061 100644 --- a/tests/petsc/solver_01.cc +++ b/tests/petsc/solver_01.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_02.cc b/tests/petsc/solver_02.cc index cd67125cb3..b6b5a3ea91 100644 --- a/tests/petsc/solver_02.cc +++ b/tests/petsc/solver_02.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03.cc b/tests/petsc/solver_03.cc index 9b755dd4e5..1f59a77fd5 100644 --- a/tests/petsc/solver_03.cc +++ b/tests/petsc/solver_03.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_mf.cc b/tests/petsc/solver_03_mf.cc index 55035a5e66..0d4830e4f8 100644 --- a/tests/petsc/solver_03_mf.cc +++ b/tests/petsc/solver_03_mf.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_boomeramg.cc b/tests/petsc/solver_03_precondition_boomeramg.cc index c5e0027c62..b38ab3dc31 100644 --- a/tests/petsc/solver_03_precondition_boomeramg.cc +++ b/tests/petsc/solver_03_precondition_boomeramg.cc @@ -32,11 +32,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc index 45185e986c..b8dc6220e6 100644 --- a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc +++ b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc @@ -33,11 +33,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_eisenstat.cc b/tests/petsc/solver_03_precondition_eisenstat.cc index e7012b8c00..87e4a88c09 100644 --- a/tests/petsc/solver_03_precondition_eisenstat.cc +++ b/tests/petsc/solver_03_precondition_eisenstat.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_icc.cc b/tests/petsc/solver_03_precondition_icc.cc index 18b0c2c729..928748450d 100644 --- a/tests/petsc/solver_03_precondition_icc.cc +++ b/tests/petsc/solver_03_precondition_icc.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_ilu.cc b/tests/petsc/solver_03_precondition_ilu.cc index c3e547d09a..b2f88152af 100644 --- a/tests/petsc/solver_03_precondition_ilu.cc +++ b/tests/petsc/solver_03_precondition_ilu.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_lu.cc b/tests/petsc/solver_03_precondition_lu.cc index ff16420d6c..bb5f490185 100644 --- a/tests/petsc/solver_03_precondition_lu.cc +++ b/tests/petsc/solver_03_precondition_lu.cc @@ -32,11 +32,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_parasails.cc b/tests/petsc/solver_03_precondition_parasails.cc index 4d8c6cc308..dc60da8119 100644 --- a/tests/petsc/solver_03_precondition_parasails.cc +++ b/tests/petsc/solver_03_precondition_parasails.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_sor.cc b/tests/petsc/solver_03_precondition_sor.cc index d0b65f1a6a..6981a68093 100644 --- a/tests/petsc/solver_03_precondition_sor.cc +++ b/tests/petsc/solver_03_precondition_sor.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_03_precondition_ssor.cc b/tests/petsc/solver_03_precondition_ssor.cc index 0efc13be8b..7c74c68ded 100644 --- a/tests/petsc/solver_03_precondition_ssor.cc +++ b/tests/petsc/solver_03_precondition_ssor.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_04.cc b/tests/petsc/solver_04.cc index 918a6dea25..861040d33e 100644 --- a/tests/petsc/solver_04.cc +++ b/tests/petsc/solver_04.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_05.cc b/tests/petsc/solver_05.cc index 51ee2cfcd8..4a545a36da 100644 --- a/tests/petsc/solver_05.cc +++ b/tests/petsc/solver_05.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_06.cc b/tests/petsc/solver_06.cc index 13ba418cc8..c2936fd25c 100644 --- a/tests/petsc/solver_06.cc +++ b/tests/petsc/solver_06.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_07.cc b/tests/petsc/solver_07.cc index 450203ac70..f6ce5d2e74 100644 --- a/tests/petsc/solver_07.cc +++ b/tests/petsc/solver_07.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_08.cc b/tests/petsc/solver_08.cc index 6231bf9fe5..be055d6900 100644 --- a/tests/petsc/solver_08.cc +++ b/tests/petsc/solver_08.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_09.cc b/tests/petsc/solver_09.cc index 16ee77ca52..537c67ebef 100644 --- a/tests/petsc/solver_09.cc +++ b/tests/petsc/solver_09.cc @@ -35,11 +35,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_10.cc b/tests/petsc/solver_10.cc index 690fabdd7c..d81940bb01 100644 --- a/tests/petsc/solver_10.cc +++ b/tests/petsc/solver_10.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_11.cc b/tests/petsc/solver_11.cc index 958551aea6..4c4649b10a 100644 --- a/tests/petsc/solver_11.cc +++ b/tests/petsc/solver_11.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_12.cc b/tests/petsc/solver_12.cc index 9a248ce3d6..0c5d64f3b9 100644 --- a/tests/petsc/solver_12.cc +++ b/tests/petsc/solver_12.cc @@ -31,11 +31,11 @@ #include #include -template +template void -check_solve(SOLVER &solver, +check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/petsc/solver_13.cc b/tests/petsc/solver_13.cc index dd0f5ed124..c1f17344c9 100644 --- a/tests/petsc/solver_13.cc +++ b/tests/petsc/solver_13.cc @@ -31,11 +31,11 @@ #include #include -template +template void check_solve(SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc index 65ecba6476..e2fa9b596d 100644 --- a/tests/trilinos/deal_solver_01.cc +++ b/tests/trilinos/deal_solver_01.cc @@ -37,11 +37,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc index 67ac684037..e44aadc644 100644 --- a/tests/trilinos/deal_solver_02.cc +++ b/tests/trilinos/deal_solver_02.cc @@ -39,11 +39,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc index 0f4b136d8a..29eaab2da0 100644 --- a/tests/trilinos/deal_solver_03.cc +++ b/tests/trilinos/deal_solver_03.cc @@ -39,14 +39,14 @@ #include #include -template +template void -check_solve (SOLVER &solver, +check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, - VectorType &u, - VectorType &f, - const PRECONDITION &P) + const MatrixType &A, + VectorType &u, + VectorType &f, + const PRECONDITION &P) { deallog << "Solver type: " << typeid(solver).name() << std::endl; diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc index 044ef1ceeb..094f169c06 100644 --- a/tests/trilinos/deal_solver_04.cc +++ b/tests/trilinos/deal_solver_04.cc @@ -38,11 +38,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc index 6ebb71eef7..a617559f35 100644 --- a/tests/trilinos/deal_solver_05.cc +++ b/tests/trilinos/deal_solver_05.cc @@ -37,11 +37,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc index f53512a8ae..8bc5610389 100644 --- a/tests/trilinos/deal_solver_06.cc +++ b/tests/trilinos/deal_solver_06.cc @@ -37,11 +37,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc index 300c0a235b..b4c138fa66 100644 --- a/tests/trilinos/solver_03.cc +++ b/tests/trilinos/solver_03.cc @@ -32,11 +32,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc index 64c665545d..17f1970d89 100644 --- a/tests/trilinos/solver_05.cc +++ b/tests/trilinos/solver_05.cc @@ -32,11 +32,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc index 7b03471878..4777b9e381 100644 --- a/tests/trilinos/solver_07.cc +++ b/tests/trilinos/solver_07.cc @@ -32,11 +32,11 @@ #include #include -template +template void check_solve (SOLVER &solver, const SolverControl &solver_control, - const MATRIX &A, + const MatrixType &A, VectorType &u, VectorType &f, const PRECONDITION &P) diff --git a/tests/umfpack/umfpack_04.cc b/tests/umfpack/umfpack_04.cc index 51ca7d08af..d22641a7db 100644 --- a/tests/umfpack/umfpack_04.cc +++ b/tests/umfpack/umfpack_04.cc @@ -44,8 +44,11 @@ #include #include -template -void assemble_laplace (MATRIX &B, VectorType &bb, DoFHandler &dof_handler, FiniteElement &fe) +template +void assemble_laplace (MatrixType &B, + VectorType &bb, + DoFHandler &dof_handler, + FiniteElement &fe) { QGauss quadrature_formula(2); FEValues fe_values (fe, quadrature_formula, -- 2.39.5