From: Jean-Paul Pelteret Date: Fri, 3 Nov 2017 12:41:17 +0000 (+0100) Subject: Update build system template arguments for AD number types. X-Git-Tag: v9.0.0-rc1~808^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5382%2Fhead;p=dealii.git Update build system template arguments for AD number types. --- diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in index 657dde43a2..d68088cebc 100644 --- a/cmake/config/template-arguments.in +++ b/cmake/config/template-arguments.in @@ -18,15 +18,27 @@ REAL_AND_COMPLEX_SCALARS := { double; std::complex; std::complex } +// 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; std::complex; @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 } - diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index deae1c811b..f409ba96d2 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -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; Sacado::Fad::DFad; Sacado::Fad::DFad>; Sacado::Fad::DFad>") + # 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" + "Sacado::Fad::DFad" + "Sacado::Fad::DFad>" + "Sacado::Fad::DFad>") IF (TRILINOS_WITH_MPI) SET(DEAL_II_EXPAND_EPETRA_VECTOR "LinearAlgebra::EpetraWrappers::Vector") diff --git a/cmake/configure/configure_adolc.cmake b/cmake/configure/configure_adolc.cmake index 1f49003bfb..6a637a61e7 100644 --- a/cmake/configure/configure_adolc.cmake +++ b/cmake/configure/configure_adolc.cmake @@ -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()