Commit af5af88e authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Remove code paths for Dune 2.2.

(reviewed by martinb)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12724 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent a3ff7b25
......@@ -26,12 +26,7 @@
#include <iostream>
#include <dune/common/parametertreeparser.hh>
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
#include <dune/common/parallel/mpihelper.hh>
#else
#include <dune/common/mpihelper.hh>
#endif
#include <dune/grid/io/file/dgfparser.hh>
......@@ -529,11 +524,7 @@ int start_(int argc,
// instantiate and run the concrete problem
TimeManager timeManager;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
Problem problem(timeManager, GridCreator::grid().leafGridView());
#else
Problem problem(timeManager, GridCreator::grid().leafView());
#endif
timeManager.init(problem, restartTime, dt, tEnd, restart);
timeManager.run();
// print dumux end message
......
......@@ -24,12 +24,7 @@
#define DUMUX_TIME_MANAGER_HH
#include <dune/common/timer.hh>
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
#include <dune/common/parallel/mpihelper.hh>
#else
#include <dune/common/mpihelper.hh>
#endif
#include "propertysystem.hh"
#include "parameters.hh"
......
......@@ -141,11 +141,8 @@ public:
for (int i = 0; i < dim; i++)
refVelocity[i] = 0.5 * (flux[2*i + 1] - flux[2*i]);
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef Dune::ReferenceElements<Scalar, dim> ReferenceElements;
#else
typedef Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
#endif
const Dune::FieldVector<Scalar, dim>& localPos = ReferenceElements::general(eIt->geometry().type()).position(0,
0);
......
......@@ -80,22 +80,14 @@ class FVVelocity2P
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename Element::Geometry Geometry;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Geometry::JacobianTransposed JacobianTransposed;
#else
typedef typename Geometry::Jacobian JacobianTransposed;
#endif
typedef typename Geometry::JacobianTransposed JacobianTransposed;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
#endif
enum
{
......
......@@ -60,11 +60,7 @@ class FVVelocity2PAdaptive: public FVVelocity2P<TypeTag>
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
#endif
enum
{
......
......@@ -80,13 +80,8 @@ class FvMpfaL2dPressure2p: public FVPressure<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......
......@@ -82,13 +82,8 @@ class FvMpfaL2dPressure2pAdaptive: public FVPressure<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......
......@@ -59,13 +59,8 @@ template<class TypeTag> class FvMpfaL2dPressureVelocity2p: public FvMpfaL2dPress
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......
......@@ -61,13 +61,8 @@ template<class TypeTag> class FvMpfaL2dPressureVelocity2pAdaptive: public FvMpfa
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......@@ -86,11 +81,7 @@ template<class TypeTag> class FvMpfaL2dPressureVelocity2pAdaptive: public FvMpfa
typedef typename GridView::Intersection Intersection;
typedef typename Grid::template Codim<0>::Entity::Geometry Geometry;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Geometry::JacobianTransposed JacobianTransposed;
#else
typedef typename Geometry::Jacobian JacobianTransposed;
#endif
typedef typename Geometry::JacobianTransposed JacobianTransposed;
typedef typename ParentType::InteractionVolume InteractionVolume;
......
......@@ -64,13 +64,8 @@ template<class TypeTag> class FvMpfaL2dVelocity2p
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......@@ -94,11 +89,7 @@ template<class TypeTag> class FvMpfaL2dVelocity2p
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
typedef typename Element::Geometry Geometry;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Geometry::JacobianTransposed JacobianTransposed;
#else
typedef typename Geometry::Jacobian JacobianTransposed;
#endif
typedef typename Geometry::JacobianTransposed JacobianTransposed;
typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
......
......@@ -61,13 +61,8 @@ template<class TypeTag> class FvMpfaL2dVelocity2pAdaptive : public FvMpfaL2dVelo
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......@@ -91,11 +86,7 @@ template<class TypeTag> class FvMpfaL2dVelocity2pAdaptive : public FvMpfaL2dVelo
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
typedef typename Element::Geometry Geometry;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Geometry::JacobianTransposed JacobianTransposed;
#else
typedef typename Geometry::Jacobian JacobianTransposed;
#endif
typedef typename Geometry::JacobianTransposed JacobianTransposed;
typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
......
......@@ -60,13 +60,8 @@ class FvMpfaL3dInteractionVolumeContainer
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......
......@@ -57,13 +57,8 @@ class FvMpfaL3dInteractionVolumeContainerAdaptive: public FvMpfaL3dInteractionVo
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......
......@@ -82,13 +82,8 @@ class FvMpfaL3dPressure2p: public FVPressure<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......
......@@ -86,13 +86,8 @@ class FvMpfaL3dPressure2pAdaptive: public FvMpfaL3dPressure2p<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......
......@@ -78,13 +78,8 @@ template<class TypeTag> class FvMpfaL3dPressureVelocity2p: public FvMpfaL3dPress
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
......
......@@ -79,13 +79,8 @@ template<class TypeTag> class FvMpfaL3dPressureVelocity2pAdaptive: public FvMpfa
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
......
......@@ -62,13 +62,8 @@ template<class TypeTag> class FvMpfaL3dVelocity2p
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......@@ -93,11 +88,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2p
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
typedef typename Element::Geometry Geometry;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Geometry::JacobianTransposed JacobianTransposed;
#else
typedef typename Geometry::Jacobian JacobianTransposed;
#endif
typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
......
......@@ -63,13 +63,8 @@ template<class TypeTag> class FvMpfaL3dVelocity2pAdaptive: public FvMpfaL3dVeloc
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......
......@@ -76,13 +76,8 @@ class FvMpfaO2dPressure2p: public FVPressure<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
#else
typedef typename Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
#endif
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
......
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