From: Luca Heltai Date: Tue, 8 Aug 2017 18:18:02 +0000 (-0600) Subject: Add SACADO instantiations and ALL_SCALAR_TYPES X-Git-Tag: v9.0.0-rc1~1291^2~19 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8b5289cf867e9493dfb04ee156d4d30577bd6b0;p=dealii.git Add SACADO instantiations and ALL_SCALAR_TYPES --- diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in index cd7ce39559..f6a6523a48 100644 --- a/cmake/config/template-arguments.in +++ b/cmake/config/template-arguments.in @@ -12,6 +12,17 @@ REAL_SCALARS := { double; float } COMPLEX_SCALARS := { std::complex; std::complex } +// differentiable scalar types +DIFFERENTIABLE_REAL_SCALARS := { + @DEAL_II_EXPAND_TRILINOS_SACADO_TYPES@; + } + +// all possible scalar types +ALL_SCALAR_TYPES := { + double; float ; std::complex; std::complex; + @DEAL_II_EXPAND_TRILINOS_SACADO_TYPES@; +} + // scalar types that have a corresponding MPI datatype and that we can // therefore use in calls like MPI_Allreduce MPI_SCALARS := { int; @@ -115,6 +126,11 @@ VECTORS_WITH_MATRIX := { Vector; @DEAL_II_EXPAND_EPETRA_VECTOR@; } +// General container types +GENERAL_CONTAINER_TYPES := {std::vector; + ArrayView + } + // DoFHandler and hp::DoFHandler templates DOFHANDLER_TEMPLATES := { DoFHandler; hp::DoFHandler } @@ -165,3 +181,4 @@ RANKS := { 1; 2; 3; 4 } OUTPUT_FLAG_TYPES := { DXFlags; UcdFlags; GnuplotFlags; PovrayFlags; EpsFlags; GmvFlags; TecplotFlags; VtkFlags; SvgFlags; Deal_II_IntermediateFlags } + diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index 12234ba3fa..deae1c811b 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -192,6 +192,7 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL) SET(DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN "TrilinosWrappers::BlockSparsityPattern") SET(DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR "TrilinosWrappers::MPI::BlockVector") SET(DEAL_II_EXPAND_TRILINOS_MPI_VECTOR "TrilinosWrappers::MPI::Vector") + SET(DEAL_II_EXPAND_TRILINOS_SACADO_TYPES "Sacado::Fad::DFad; Sacado::Fad::DFad; Sacado::Fad::DFad>; Sacado::Fad::DFad>") IF (TRILINOS_WITH_MPI) SET(DEAL_II_EXPAND_EPETRA_VECTOR "LinearAlgebra::EpetraWrappers::Vector")