]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Update build system template arguments for AD number types. 5382/head
authorJean-Paul Pelteret <jppelteret@gmail.com>
Fri, 3 Nov 2017 12:41:17 +0000 (13:41 +0100)
committerJean-Paul Pelteret <jppelteret@gmail.com>
Mon, 6 Nov 2017 20:09:27 +0000 (21:09 +0100)
cmake/config/template-arguments.in
cmake/configure/configure_2_trilinos.cmake
cmake/configure/configure_adolc.cmake

index 657dde43a252662d9058e4ae90b9a0cb23e21111..d68088cebcbddb426ee2f1b35e712b4dbb4bbd5d 100644 (file)
@@ -18,15 +18,27 @@ REAL_AND_COMPLEX_SCALARS    := { double;
                                  std::complex<double>;
                                  std::complex<float> }
 
+// differentiable Adol-C scalar types
+DIFFERENTIABLE_ADOLC_REAL_SCALARS := {
+        @DEAL_II_EXPAND_ADOLC_TYPES@;
+        }
+
+// differentiable Sacado scalar types
+DIFFERENTIABLE_TRILINOS_SACADO_REAL_SCALARS := {
+        @DEAL_II_EXPAND_TRILINOS_SACADO_TYPES@;
+        }
+
 // differentiable scalar types
 DIFFERENTIABLE_REAL_SCALARS := {
-                   @DEAL_II_EXPAND_TRILINOS_SACADO_TYPES@;
-                   } 
+        @DEAL_II_EXPAND_TRILINOS_SACADO_TYPES@;
+        @DEAL_II_EXPAND_ADOLC_TYPES@;
+        }
 
 // all possible scalar types
 ALL_SCALAR_TYPES := {
     double; float ; std::complex<double>; std::complex<float>;
     @DEAL_II_EXPAND_TRILINOS_SACADO_TYPES@;
+    @DEAL_II_EXPAND_ADOLC_TYPES@;
 }
 
 // scalar types that have a corresponding MPI datatype and that we can
@@ -211,4 +223,3 @@ RANKS := { 1; 2; 3; 4 }
 OUTPUT_FLAG_TYPES := { DXFlags; UcdFlags; GnuplotFlags; PovrayFlags; EpsFlags;
                        GmvFlags; TecplotFlags; VtkFlags; SvgFlags;
                        Deal_II_IntermediateFlags }
-
index deae1c811b000d8e06583601d572e3fdb4725fd9..f409ba96d2eebf0020bd68982cf1cfd4e752ef9b 100644 (file)
@@ -192,7 +192,13 @@ 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>>")
+  # Note: Only CMake 3.0 and greater support line continuation with the "\" character
+  #       Elements of string lists are naturally separated by a ";"
+  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")
index 1f49003bfb5274077193f8ea3c58ef7bd31d4c29..6a637a61e7cc93222d9861124eecb5a95e89138d 100644 (file)
@@ -68,6 +68,8 @@ ENDMACRO()
 MACRO(FEATURE_ADOLC_CONFIGURE_EXTERNAL)
   SET(DEAL_II_ADOLC_WITH_ATRIG_ERF ${ADOLC_WITH_ATRIG_ERF})
   SET(DEAL_II_ADOLC_WITH_ADVANCED_BRANCHING ${ADOLC_WITH_ADVANCED_BRANCHING})
+
+  SET(DEAL_II_EXPAND_ADOLC_TYPES "::adouble; adtl::adouble")
 ENDMACRO()
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.