From 2bcb14e88e5995215a88e1a1ca6a28f30a8e9adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Gr=C3=A4ser?= <graeser@mi.fu-berlin.de>
Date: Wed, 21 Oct 2009 20:08:13 +0000
Subject: [PATCH] Make dune-disc optional
[[Imported from SVN: r3021]]
---
ag-common/functiontools/leafp1functiontransfer.hh | 6 ++++++
ag-common/neumannassembler.hh | 6 ++++++
ag-common/surfmassmatrix.hh | 6 ++++++
dune.module | 3 ++-
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/ag-common/functiontools/leafp1functiontransfer.hh b/ag-common/functiontools/leafp1functiontransfer.hh
index 870cc789..6a052195 100644
--- a/ag-common/functiontools/leafp1functiontransfer.hh
+++ b/ag-common/functiontools/leafp1functiontransfer.hh
@@ -1,6 +1,8 @@
#ifndef LEAFP1FUNCTIONTRANSFER_HH
#define LEAFP1FUNCTIONTRANSFER_HH
+#if HAVE_DUNE_DISC
+
#include <vector>
#include <dune/common/bitsetvector.hh>
@@ -123,5 +125,9 @@ class LeafP1FunctionTransfer
};
+#else
+ #warning leafp1functiontransfer.hh was included but dune-disc is not present !
+#endif // end of #if HAVE_DUNE_DISC
+
#endif
diff --git a/ag-common/neumannassembler.hh b/ag-common/neumannassembler.hh
index 42747a76..8e95574f 100644
--- a/ag-common/neumannassembler.hh
+++ b/ag-common/neumannassembler.hh
@@ -1,6 +1,8 @@
#ifndef NEUMANN_ASSEMBLER_HH
#define NEUMANN_ASSEMBLER_HH
+#if HAVE_DUNE_DISC
+
/** \file
\brief Contains a method which assembles the right hand side term for Neumann boundary data.
*/
@@ -96,4 +98,8 @@ void assembleAndAddNeumannTerm(const BoundaryPatchBase<GridView>& neumannBoundar
}
+#else
+ #warning neumannassembler.hh was included but dune-disc is not present !
+#endif // end of #if HAVE_DUNE_DISC
+
#endif
diff --git a/ag-common/surfmassmatrix.hh b/ag-common/surfmassmatrix.hh
index da619907..7585765d 100644
--- a/ag-common/surfmassmatrix.hh
+++ b/ag-common/surfmassmatrix.hh
@@ -1,6 +1,8 @@
#ifndef SURFACE_MASSMATRIX_HH
#define SURFACE_MASSMATRIX_HH
+#if HAVE_DUNE_DISC
+
/** \file
\brief Contains a method which assembles the FE mass matrix of a boundary patch of a grid.
*/
@@ -133,4 +135,8 @@ void assembleSurfaceMassMatrix(const BoundaryPatchBase<GridView>& boundary,
}
+#else
+ #warning surfmassmatrix.hh was included but dune-disc is not present !
+#endif // end of #if HAVE_DUNE_DISC
+
#endif
diff --git a/dune.module b/dune.module
index 7dab00e4..4799f36f 100644
--- a/dune.module
+++ b/dune.module
@@ -1,2 +1,3 @@
Module: ag-common
-Depends: dune-common dune-grid dune-istl dune-disc dune-localfunctions
+Depends: dune-common dune-grid dune-istl dune-localfunctions
+Suggests: dune-disc
--
GitLab