OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3393 from akva2/fix_dune2.7_warnings

Browse Source 
quell dune2.7+ warning
This commit is contained in:
Bård Skaflestad
2021-06-20 11:54:45 +02:00
committed by GitHub
parent 441558726b a8ffe91841
commit 57aa8d0384
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ebos/collecttoiorank.cc
View File

@@ -28,6 +28,7 @@
#include <opm/grid/CpGrid.hpp>
#include <opm/grid/polyhedralgrid.hh>
#include <dune/common/version.hh>
#include <dune/grid/common/gridenums.hh>
#include <dune/grid/common/mcmgmapper.hh>
#if HAVE_DUNE_FEM
@@ -197,7 +198,11 @@ public:
: sendMapper_(sendMapper), recvMapper_(recvMapper), elementIndices_(elementIndices)
{}
using DataType = int;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 7)
bool fixedSize(int /*dim*/, int /*codim*/)
#else
bool fixedsize(int /*dim*/, int /*codim*/)
#endif
{
return true;
}
@@ -237,7 +242,11 @@ public:
: mapper_(mapper), elementIndices_(elementIndices)
{}
using DataType = int;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 7)
bool fixedSize(int /*dim*/, int /*codim*/)
#else
bool fixedsize(int /*dim*/, int /*codim*/)
#endif
{
return true;
}

7
ebos/eclgenericoutputblackoilmodule.hh
View File

@@ -39,7 +39,12 @@
#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#include <dune/common/parallel/mpicollectivecommunication.hh>
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 7)
#include <dune/common/parallel/communication.hh>
#else
#include <dune/common/parallel/collectivecommunication.hh>
#endif
#include <dune/common/parallel/mpihelper.hh>
namespace Opm {