From 0846b195b3aba7c282e7460b88404a89fdcfb927 Mon Sep 17 00:00:00 2001
From: Hamza Oukili <hamza.oukili@iws.uni-stuttgart.de>
Date: Fri, 24 Mar 2023 10:47:18 +0000
Subject: [PATCH] Merge branch 'fix/update-versions-for-release-3-7' into
'master'
Fix/update versions for release 3 7
See merge request dumux-repositories/dumux!3482
(cherry picked from commit 869dd11bb0d4d875997b677756e0284d581f40b6)
87e8669d Update versions in installation files for 3.7
a62dd6dd New version requirement dor the 3.7 release
ab2be3fb Add requirements with new versions in CHANGELOG
---
CHANGELOG.md | 2 ++
bin/installdumux.py | 4 ++--
bin/installexternal.py | 2 +-
dune.module | 6 +++---
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec4303e55a..ff1eec8c6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
Differences Between DuMu<sup>x</sup> 3.7 and DuMu<sup>x</sup> 3.6
=============================================
+- __Requirements__: DuMux requires Dune >=2.9 and CMake >= 3.14. It was successfully tested with dune-mmesh 1.4 and OPM 2022.10.
+
### General changes / structure
- __Testing/CI__: One of the CI pipelines now includes a build of the `doxygen` documentation. The result of this
diff --git a/bin/installdumux.py b/bin/installdumux.py
index 301303cd97..b7dc8a2ece 100755
--- a/bin/installdumux.py
+++ b/bin/installdumux.py
@@ -30,8 +30,8 @@ parser = argparse.ArgumentParser(
description="This script downloads and compiles the latest release of Dumux.",
)
# Optional arguments
-parser.add_argument("--dune-version", default="2.8", help="Dune version to be checked out.")
-parser.add_argument("--dumux-version", default="3.6", help="Dumux version to be checked out.")
+parser.add_argument("--dune-version", default="2.9", help="Dune version to be checked out.")
+parser.add_argument("--dumux-version", default="3.7", help="Dumux version to be checked out.")
args = vars(parser.parse_args())
duneBranch = (
diff --git a/bin/installexternal.py b/bin/installexternal.py
index da831a7b1c..3fd7951bdc 100755
--- a/bin/installexternal.py
+++ b/bin/installexternal.py
@@ -210,7 +210,7 @@ options.add_argument(
parser.add_argument("--dune-branch", default="releases/2.9", help="Dune branch to be checked out.")
parser.add_argument(
- "--dumux-branch", default="releases/3.6", help="Dumux branch to be checked out."
+ "--dumux-branch", default="releases/3.7", help="Dumux branch to be checked out."
)
parser.add_argument("--opm-branch", default="release/2022.10", help="Opm branch to be checked out.")
parser.add_argument("--mmesh-branch", default="release/1.4", help="Mmesh branch to be checked out.")
diff --git a/dune.module b/dune.module
index c2fcccbb05..5bd1630baf 100644
--- a/dune.module
+++ b/dune.module
@@ -1,9 +1,9 @@
Module: dumux
-Version: 3.7-git
+Version: 3.8-git
Author: The DuMux Team
Maintainer: dumux@listserv.uni-stuttgart.de
-Depends: dune-common (>=2.8) dune-grid (>=2.8) dune-localfunctions (>=2.8) dune-istl (>=2.8)
-Suggests: dune-alugrid (>=2.8) dune-foamgrid (>=2.8) dune-uggrid (>=2.8) dune-functions (>=2.8) opm-common opm-grid dune-subgrid (>=2.8) dune-spgrid (>=2.8) dune-mmesh (>=1.2)
+Depends: dune-common (>=2.9) dune-grid (>=2.9) dune-localfunctions (>=2.9) dune-istl (>=2.9)
+Suggests: dune-alugrid (>=2.9) dune-foamgrid (>=2.9) dune-uggrid (>=2.9) dune-functions (>=2.9) opm-common opm-grid dune-subgrid (>=2.9) dune-spgrid (>=2.9) dune-mmesh (>=1.4)
Description: DuMux is a module for simulation of multi-phase multi-component flow transport in porous media
URL: https://dumux.org
Python-Requires: numpy
--
GitLab