OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #623 from robertk-iris/dune-3.0-compat

Browse Source 
Make code compile with dune trunk version (ie 3.0-git). This should incl...
This commit is contained in:
Atgeirr Flø Rasmussen 2014-08-08 10:14:13 +02:00
commit a455f23799
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -45,7 +45,7 @@ include (${project}-prereqs)
include (CMakeLists_files.cmake) include (CMakeLists_files.cmake)
macro (config_hook) macro (config_hook)
# opm_need_version_of ("dune-common") opm_need_version_of ("dune-common")
opm_need_version_of ("dune-istl") opm_need_version_of ("dune-istl")
endmacro (config_hook) endmacro (config_hook)

8
tests/test_parallel_linearsolver.cpp
View File

@ -30,11 +30,19 @@
// MPI header // MPI header
#if HAVE_MPI #if HAVE_MPI
#include <mpi.h> #include <mpi.h>
#include <dune/common/version.hh>
#include <dune/common/parallel/indexset.hh> #include <dune/common/parallel/indexset.hh>
#include <dune/common/parallel/communicator.hh> #include <dune/common/parallel/communicator.hh>
#include <dune/common/parallel/remoteindices.hh> #include <dune/common/parallel/remoteindices.hh>
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
#include <dune/common/parallel/mpicollectivecommunication.hh>
#include <dune/common/parallel/collectivecommunication.hh>
#else
#include <dune/common/mpicollectivecommunication.hh> #include <dune/common/mpicollectivecommunication.hh>
#include <dune/common/collectivecommunication.hh> #include <dune/common/collectivecommunication.hh>
#endif
#include <dune/istl/owneroverlapcopy.hh> #include <dune/istl/owneroverlapcopy.hh>
#include <opm/core/linalg/ParallelIstlInformation.hpp> #include <opm/core/linalg/ParallelIstlInformation.hpp>
#else #else