[dune-pdelab] Fix headercheck, especially for Eigen

[Christian Engwer]

Hi Christoph,

sorry for the long silence, but it is vacation time.

thanks for your patches, I pushed them to master.

Christian

On Wed, Jul 30, 2014 at 09:08:35AM +0200, Christoph Grüninger wrote:
> Hi PDElab,
> find attached a patches to fix headercheck, especially when Eigen is
> found. A fair portion of the patch should be backported to PDELab 2.0.
> 
> Bye
> Christoph
> 
> -- 
> GDB does hate your application, expresses its contempt through the
> design of its command-line interface.   -- Tom Tromey, FOSDEM 2014

> From 9e523a55f0328ce52737c47416130ce884d0eb04 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich at dune-project.org>
> Date: Wed, 30 Jul 2014 09:06:53 +0200
> Subject: Fix broken / add missing include for Eigen headers.
> 
> Ignore two executalbes in dune/pdelab/test/
> ---
>  dune/pdelab/backend/eigen/matrix.hh            | 2 ++
>  dune/pdelab/backend/eigen/solvers.hh           | 4 +++-
>  dune/pdelab/backend/eigen/vector.hh            | 4 ++++
>  dune/pdelab/common/polymorphicbufferwrapper.hh | 2 ++
>  dune/pdelab/test/.gitignore                    | 2 ++
>  5 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/dune/pdelab/backend/eigen/matrix.hh b/dune/pdelab/backend/eigen/matrix.hh
> index 95ebcd9..434b406 100644
> --- a/dune/pdelab/backend/eigen/matrix.hh
> +++ b/dune/pdelab/backend/eigen/matrix.hh
> @@ -8,6 +8,8 @@
>  #if HAVE_EIGEN
>  
>  #include <dune/pdelab/backend/common/uncachedmatrixview.hh>
> +#include <dune/pdelab/backend/tags.hh>
> +#include <dune/pdelab/ordering/orderingbase.hh>
>  #include <Eigen/Sparse>
>  
>  namespace Dune
> diff --git a/dune/pdelab/backend/eigen/solvers.hh b/dune/pdelab/backend/eigen/solvers.hh
> index 70a249b..41906c2 100644
> --- a/dune/pdelab/backend/eigen/solvers.hh
> +++ b/dune/pdelab/backend/eigen/solvers.hh
> @@ -4,15 +4,17 @@
>  #define DUNE_PDELAB_EIGEN_SOLVERS_HH
>  
>  #include <dune/common/deprecated.hh>
> +#include <dune/common/timer.hh>
>  #include <dune/common/parallel/mpihelper.hh>
>  
>  #include <dune/pdelab/constraints/common/constraints.hh>
>  
> -#include "solver.hh"
> +#include "../solver.hh"
>  
>  #if HAVE_EIGEN
>  
>  #include <Eigen/Eigen>
> +#include <Eigen/Sparse>
>  
>  namespace Dune {
>    namespace PDELab {
> diff --git a/dune/pdelab/backend/eigen/vector.hh b/dune/pdelab/backend/eigen/vector.hh
> index 3c9dff6..f57a7de 100644
> --- a/dune/pdelab/backend/eigen/vector.hh
> +++ b/dune/pdelab/backend/eigen/vector.hh
> @@ -4,9 +4,13 @@
>  #if HAVE_EIGEN
>  
>  #include <dune/common/shared_ptr.hh>
> +
> +#include <dune/istl/bvector.hh>
> +
>  #include <dune/pdelab/backend/tags.hh>
>  #include <dune/pdelab/backend/backendselector.hh>
>  #include <dune/pdelab/backend/common/uncachedvectorview.hh>
> +#include "descriptors.hh"
>  #include <Eigen/Dense>
>  
>  namespace Dune {
> diff --git a/dune/pdelab/common/polymorphicbufferwrapper.hh b/dune/pdelab/common/polymorphicbufferwrapper.hh
> index ad4d29d..78f2059 100644
> --- a/dune/pdelab/common/polymorphicbufferwrapper.hh
> +++ b/dune/pdelab/common/polymorphicbufferwrapper.hh
> @@ -3,6 +3,8 @@
>  #ifndef DUNE_PDELAB_COMMON_POLYMORPHICBUFFERWRAPPER_HH
>  #define DUNE_PDELAB_COMMON_POLYMORPHICBUFFERWRAPPER_HH
>  
> +#include <cstddef>
> +
>  namespace Dune {
>    namespace PDELab {
>  
> diff --git a/dune/pdelab/test/.gitignore b/dune/pdelab/test/.gitignore
> index a5b4f31..4edeb4b 100644
> --- a/dune/pdelab/test/.gitignore
> +++ b/dune/pdelab/test/.gitignore
> @@ -19,6 +19,7 @@ testedges02dinterpolationglobal
>  testedges03dfem
>  testedges03dgridfunctionspaceglobal
>  testedges03dinterpolationglobal
> +testeigenbackend
>  testelasticity
>  testelectrodynamic
>  testelectrodynamic-newmark
> @@ -36,6 +37,7 @@ testpoisson-old
>  testrt0
>  testrt02dgridfunctionspace
>  testrtfem
> +testsimplebackend
>  testutilities
>  test-composed-iis-gfs
>  test-dg-amg
> -- 
> 1.8.4.5
> 

> From 418dd6cfeaf7230ae682aa6d57897b2707c447ac Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich at dune-project.org>
> Date: Wed, 30 Jul 2014 09:07:38 +0200
> Subject: [autotools][Eigen] Add Eigen flags to ALL_PKG.
> 
> ---
>  m4/eigen.m4 | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/m4/eigen.m4 b/m4/eigen.m4
> index f4490c4..f188421 100644
> --- a/m4/eigen.m4
> +++ b/m4/eigen.m4
> @@ -21,6 +21,7 @@ AC_DEFUN([DUNE_EIGEN], [
>    AC_DEFINE([HAVE_EIGEN], ENABLE_EIGEN,
>      [This is only true if EIGEN was found by configure 
>       _and_ if the application uses the EIGEN_CXXFLAGS])
> +  DUNE_ADD_ALL_PKG([EIGEN], [\${EIGEN_CXXFLAGS}], [], [])
>  
>    # add automake conditionsl
>    AM_CONDITIONAL(EIGEN, test x$HAVE_EIGEN = xyes)
> -- 
> 1.8.4.5
> 




> _______________________________________________
> dune-pdelab mailing list
> dune-pdelab at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-pdelab


-- 
Prof. Dr. Christian Engwer 
Institut für Numerische und Angewandte Mathematik
Fachbereich Mathematik und Informatik der Universität Münster
Einsteinstrasse 62
48149 Münster

E-Mail	christian.engwer at uni-muenster.de
Telefon	+49 251 83-35067
FAX		+49 251 83-32729