Added SPARSE_MATRICES to explicit instantiations.

diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in
index c9bcb943b77aee38b0477010bfe3b7c3ef226412..5a239ba1b690fc805c8ab5e7c7356f59359b186f 100644 (file)
--- a/cmake/config/template-arguments.in
+++ b/cmake/config/template-arguments.in
@@ -170,6 +170,20 @@ VECTORS_WITH_MATRIX := { Vector<double>;
                          @DEAL_II_EXPAND_EPETRA_VECTOR@;
                        }
 
+// Matrices
+SPARSE_MATRICES := { SparseMatrix<double>;
+                    SparseMatrix<float>;
+
+                    SparseMatrixEZ<double>;
+                    SparseMatrixEZ<float>;
+
+                    BlockSparseMatrix<double>;
+                    BlockSparseMatrix<float>;
+                  
+                    @DEAL_II_EXPAND_TRILINOS_SPARSE_MATRICES@;
+                    @DEAL_II_EXPAND_PETSC_SPARSE_MATRICES@;
+                  }
+
 // General container types
 GENERAL_CONTAINER_TYPES := {std::vector;
                             ArrayView

diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake
index fea1c9e495e554d8b266be82d3ca615853bb02aa..679267f7c830cf51b34cfb640ce83bd507f2ae96 100644 (file)
--- a/cmake/configure/configure_2_trilinos.cmake
+++ b/cmake/configure/configure_2_trilinos.cmake
@@ -189,6 +189,9 @@ ENDMACRO()
 MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL)
   SET(DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN "TrilinosWrappers::SparsityPattern")
   SET(DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN "TrilinosWrappers::BlockSparsityPattern")
+  SET(DEAL_II_EXPAND_TRILINOS_SPARSE_MATRICES 
+      "TrilinosWrappers::SparseMatrix"
+      "TrilinosWrappers::BlockSparseMatrix")
   SET(DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR "TrilinosWrappers::MPI::BlockVector")
   SET(DEAL_II_EXPAND_TRILINOS_MPI_VECTOR "TrilinosWrappers::MPI::Vector")
   # Note: Only CMake 3.0 and greater support line continuation with the "\" character

diff --git a/cmake/configure/configure_3_petsc.cmake b/cmake/configure/configure_3_petsc.cmake
index 21d557cd301405ddb82de5f9c9d7dfea6fef0cd6..a6906ba80a0bd40d99315a0e106d46d1bfb52cec 100644 (file)
--- a/cmake/configure/configure_3_petsc.cmake
+++ b/cmake/configure/configure_3_petsc.cmake
@@ -102,6 +102,10 @@ ENDMACRO()
 MACRO(FEATURE_PETSC_CONFIGURE_EXTERNAL)
   SET(DEAL_II_EXPAND_PETSC_MPI_VECTOR "PETScWrappers::MPI::Vector")
   SET(DEAL_II_EXPAND_PETSC_MPI_BLOCKVECTOR "PETScWrappers::MPI::BlockVector")
+  SET(DEAL_II_EXPAND_PETSC_SPARSE_MATRICES 
+      "PETScWrappers::SparseMatrix"
+      "PETScWrappers::MPI::SparseMatrix"
+      "PETScWrappers::MPI::BlockSparseMatrix")
   #
   # FIXME:
   # temporary variable until deal.II fully support complex-valued PETSc