Commit 3bf913a1 authored by Kilian Weishaupt's avatar Kilian Weishaupt

Merge branch 'fix/make-headercheck-for-3.0-alpha' into 'next'

[headercheck] fix includes, branch between different Dune versions

See merge request !712
parents 51e30d54 0d616193
......@@ -25,8 +25,8 @@
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_DARCYS_LAW_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_DARCYS_LAW_HH
#include <dune/common/densevector.hh>
#include <dune/common/densematrix.hh>
#include <dune/common/dynvector.hh>
#include <dune/common/dynmatrix.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
......
......@@ -24,6 +24,10 @@
#ifndef DUMUX_DISCRETIZATION_MPFA_DUALGRID_INDEX_SET_HH
#define DUMUX_DISCRETIZATION_MPFA_DUALGRID_INDEX_SET_HH
#include <cassert>
#include <vector>
#include <algorithm>
namespace Dumux
{
......
......@@ -24,6 +24,9 @@
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_FOURIERS_LAW_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_FOURIERS_LAW_HH
#include <dune/common/dynvector.hh>
#include <dune/common/dynmatrix.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/methods.hh>
......
......@@ -25,6 +25,8 @@
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_LOCAL_FACE_DATA_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_LOCAL_FACE_DATA_HH
#include <cassert>
namespace Dumux
{
/*!
......
......@@ -33,6 +33,7 @@
#include <dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh>
#include <dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh>
#include <dumux/discretization/cellcentered/mpfa/interactionvolume.hh>
#include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh>
#include <dumux/discretization/cellcentered/mpfa/localfacedata.hh>
#include <dumux/discretization/cellcentered/mpfa/methods.hh>
......
......@@ -26,6 +26,7 @@
#include <numeric>
#include <dune/common/version.hh>
#include <dune/common/fvector.hh>
#include <dune/geometry/type.hh>
#include <dune/geometry/affinegeometry.hh>
......@@ -210,7 +211,11 @@ public:
static PlaneGeometryType makePlane(const GlobalPosition& p0, const GlobalPosition& p1)
{
const std::vector< Dune::FieldVector< Scalar, dim > > corners = {p0, p1};
#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
return PlaneGeometryType(Dune::GeometryTypes::line, corners);
#else
return PlaneGeometryType(Dune::GeometryType::simplex, corners);
#endif
}
/*!
......@@ -228,7 +233,11 @@ public:
const GlobalPosition& p3)
{
const std::vector< Dune::FieldVector< Scalar, dim > > corners = {p0, p1, p2, p3};
#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
return PlaneGeometryType(Dune::GeometryTypes::quadrilateral, corners);
#else
return PlaneGeometryType(Dune::GeometryType::cube, corners);
#endif
}
/*!
......
......@@ -30,7 +30,8 @@
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <dumux/common/basicproperties.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
namespace Dumux
{
......
......@@ -32,6 +32,9 @@
namespace Dumux {
template<class Scalar, int dim>
class PointCloudVtkWriter;
/*!
* \ingroup InputOutput
* \brief A VTK output module to simplify writing dumux simulation data to VTK format
......
......@@ -25,6 +25,7 @@
#define THERMALCONDUCTIVITY_JOHANSEN_HH
#include <cmath>
#include <algorithm>
namespace Dumux
{
......
......@@ -277,7 +277,8 @@ public:
int compJIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(0 <= compIIdx && compIIdx < numComponents);
assert(0 <= compJIdx && compJIdx < numComponents);
const Scalar T = fluidState.temperature(phaseIdx);
const Scalar p = fluidState.pressure(phaseIdx);
......
Markdown is supported
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