(cherry picked from commit 5550234c)

(cherry picked from commit 3e93ea7b)

Timo Koch authored 7 years ago and Kilian Weishaupt committed 7 years ago

[opm] Update dumux to newest opm release

See merge request !526

Adapt geometry() functions of opm-grid

Patch has been applied upstream

The installexternal.sh script can be used to install opm
and ert and to apply patches to opm-common and opm-parser.

With Opm release 2016.04, the module dune-cornerpoint has been
renamed to opm-grid. Interfaces changed without deprecation. There
doesn't seem to be a preprocessor macro to check for the employed
Opm version. Therefore, drop support for older versions and only
support 2016.04.

Kilian Weishaupt authored 9 years ago and Timo Koch committed 9 years ago

This patch removes deprecated header files related to the change of the
folder structure.

Usage: patch -p1 < path/to/Patch
(cherry picked from commit 00892d56)

We still need to patch Dune-multidomaingrid. Since we anyway need
to patch, the issue with GCC 6 can also be solved by the patch.

Thanks to Thomas for noticing.

The installexternal script is updated to fetch and build the correct Opm
modules.

No patch is required anymore for dune-multidomaingrid. In order to keep that
situation, add `#include <numeric>` to the problem files of the multidomain
tests. This is required if the tests are built with GCC 6.

Adapt README files.

Dumux 2.9 depends on Dune >= 2.4. Delete obsolete patch for
dune-grid, update the one for dune-istl. Adapt README.

- Add a missing } in the test cc file.
- Add Dune::Geometries to CpFVElementGeometry.
- Fix the boundary transmissibilities.
- Change call to Opm parser routine to be compatible with Opm 2015.10.
- Adapt patches to Opm 2015.10.

Apply it also in the external script. The patch
makes entities copy assignable.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15502 2fb0f335-1f38-0410-981e-8018bf24f1b0

The added patch multidomaingrid-2.3.patch adapts the
releases/2.3-branch of dune-multidomaingrid such that the 2.4 versions
of the Dune core modules can be used. See patches/README and
test/multidomain/README for details.

Reviewed by fetzer.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15379 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15259 2fb0f335-1f38-0410-981e-8018bf24f1b0

Introduce a grid creator that reads from a Petrel output / Eclipse input
file and generates a CpGrid that is offered by the OPM module
dune-cornerpoint. Enhance the fully-implicit cell-centered models to be
able to deal with cornerpoint grids, test the functionality. This patch
consists of several parts:

- patches/ and dune.module: the CMake buildsystems from Dune and OPM are
  not compatible. The patches change some CMake files in the required
  OPM modules opm-parser, opm-core and dune-cornerpoint in such a way
  that those modules can serve as a dependency for Dumux. In addition,
  some specific CMake options have to be passed to dunecontrol. See
  patches/README for details.

- dumux/io/: defines the CpGridCreator which behaves like any other grid
  creator that reads from a file. In addition, it offers the Eclipse
  input deck in form of a static function deck(). This deck can be used
  to extract further simulation parameters, most prominently porosity
  and permeability values.

- dumux/implicit/cornerpoint/: changes some of the cell-centered
  classes to be able to deal with a CpGrid. The changes in the
  ElementVolumeVariables and the FVElementGeometry are minor and
  required by the facts that a CpGrid doesn't offer codim-1/2 entities
  and that the geometries don't offer local-to-global mappings. The
  changes in the DarcyFluxVariables are made for enhancing the
  robustness of the two-point flux approximation by forcing the
  inter-element transmissibilities to be positive.

- test/implicit/2p: runs a fully-implicit two-phase immiscible model on
  a CpGrid. An element index with an injection rate can be given in the
  input file. The grid provided in grids/ consists of only four
  elements, but exhibits typical cornerpoint features like a
  nonconforming situation and general hexahedrons. A more realistic grid
  will be provided in dumux-lecture soon.

Reviewed by gruenich.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15183 2fb0f335-1f38-0410-981e-8018bf24f1b0

Remove deprecated, Autotools-based build system.
Use CMake-based one instead.
(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14939 2fb0f335-1f38-0410-981e-8018bf24f1b0

It was for compatibilty with Dune 2.2 which is no longer supported.
(reviewed by becker)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14479 2fb0f335-1f38-0410-981e-8018bf24f1b0

The patch allows using the multidomain models together with a UG library
that has been compiled for parallel usage. Most likely, the patch will
make its way to dune-grid and should not be needed anymore from
dune-grid 2.4.

Approved by natalies.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13501 2fb0f335-1f38-0410-981e-8018bf24f1b0

files and installation script



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13288 2fb0f335-1f38-0410-981e-8018bf24f1b0

correct use of wildcards, add ALUGrid flags to tests with AMG.

Merge revisions 12949, 13246 and 13248 from the strip-pdelab branch.
They all improve the buildsystem behavior.

Thanks to Markus Blatt for the work.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13282 2fb0f335-1f38-0410-981e-8018bf24f1b0

The correct usage of wildcards is "$(wildcard *.hh)".
With this patch we use these instead of "*.hh".

Quoting from https://www.gnu.org/software/make/manual/html_node/Wildcard-Examples.html#Wildcard-Examples

Wildcard expansion does not happen when you define a variable. Thus, if you write this:

     objects = *.o

then the value of the variable objects is the actual string ‘*.o’. However, if you use the value of objects in a target or prerequisite, wildcard expansion will take place there. If you use the value of objects in a recipe, the shell may perform wildcard expansion when the recipe runs. To set objects to the expansion, instead use:

     objects := $(wildcard *.o)



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/branches/strip-pdelab@13248 2fb0f335-1f38-0410-981e-8018bf24f1b0

Apply patches now with -p1 instead of -p0.
(reviewed and improved by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12750 2fb0f335-1f38-0410-981e-8018bf24f1b0

(reviewed by martinb)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12724 2fb0f335-1f38-0410-981e-8018bf24f1b0

Improve documentation on how to use the multidomain stuff.
Add patch to make it work without further touching the code.
(reviewed by fetzer, approved by martins)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12666 2fb0f335-1f38-0410-981e-8018bf24f1b0

Only PDELab 1.1 is supported.
(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12646 2fb0f335-1f38-0410-981e-8018bf24f1b0

It is needed for external modules which depends
on dumux when used together with dune-common 2.2.
With dune 2.3 it is not needed anymore.
(reviewed by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12537 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11650 2fb0f335-1f38-0410-981e-8018bf24f1b0

avoid distracing output from patch.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10639 2fb0f335-1f38-0410-981e-8018bf24f1b0

(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10593 2fb0f335-1f38-0410-981e-8018bf24f1b0

dune-common r7429 or newer).


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10435 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10364 2fb0f335-1f38-0410-981e-8018bf24f1b0

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10362 2fb0f335-1f38-0410-981e-8018bf24f1b0