From a9da62c4fda7b85e1d92d8e60315bb6181042759 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 27 Feb 2016 21:41:25 +0100 Subject: [PATCH] move instantiation of MatrixTools::apply_boundary_values() to inst.in file --- source/numerics/matrix_tools.cc | 49 ---------------------------- source/numerics/matrix_tools.inst.in | 17 ++++++++++ 2 files changed, 17 insertions(+), 49 deletions(-) diff --git a/source/numerics/matrix_tools.cc b/source/numerics/matrix_tools.cc index 28f784333d..a03a48fc6b 100644 --- a/source/numerics/matrix_tools.cc +++ b/source/numerics/matrix_tools.cc @@ -2928,54 +2928,5 @@ namespace MatrixTools // explicit instantiations #include "matrix_tools.inst" -namespace MatrixTools -{ - template - void - apply_boundary_values (const std::map &boundary_values, - SparseMatrix &matrix, - Vector &solution, - Vector &right_hand_side, - const bool eliminate_columns); - - template - void - apply_boundary_values (const std::map &boundary_values, - SparseMatrix &matrix, - Vector &solution, - Vector &right_hand_side, - const bool eliminate_columns); - - template - void - apply_boundary_values (const std::map &boundary_values, - SparseMatrix &matrix, - Vector &solution, - Vector &right_hand_side, - const bool eliminate_columns); - - template - void - apply_boundary_values (const std::map &boundary_values, - BlockSparseMatrix &matrix, - BlockVector &solution, - BlockVector &right_hand_side, - const bool eliminate_columns); - - template - void - apply_boundary_values (const std::map &boundary_values, - BlockSparseMatrix &matrix, - BlockVector &solution, - BlockVector &right_hand_side, - const bool eliminate_columns); - template - void - apply_boundary_values (const std::map &boundary_values, - BlockSparseMatrix &matrix, - BlockVector &solution, - BlockVector &right_hand_side, - const bool eliminate_columns); -} DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/matrix_tools.inst.in b/source/numerics/matrix_tools.inst.in index 8787c14630..0e7329057d 100644 --- a/source/numerics/matrix_tools.inst.in +++ b/source/numerics/matrix_tools.inst.in @@ -23,6 +23,23 @@ for (number: REAL_SCALARS) Vector &local_rhs, const bool eliminate_columns); + template + void MatrixTools::apply_boundary_values + (const std::map &boundary_values, + SparseMatrix &matrix, + Vector &solution, + Vector &right_hand_side, + const bool eliminate_columns); + + template + void MatrixTools::apply_boundary_values + (const std::map &boundary_values, + BlockSparseMatrix &matrix, + BlockVector &solution, + BlockVector &right_hand_side, + const bool eliminate_columns); + + } for (scalar: REAL_SCALARS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) -- 2.39.5