Commit 5bbc49b0 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

[fix] add guards to include files depending on the DuMuX version

parent 4d63000e
Pipeline #9688 failed with stages
in 13 seconds
......@@ -27,8 +27,13 @@
#define ENABLEMONOLITHIC 0
#endif
#include <dumux/common/numeqvector.hh>
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......@@ -117,7 +122,13 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
#if ENABLEMONOLITHIC
......
......@@ -28,9 +28,11 @@
#define ENABLEMONOLITHIC 0
#endif
#include <dumux/common/numeqvector.hh>
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/1p/model.hh>
......@@ -97,7 +99,13 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using BoundaryTypes = Dumux::BoundaryTypes<
GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
......@@ -25,9 +25,12 @@
#ifndef DUMUX_DARCY_SUBPROBLEM_HH
#define DUMUX_DARCY_SUBPROBLEM_HH
#include <dumux/common/numeqvector.hh>
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/1p/model.hh>
......@@ -89,7 +92,11 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using BoundaryTypes = Dumux::BoundaryTypes<
GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
......@@ -25,9 +25,12 @@
#ifndef DUMUX_STOKES_SUBPROBLEM_HH
#define DUMUX_STOKES_SUBPROBLEM_HH
#include <dumux/common/numeqvector.hh>
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......@@ -109,7 +112,11 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
......
......@@ -27,7 +27,9 @@
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/discretization/cctpfa.hh>
......@@ -90,7 +92,11 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using BoundaryTypes = Dumux::BoundaryTypes<
GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
......@@ -27,7 +27,9 @@
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......@@ -110,7 +112,11 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
......
......@@ -24,7 +24,9 @@
#define DUMUX_STOKES_SUBPROBLEM_HH
#include <dumux/common/boundarytypes.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
......@@ -59,7 +61,11 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
......
......@@ -25,7 +25,9 @@
#define DUMUX_DARCY_SUBPROBLEM_HH
#include <dumux/common/boundarytypes.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/common/properties.hh>
#include <dumux/porousmediumflow/problem.hh>
......@@ -42,7 +44,11 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using BoundaryTypes = Dumux::BoundaryTypes<
GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
......@@ -27,9 +27,12 @@
#define ENABLEMONOLITHIC 0
#endif
#include <dumux/common/numeqvector.hh>
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......@@ -117,7 +120,11 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
#if ENABLEMONOLITHIC
......
......@@ -28,8 +28,11 @@
#define ENABLEMONOLITHIC 0
#endif
#include <dumux/common/numeqvector.hh>
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
//****** uncomment for the last exercise *****//
// #include <dumux/io/grid/subgridgridcreator.hh>
......@@ -100,7 +103,11 @@ class DarcySubProblem : public PorousMediumFlowProblemWithGravity<TypeTag>
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
#else
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
#endif
using BoundaryTypes = Dumux::BoundaryTypes<
GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
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