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

Prepare OPM for DUNE 2.10 #758

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

Prepare OPM for DUNE 2.10 #758

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
2 changes: 1 addition & 1 deletion examples/finitevolume/finitevolume.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ template<class G>
void timeloop(const G& grid, double tend)
{
// make a mapper for codim 0 entities in the leaf grid
#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 8)
#if DUNE_VERSION_GTE(DUNE_GEOMETRY, 2, 8)
Dune::MultipleCodimMultipleGeomTypeMapper<typename G::LeafGridView> mapper(grid.leafGridView(), Dune::mcmgElementLayout());
#else
Dune::LeafMultipleCodimMultipleGeomTypeMapper<G> mapper(grid, Dune::mcmgElementLayout());
Expand Down
2 changes: 1 addition & 1 deletion opm/grid/common/SubGridPart.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct SubGridPartTraits {
using IntersectionIterator = typename Grid ::Traits ::LeafIntersectionIterator;

/** \brief type of the collective communication */
using CollectiveCommunication = typename Grid ::Traits ::CollectiveCommunication;
using CollectiveCommunication = typename Grid ::Traits ::Communication;


template <class BaseEntityType>
Expand Down
2 changes: 1 addition & 1 deletion opm/grid/cpgrid/CpGridData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ struct AttributeDataHandle
c2e_(cell_to_entity), grid_(grid)
{}

#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
bool fixedSize()
#else
bool fixedsize()
Expand Down
2 changes: 1 addition & 1 deletion opm/grid/cpgrid/Entity2IndexDataHandle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Entity2IndexDataHandle
: fromGrid_(fromGrid), toGrid_(toGrid), data_(data)
{}

#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
bool fixedSize()
{
return data_.fixedSize(3, codim);
Expand Down
4 changes: 2 additions & 2 deletions tests/cpgrid/distribution_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class CheckGlobalCellHandle

typedef int DataType;

#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
bool fixedSize()
#else
bool fixedsize()
Expand Down Expand Up @@ -217,7 +217,7 @@ class CheckBoundaryIdHandle
{}

typedef int DataType;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
bool fixedSize()
#else
bool fixedsize()
Expand Down