Commit 13a1919d authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

update patches such that it is possible to install the OPM modules

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15259 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 4684e3e3
From af81ebdc32040da6b2687810ab65bcec0b4a0e05 Mon Sep 17 00:00:00 2001
From 6ec556b8521bf04cc46e00425bef2f911d93850a Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 28 Jul 2015 14:04:18 +0200
Date: Tue, 4 Aug 2015 17:33:00 +0200
Subject: adapt dune-cornerpoint such that it can be used by Dumux
---
cmake/Modules/Findopm-parser.cmake | 179 ++++++---------------------------
cmake/Modules/opm-parser-prereqs.cmake | 20 ++++
2 files changed, 52 insertions(+), 147 deletions(-)
cmake/Modules/Findopm-parser.cmake | 179 +++++----------------------
cmake/Modules/OpmFind.cmake | 1 +
cmake/Modules/dune-cornerpoint-prereqs.cmake | 2 +-
cmake/Modules/opm-core-prereqs.cmake | 2 +-
cmake/Modules/opm-parser-prereqs.cmake | 20 +++
dune/grid/cpgrid/CpGridData.hpp | 7 --
6 files changed, 55 insertions(+), 156 deletions(-)
create mode 100644 cmake/Modules/opm-parser-prereqs.cmake
diff --git a/cmake/Modules/Findopm-parser.cmake b/cmake/Modules/Findopm-parser.cmake
......@@ -205,6 +209,44 @@ index f69a491..fe721a0 100644
+ )
+include (UseDynamicBoost)
+#debug_find_vars ("opm-parser")
diff --git a/cmake/Modules/OpmFind.cmake b/cmake/Modules/OpmFind.cmake
index 592a983..91314f3 100644
--- a/cmake/Modules/OpmFind.cmake
+++ b/cmake/Modules/OpmFind.cmake
@@ -60,6 +60,7 @@ set (_opm_proj_exemptions
dune-grid
dune-geometry
opm-parser
+ opm-core
)
# although a DUNE module, it is delivered in the OPM suite
diff --git a/cmake/Modules/dune-cornerpoint-prereqs.cmake b/cmake/Modules/dune-cornerpoint-prereqs.cmake
index f4924ca..6a1c114 100644
--- a/cmake/Modules/dune-cornerpoint-prereqs.cmake
+++ b/cmake/Modules/dune-cornerpoint-prereqs.cmake
@@ -19,7 +19,7 @@ set (dune-cornerpoint_DEPS
"CXX11Features"
# various runtime library enhancements
"Boost 1.44.0
- COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED"
+ COMPONENTS date_time filesystem system iostreams unit_test_framework regex REQUIRED"
# DUNE dependency
"dune-common REQUIRED;
dune-grid REQUIRED;
diff --git a/cmake/Modules/opm-core-prereqs.cmake b/cmake/Modules/opm-core-prereqs.cmake
index ec118c5..ed35dcb 100644
--- a/cmake/Modules/opm-core-prereqs.cmake
+++ b/cmake/Modules/opm-core-prereqs.cmake
@@ -18,7 +18,7 @@ set (opm-core_DEPS
"CXX11Features REQUIRED"
# various runtime library enhancements
"Boost 1.44.0
- COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED"
+ COMPONENTS date_time filesystem system iostreams unit_test_framework regex REQUIRED"
# matrix library
"BLAS REQUIRED"
"LAPACK REQUIRED"
diff --git a/cmake/Modules/opm-parser-prereqs.cmake b/cmake/Modules/opm-parser-prereqs.cmake
new file mode 100644
index 0000000..309e12e
......@@ -231,6 +273,33 @@ index 0000000..309e12e
+ # Ensembles-based Reservoir Tools (ERT)
+ "ERT REQUIRED"
+ )
diff --git a/dune/grid/cpgrid/CpGridData.hpp b/dune/grid/cpgrid/CpGridData.hpp
index 682302b..abc945a 100644
--- a/dune/grid/cpgrid/CpGridData.hpp
+++ b/dune/grid/cpgrid/CpGridData.hpp
@@ -56,9 +56,6 @@
#else
#include <dune/common/mpihelper.hh>
#endif
-#ifdef HAVE_DUNE_ISTL
-#include <dune/istl/owneroverlapcopy.hh>
-#endif
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
#include <dune/common/parallel/collectivecommunication.hh>
@@ -386,12 +383,8 @@ private:
// Boundary information (optional).
bool use_unique_boundary_ids_;
-#ifdef HAVE_DUNE_ISTL
- typedef Dune::OwnerOverlapCopyAttributeSet::AttributeSet AttributeSet;
-#else
/// \brief The type of the set of the attributes
enum AttributeSet{owner, overlap};
-#endif
#if HAVE_MPI && DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
--
2.1.4
From 8820cd98c38e282911cd5eb417d3456b74aec424 Mon Sep 17 00:00:00 2001
From b30c947ee7b40f6e58e6d03e682c92c535568366 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 28 Jul 2015 13:59:19 +0200
Date: Tue, 4 Aug 2015 17:09:53 +0200
Subject: adapt opm-core such that it can be used by Dumux
---
cmake/Modules/Findopm-parser.cmake | 179 ++++++---------------------------
cmake/Modules/opm-core-prereqs.cmake | 2 +-
cmake/Modules/opm-parser-prereqs.cmake | 20 ++++
opm/core/linalg/call_umfpack.c | 12 +--
3 files changed, 58 insertions(+), 153 deletions(-)
4 files changed, 59 insertions(+), 154 deletions(-)
create mode 100644 cmake/Modules/opm-parser-prereqs.cmake
diff --git a/cmake/Modules/Findopm-parser.cmake b/cmake/Modules/Findopm-parser.cmake
......@@ -206,6 +207,19 @@ index f69a491..fe721a0 100644
+ )
+include (UseDynamicBoost)
+#debug_find_vars ("opm-parser")
diff --git a/cmake/Modules/opm-core-prereqs.cmake b/cmake/Modules/opm-core-prereqs.cmake
index ec118c5..ed35dcb 100644
--- a/cmake/Modules/opm-core-prereqs.cmake
+++ b/cmake/Modules/opm-core-prereqs.cmake
@@ -18,7 +18,7 @@ set (opm-core_DEPS
"CXX11Features REQUIRED"
# various runtime library enhancements
"Boost 1.44.0
- COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED"
+ COMPONENTS date_time filesystem system iostreams unit_test_framework regex REQUIRED"
# matrix library
"BLAS REQUIRED"
"LAPACK REQUIRED"
diff --git a/cmake/Modules/opm-parser-prereqs.cmake b/cmake/Modules/opm-parser-prereqs.cmake
new file mode 100644
index 0000000..309e12e
......
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