Merge pull request #14484 from marcfehling/constraints-in

Some AffineConstraints instantiations.
dealii · Nov 27, 2022 · 85a786e · 85a786e
2 parents d008df1 + 5a4aa40
commit 85a786e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/source/lac/affine_constraints.cc b/source/lac/affine_constraints.cc
@@ -123,11 +123,16 @@ dealii::AffineConstraints<double>::distribute<
 INSTANTIATE_DLTG_VECTOR(TrilinosWrappers::MPI::Vector);
 
 INSTANTIATE_DLTG_VECTORMATRIX(TrilinosWrappers::SparseMatrix, Vector<double>);
+INSTANTIATE_DLTG_VECTORMATRIX(TrilinosWrappers::SparseMatrix,
+                              LinearAlgebra::distributed::Vector<double>);
 INSTANTIATE_DLTG_VECTORMATRIX(TrilinosWrappers::SparseMatrix,
                               TrilinosWrappers::MPI::Vector);
 
 INSTANTIATE_DLTG_BLOCK_VECTORMATRIX(TrilinosWrappers::BlockSparseMatrix,
                                     Vector<double>);
+INSTANTIATE_DLTG_BLOCK_VECTORMATRIX(
+  TrilinosWrappers::BlockSparseMatrix,
+  LinearAlgebra::distributed::BlockVector<double>);
 INSTANTIATE_DLTG_BLOCK_VECTORMATRIX(TrilinosWrappers::BlockSparseMatrix,
                                     TrilinosWrappers::MPI::BlockVector);
 

diff --git a/source/lac/affine_constraints.inst.in b/source/lac/affine_constraints.inst.in
@@ -171,24 +171,6 @@ for (S : REAL_AND_COMPLEX_SCALARS; T : DEAL_II_VEC_TEMPLATES)
             std::integral_constant<bool, false>) const;
   }
 
-// TrilinosWrappers::SparseMatrix:
-
-for (T : DEAL_II_VEC_TEMPLATES)
-  {
-#ifdef DEAL_II_WITH_TRILINOS
-    template void AffineConstraints<double>::distribute_local_to_global<
-      TrilinosWrappers::SparseMatrix,
-      LinearAlgebra::distributed::T<double>>(
-      const FullMatrix<double> &,
-      const Vector<double> &,
-      const std::vector<size_type> &,
-      TrilinosWrappers::SparseMatrix &,
-      LinearAlgebra::distributed::T<double> &,
-      bool,
-      std::integral_constant<bool, false>) const;
-#endif
-  }
-
 // BlockSparseMatrix:
 
 for (S : REAL_AND_COMPLEX_SCALARS)