From b9057152a4868e66dc828e27ba7258c211ac5f79 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 22 Feb 2019 15:36:31 +0100 Subject: [PATCH] Also instantiate for complex scalar types --- cmake/config/template-arguments.in | 6 ++++++ cmake/configure/configure_2_trilinos.cmake | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in index 8a58e90596..2e1a69bd76 100644 --- a/cmake/config/template-arguments.in +++ b/cmake/config/template-arguments.in @@ -97,6 +97,8 @@ VECTOR_TYPES := { Vector; @DEAL_II_EXPAND_EPETRA_VECTOR@; @DEAL_II_EXPAND_TPETRA_VECTOR_DOUBLE@; @DEAL_II_EXPAND_TPETRA_VECTOR_FLOAT@; + @DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_DOUBLE@; + @DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_FLOAT@; @DEAL_II_EXPAND_PETSC_MPI_VECTOR@; @DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR@; @@ -153,6 +155,8 @@ EXTERNAL_PARALLEL_VECTORS := { @DEAL_II_EXPAND_TRILINOS_MPI_VECTOR@; @DEAL_II_EXPAND_EPETRA_VECTOR@; @DEAL_II_EXPAND_TPETRA_VECTOR_DOUBLE@; @DEAL_II_EXPAND_TPETRA_VECTOR_FLOAT@; + @DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_DOUBLE@; + @DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_FLOAT@; @DEAL_II_EXPAND_PETSC_MPI_VECTOR@; @DEAL_II_EXPAND_PETSC_MPI_BLOCKVECTOR@ } @@ -173,6 +177,8 @@ VECTORS_WITH_MATRIX := { Vector; @DEAL_II_EXPAND_EPETRA_VECTOR@; @DEAL_II_EXPAND_TPETRA_VECTOR_DOUBLE@; @DEAL_II_EXPAND_TPETRA_VECTOR_FLOAT@; + @DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_DOUBLE@; + @DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_FLOAT@; @DEAL_II_EXPAND_PETSC_MPI_VECTOR@; } diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index 187fed9071..7a1f32cc5c 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -273,6 +273,10 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL) IF (${DEAL_II_TRILINOS_WITH_TPETRA}) SET(DEAL_II_EXPAND_TPETRA_VECTOR_DOUBLE "LinearAlgebra::TpetraWrappers::Vector") SET(DEAL_II_EXPAND_TPETRA_VECTOR_FLOAT "LinearAlgebra::TpetraWrappers::Vector") + IF (${DEAL_II_WITH_COMPLEX_NUMBERS}) + SET(DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_DOUBLE "LinearAlgebra::TpetraWrappers::Vector>") + SET(DEAL_II_EXPAND_TPETRA_VECTOR_COMPLEX_FLOAT "LinearAlgebra::TpetraWrappers::Vector>") + ENDIF() ENDIF() ENDIF() IF(${DEAL_II_TRILINOS_WITH_SACADO}) -- 2.39.5