Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump minimum dune version to 2.9 #914

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bump minimum dune version to 2.9 #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dune.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ Description: OPM's numerical framework for flow and transport in porous media
Url: http://opm-project.org
MaintainerName: The Open Porous Media Project
Maintainer: [email protected]
Depends: dune-grid (>= 2.7) dune-istl (>= 2.7) opm-common
Suggests: dune-localfunctions (>= 2.7) dune-fem (>= 2.7) dune-alugrid (>= 2.7) opm-grid
Depends: dune-grid (>= 2.9) dune-istl (>= 2.9) opm-common
Suggests: dune-localfunctions (>= 2.9) dune-fem (>= 2.9) dune-alugrid (>= 2.9) opm-grid
9 changes: 2 additions & 7 deletions opm/models/discretization/common/fvbaseproblem.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,8 @@ public:
*/
void gridChanged()
{
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 8)
elementMapper_.update(gridView_);
vertexMapper_.update(gridView_);
#else
elementMapper_.update();
vertexMapper_.update();
#endif
elementMapper_.update(gridView_);
vertexMapper_.update(gridView_);

if (enableVtkOutput_())
defaultVtkWriter_->gridChanged();
Expand Down
5 changes: 0 additions & 5 deletions opm/models/io/vtkmultiwriter.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,8 @@ public:
*/
void gridChanged()
{
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 8)
elementMapper_.update(gridView_);
vertexMapper_.update(gridView_);
#else
elementMapper_.update();
vertexMapper_.update();
#endif
}

/*!
Expand Down
16 changes: 0 additions & 16 deletions opm/models/parallel/gridcommhandles.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,7 @@ public:
return codim == commCodim;
}

#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int, int) const
#else
bool fixedSize(int, int) const
#endif
{
// for each DOF we communicate a single value which has a
// fixed size
Expand Down Expand Up @@ -120,11 +116,7 @@ public:
return codim == commCodim;
}

#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int, int) const
#else
bool fixedSize(int, int) const
#endif
{
// for each DOF we communicate a single value which has a
// fixed size
Expand Down Expand Up @@ -179,11 +171,7 @@ public:
return codim == commCodim;
}

#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int, int) const
#else
bool fixedSize(int, int) const
#endif
{
// for each DOF we communicate a single value which has a
// fixed size
Expand Down Expand Up @@ -240,11 +228,7 @@ public:
return codim == commCodim;
}

#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int, int) const
#else
bool fixedSize(int, int) const
#endif
{
// for each DOF we communicate a single value which has a
// fixed size
Expand Down
8 changes: 0 additions & 8 deletions opm/simulators/linalg/elementborderlistfromgrid.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,7 @@ class ElementBorderListFromGrid
bool contains(int, int codim) const
{ return codim == 0; }

#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int, int) const
#else
bool fixedSize(int, int) const
#endif
{ return true; }

template <class EntityType>
Expand Down Expand Up @@ -172,11 +168,7 @@ class ElementBorderListFromGrid
bool contains(int, int codim) const
{ return codim == 0; }

#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int, int) const
#else
bool fixedSize(int, int) const
#endif
{ return true; }

template <class EntityType>
Expand Down
13 changes: 5 additions & 8 deletions opm/simulators/linalg/ilufirstelement.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,16 @@

#ifndef EWOMS_ILU_FIRSTELEMENT_HH
#define EWOMS_ILU_FIRSTELEMENT_HH

#include <dune/common/version.hh>
#include <opm/simulators/linalg/matrixblock.hh>

namespace Opm
{
namespace Opm {

template<class K, int n, int m>
#if DUNE_VERSION_GTE(DUNE_GRID, 2, 8)
K& firstMatrixElement(MatrixBlock<K, n, m>& A)
#else
K& firstmatrixelement(MatrixBlock<K, n, m>& A)
#endif
{ return A[0][0]; }
}
#endif // EWOMS_ILU_FIRSTELEMENT_HH

}

#endif // EWOMS_ILU_FIRSTELEMENT_HH
4 changes: 0 additions & 4 deletions opm/simulators/linalg/vertexborderlistfromgrid.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ public:
bool contains(int dim, int codim) const
{ return dim == codim; }

#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int, int) const
#else
bool fixedSize(int, int) const
#endif
{ return true; }

template <class EntityType>
Expand Down