Add SACADO instantiations and ALL_SCALAR_TYPES

diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in
index cd7ce395599a8b75653ec3c98ee99496c4289804..f6a6523a486e16da76855a8ba06aeeba5ec769ef 100644 (file)
--- a/cmake/config/template-arguments.in
+++ b/cmake/config/template-arguments.in
@@ -12,6 +12,17 @@ REAL_SCALARS    := { double; float }
 COMPLEX_SCALARS := { std::complex<double>;
                      std::complex<float> }
 
+// differentiable scalar types
+DIFFERENTIABLE_REAL_SCALARS := {
+                   @DEAL_II_EXPAND_TRILINOS_SACADO_TYPES@;
+                   } 
+
+// all possible scalar types
+ALL_SCALAR_TYPES := {
+    double; float ; std::complex<double>; std::complex<float>;
+    @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<double>;
                          @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 12234ba3fa807a0e0f634775c3ab2edf29de5604..deae1c811b000d8e06583601d572e3fdb4725fd9 100644 (file)
--- 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<double>; Sacado::Fad::DFad<float>; Sacado::Fad::DFad<Sacado::Fad::DFad<double>>; Sacado::Fad::DFad<Sacado::Fad::DFad<float>>")
 
   IF (TRILINOS_WITH_MPI)
     SET(DEAL_II_EXPAND_EPETRA_VECTOR "LinearAlgebra::EpetraWrappers::Vector")