Update configuration to detect new ADOL-C "feature" :-/

diff --git a/cmake/configure/configure_adolc.cmake b/cmake/configure/configure_adolc.cmake
index b60d7557c09b3854ac130ec67e983a703d012dd9..6c2671e1be4c43c14e3442a101f7ea2336c31978 100644 (file)
--- a/cmake/configure/configure_adolc.cmake
+++ b/cmake/configure/configure_adolc.cmake
@@ -118,6 +118,7 @@ ENDMACRO()
 MACRO(FEATURE_ADOLC_CONFIGURE_EXTERNAL)
   SET(DEAL_II_ADOLC_WITH_ADVANCED_BRANCHING ${ADOLC_WITH_ADVANCED_BRANCHING})
   SET(DEAL_II_ADOLC_WITH_ATRIG_ERF ${ADOLC_WITH_ATRIG_ERF})
+  SET(DEAL_II_ADOLC_WITH_TAPELESS_REFCOUNTING ${ADOLC_WITH_TAPELESS_REFCOUNTING})
   SET(DEAL_II_ADOLC_WITH_BOOST_ALLOCATOR ${ADOLC_WITH_BOOST_ALLOCATOR})
 
   SET(DEAL_II_EXPAND_ADOLC_TYPES "adouble; adtl::adouble")

diff --git a/cmake/modules/FindADOLC.cmake b/cmake/modules/FindADOLC.cmake
index 6023af8063bf064be88cd840282b51c4d873fed9..bcba6ffd2a7bd8d523425224ce6aa47771291f5c 100644 (file)
--- a/cmake/modules/FindADOLC.cmake
+++ b/cmake/modules/FindADOLC.cmake
@@ -77,6 +77,18 @@ IF(EXISTS ${ADOLC_SETTINGS_H})
     SET(ADOLC_WITH_ADVANCED_BRANCHING FALSE)
   ENDIF()
 
+  #
+  # Check whether ADOL-C is configured with tapeless number reference counting
+  #
+  FILE(STRINGS "${ADOLC_SETTINGS_H}" ADOLC_WITH_TAPELESS_REFCOUNTING_STRING
+    REGEX "#define USE_ADTL_REFCOUNTING 1"
+    )
+  IF(NOT "${ADOLC_WITH_TAPELESS_REFCOUNTING_STRING}" STREQUAL "")
+    SET(ADOLC_WITH_TAPELESS_REFCOUNTING TRUE)
+  ELSE()
+    SET(ADOLC_WITH_TAPELESS_REFCOUNTING FALSE)
+  ENDIF()
+
   #
   # Check whether ADOL-C is configured to use the Boost pool allocator
   #

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 717ca8b89769c09d77ac2e252b590163be24dd3c..1c67a62a51e9172861aa4271931a22290ad98a4a 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -145,6 +145,7 @@
 /* cmake/modules/FindADOLC.cmake */
 #cmakedefine DEAL_II_ADOLC_WITH_ATRIG_ERF
 #cmakedefine DEAL_II_ADOLC_WITH_ADVANCED_BRANCHING
+#cmakedefine DEAL_II_ADOLC_WITH_TAPELESS_REFCOUNTING
 
 /* cmake/modules/FindARPACK.cmake */
 #cmakedefine DEAL_II_ARPACK_WITH_PARPACK