From b685e4920a7fa798369aa2f956498147b16c70f3 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Tue, 6 Mar 2018 12:07:37 +0100 Subject: [PATCH] Added SPARSE_MATRICES to explicit instantiations. --- cmake/config/template-arguments.in | 14 ++++++++++++++ cmake/configure/configure_2_trilinos.cmake | 3 +++ cmake/configure/configure_3_petsc.cmake | 4 ++++ 3 files changed, 21 insertions(+) diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in index c9bcb943b7..5a239ba1b6 100644 --- a/cmake/config/template-arguments.in +++ b/cmake/config/template-arguments.in @@ -170,6 +170,20 @@ VECTORS_WITH_MATRIX := { Vector; @DEAL_II_EXPAND_EPETRA_VECTOR@; } +// Matrices +SPARSE_MATRICES := { SparseMatrix; + SparseMatrix; + + SparseMatrixEZ; + SparseMatrixEZ; + + BlockSparseMatrix; + BlockSparseMatrix; + + @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 fea1c9e495..679267f7c8 100644 --- 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 21d557cd30..a6906ba80a 100644 --- 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 -- 2.39.5