Commit f2370a73 authored by Andreas Lauser's avatar Andreas Lauser
Browse files

box models: do not include PDELab headers if HAVE_DUNE_PDELAB is false

now the box problems can be compiled without having any PDELab files around...

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@4829 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 917bb5cb
......@@ -33,9 +33,11 @@
#include "boxelementvolumevariables.hh"
#include "boxvolumevariables.hh"
#if HAVE_DUNE_PDELAB
#include <dune/pdelab/finiteelementmap/p1fem.hh>
#include <dune/pdelab/finiteelementmap/q1fem.hh>
#include <dune/pdelab/backend/istlmatrixbackend.hh>
#endif // HAVE_DUNE_PDELAB
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/timemanager.hh>
......
......@@ -22,7 +22,9 @@
#ifndef DUMUX_PDELAB_BOX_ASSEMBLER_HH
#define DUMUX_PDELAB_BOX_ASSEMBLER_HH
#if HAVE_DUNE_PDELAB
#include "pdelabboxlocaloperator.hh"
#endif
namespace Dumux {
namespace PDELab {
......
......@@ -21,6 +21,10 @@
#ifndef DUMUX_PDELAB_BOX_LOCAL_OPERATOR_HH
#define DUMUX_PDELAB_BOX_LOCAL_OPERATOR_HH
#if ! HAVE_DUNE_PDELAB
#error "DUNE-PDELab must be available in order to include this file!"
#endif
#include<dune/pdelab/localoperator/pattern.hh>
#include<dune/pdelab/localoperator/flags.hh>
......
......@@ -23,6 +23,7 @@
#include <dumux/common/pardiso.hh>
#include <dumux/common/propertysystem.hh>
#include <dune/pdelab/backend/istlsolverbackend.hh>
namespace Dumux {
......
......@@ -23,14 +23,29 @@
#ifndef DUMUX_NEWTON_CONTROLLER_HH
#define DUMUX_NEWTON_CONTROLLER_HH
#include <dumux/io/vtkmultiwriter.hh>
#include <dumux/common/exceptions.hh>
#include <dumux/common/math.hh>
#include <dumux/common/pardiso.hh>
#include <dumux/io/vtkmultiwriter.hh>
#if HAVE_DUNE_PDELAB
#include <dumux/common/pdelabpreconditioner.hh>
#else // ! HAVE_DUNE_PDELAB
#include <dune/istl/overlappingschwarz.hh>
#include <dune/istl/schwarz.hh>
#include <dune/istl/preconditioners.hh>
#include <dune/istl/solvers.hh>
#include <dune/istl/owneroverlapcopy.hh>
#include <dune/istl/io.hh>
#endif // HAVE_DUNE_PDELAB
namespace Dumux
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment