From 40c6b9d0e5da00aa29c252bb076a8eb83237d68b Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 21 Jun 2018 11:11:44 +0200
Subject: [PATCH] [cornerpoint] simplify installexternal and opm-grid patch
`opm-material` is not needed anymore. Since Dumux checks itself for
`opm-common` in its `CMakeLists.txt`, changes to `opm-grid`'s
buildsystem giles aren't necessary anymore.
---
bin/installexternal.sh | 7 +------
patches/opm-grid-2018.04.patch | 22 ----------------------
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/bin/installexternal.sh b/bin/installexternal.sh
index 8accbb6b62..561da744c2 100755
--- a/bin/installexternal.sh
+++ b/bin/installexternal.sh
@@ -291,21 +291,16 @@ installOPM()
git clone -b release/2018.04 https://github.com/OPM/opm-common
fi
- if [ ! -e opm-material ]; then
- git clone -b release/2018.04 https://github.com/OPM/opm-material
- fi
-
if [ ! -e opm-grid ]; then
git clone -b release/2018.04 https://github.com/OPM/opm-grid
fi
-
+
if test "$DOWNLOAD_ONLY" == "y"; then
return
fi
if test "$CLEANUP" == "y"; then
rm -rf opm-common
- rm -rf opm-material
rm -rf opm-grid
return
fi
diff --git a/patches/opm-grid-2018.04.patch b/patches/opm-grid-2018.04.patch
index a53bc518be..8b6c34f4b5 100644
--- a/patches/opm-grid-2018.04.patch
+++ b/patches/opm-grid-2018.04.patch
@@ -1,25 +1,3 @@
-diff --git a/dune.module b/dune.module
-index 9c81972..a711c48 100644
---- a/dune.module
-+++ b/dune.module
-@@ -10,5 +10,5 @@ Label: 2018.04
- Maintainer: atgeirr@sintef.no
- MaintainerName: Atgeirr F. Rasmussen
- Url: http://opm-project.org
--Depends: dune-common (>= 2.4) dune-geometry (>= 2.4) dune-grid (>= 2.4)
--Suggests: dune-istl (>= 2.4) opm-common
-+Depends: opm-common dune-common (>= 2.4) dune-geometry (>= 2.4) dune-grid (>= 2.4)
-+Suggests: dune-istl (>= 2.4)
-diff --git a/opm-grid-prereqs.cmake b/opm-grid-prereqs.cmake
-index 2ad0d86..032ac19 100644
---- a/opm-grid-prereqs.cmake
-+++ b/opm-grid-prereqs.cmake
-@@ -34,4 +34,5 @@ set (opm-grid_DEPS
- "ecl REQUIRED"
- )
-
-+include(OpmPackage)
- find_package_deps(opm-grid)
diff --git a/opm/grid/common/p2pcommunicator.hh b/opm/grid/common/p2pcommunicator.hh
index 1b4b327..55a2b2f 100644
--- a/opm/grid/common/p2pcommunicator.hh
--
GitLab