From fb0fb14cab78a35650b90781f09b4e5639d52f20 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Wed, 30 May 2018 15:38:35 +0200
Subject: [PATCH] Include dune/fufem/adolc.hh
This is needed to build with a recent dune-common and dune-fufem
---
src/cosserat-continuum.cc | 9 +--------
src/gradient-flow.cc | 13 +++----------
src/harmonicmaps.cc | 11 ++---------
src/mixed-cosserat-continuum.cc | 11 ++---------
4 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index 94075e48..e6a29062 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -8,17 +8,10 @@
#include <adolc/drivers/drivers.h> // use of "Easy to Use" drivers
#include <adolc/taping.h>
+#include <dune/fufem/adolc.hh>
#include <dune/fufem/utilities/adolcnamespaceinjections.hh>
#include <dune/common/typetraits.hh>
-namespace Dune {
- template <>
- struct IsNumber<adouble>
- {
- constexpr static bool value = true;
- };
-}
-
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 875b800c..01ae6d7b 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -2,22 +2,15 @@
// vi: set et ts=4 sw=2 sts=2:
#include <config.h>
+#include <array>
+
// Includes for the ADOL-C automatic differentiation library
// Need to come before (almost) all others.
#include <adolc/adouble.h>
+#include <dune/fufem/adolc.hh>
#include <dune/fufem/utilities/adolcnamespaceinjections.hh>
#include <dune/common/typetraits.hh>
-namespace Dune {
- template <>
- struct IsNumber<adouble>
- {
- constexpr static bool value = true;
- };
-}
-
-#include <array>
-
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 6cbf4956..0792f4ff 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -1,22 +1,15 @@
#include <config.h>
#include <fenv.h>
+#include <array>
// Includes for the ADOL-C automatic differentiation library
// Need to come before (almost) all others.
#include <adolc/adouble.h>
+#include <dune/fufem/adolc.hh>
#include <dune/fufem/utilities/adolcnamespaceinjections.hh>
#include <dune/common/typetraits.hh>
-namespace Dune {
- template <>
- struct IsNumber<adouble>
- {
- constexpr static bool value = true;
- };
-}
-
-#include <array>
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
diff --git a/src/mixed-cosserat-continuum.cc b/src/mixed-cosserat-continuum.cc
index 9d6ef717..1a7e2e80 100644
--- a/src/mixed-cosserat-continuum.cc
+++ b/src/mixed-cosserat-continuum.cc
@@ -1,6 +1,7 @@
#include <config.h>
#include <fenv.h>
+#include <array>
// Includes for the ADOL-C automatic differentiation library
// Need to come before (almost) all others.
@@ -8,19 +9,11 @@
#include <adolc/drivers/drivers.h> // use of "Easy to Use" drivers
#include <adolc/taping.h>
+#include <dune/fufem/adolc.hh>
#include <dune/fufem/utilities/adolcnamespaceinjections.hh>
#include <dune/common/typetraits.hh>
-namespace Dune {
- template <>
- struct IsNumber<adouble>
- {
- constexpr static bool value = true;
- };
-}
-#include <array>
-
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
--
GitLab