Commit 6df48e33 authored by Timo Koch's avatar Timo Koch
Browse files

[freeflow] Fix missing includes

parent a4afb066
......@@ -21,14 +21,12 @@
* \ingroup NavierStokesModel
* \copydoc Dumux::NavierStokesFluxVariables
*/
#ifndef DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
#define DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
#ifndef DUMUX_FREELOW_NAVIERSTOKES_FLUXVARIABLES_HH
#define DUMUX_FREELOW_NAVIERSTOKES_FLUXVARIABLES_HH
#include <dumux/common/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/freeflow/navierstokes/staggered/fluxvariables.hh>
namespace Dumux
{
......
......@@ -24,18 +24,18 @@
#ifndef DUMUX_FLUX_OVER_PLANE_STAGGERED_HH
#define DUMUX_FLUX_OVER_PLANE_STAGGERED_HH
#include <numeric>
#include <dune/common/fvector.hh>
#include <dumux/common/properties.hh>
#include <dune/geometry/type.hh>
#include <dune/geometry/affinegeometry.hh>
#include <dune/geometry/referenceelements.hh>
#include <dumux/common/boundingboxtree.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/geometry/intersectspointgeometry.hh>
namespace Dumux
{
namespace Dumux {
/*!
* \ingroup FreeflowModels
......@@ -271,7 +271,7 @@ public:
for(int planeIdx = 0; planeIdx < subPlanes.size(); ++planeIdx)
{
if(BoundingBoxTreeHelper<dim>::pointInGeometry(subPlanes[planeIdx], scvf.center()))
if(intersectsPointGeometry(scvf.center(), subPlanes[planeIdx]))
{
const Scalar velocity = sol_[faceIdx][dofIdx][0];
const Scalar result = fluxType(element, fvGeometry, scvf, velocity);
......
......@@ -35,6 +35,7 @@ namespace Properties
{
// forward declaration
NEW_PROP_TAG(EnableInertiaTerms);
NEW_PROP_TAG(ElementFaceVariables);
}
// forward declaration
......
......@@ -24,10 +24,11 @@
#ifndef DUMUX_NAVIERSTOKES_NC_STAGGERED_FLUXVARIABLES_HH
#define DUMUX_NAVIERSTOKES_NC_STAGGERED_FLUXVARIABLES_HH
#include <numeric>
#include <dumux/common/properties.hh>
#include <dumux/discretization/fluxvariablesbase.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/freeflow/navierstokes/staggered/fluxvariables.hh>
#include <dumux/freeflow/navierstokes/fluxvariables.hh>
namespace Dumux
{
......
......@@ -26,10 +26,10 @@
#include <dune/common/hybridutilities.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/freeflow/navierstokes/localresidual.hh>
namespace Dumux
{
namespace Dumux {
// forward declaration
template<class TypeTag, DiscretizationMethods Method>
......@@ -40,7 +40,8 @@ class NavierStokesNCResidualImpl;
* \brief Element-wise calculation of the multi-component Navier-Stokes residual for models using the staggered discretization
*/
template<class TypeTag>
class NavierStokesNCResidualImpl<TypeTag, DiscretizationMethods::Staggered> : public NavierStokesResidual<TypeTag>
class NavierStokesNCResidualImpl<TypeTag, DiscretizationMethods::Staggered>
: public NavierStokesResidual<TypeTag>
{
using ParentType = NavierStokesResidual<TypeTag>;
friend class StaggeredLocalResidual<TypeTag>;
......
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