Cleanup/fs 338 3pwateroil

Fixes #338 and #337.

See merge request !261

Merge branch 'feature/use-ADL-for-std-functions' into 'master'

Feature/use adl for std functions

* `std::swap` and `dumux/common` was cleaned up
* much more needs to be done
* I found a bunch of other clean-up stuff

See merge request !259

See merge request !264

Feature/use adl for std functions

* `std::swap` and `dumux/common` was cleaned up
* much more needs to be done
* I found a bunch of other clean-up stuff

See merge request !259

Merge branch 'feature/opm-2016.10' into 'master'

[opm] Update to opm 2016.10 version

See merge request !262

See merge request !263

[opm] Update to opm 2016.10 version

See merge request !262

[2p2c][2pnc][2pncmin] Update phase presence indices and formulation indices -> identical to 2pnc

2p2c updated the reference solutions (changed phase presence indices)
2pnc changed: plSg --> pnsw; pgSl --> pwsn, removed plSg + pgSl from indices
2pncmin changed: plSg --> pnsw; pgSl --> pwsn as for 2pnc
2p2c, 2pnc: added the formulation changes to CHANGELOG.md

edit for next branch: Added the changes also to the 2pnc privarswitch

(cherry picked from commit b03738a2)

See merge request !260

Thomas Fetzer authored 8 years ago and Timo Koch committed 8 years ago

2p2c updated the reference solutions (changed phase presence indices)
2pnc changed: plSg --> pnsw; pgSl --> pwsn, removed plSg + pgSl from indices
2pncmin changed: plSg --> pnsw; pgSl --> pwsn as for 2pnc
2p2c, 2pnc: added the formulation changes to CHANGELOG.md

(cherry picked from commit b03738a2)

[2pnc][test] Clean-up spatialParams

* Remove deprecated, energy-related functions
* Test is isothermal anyway

(cherry picked from commit 182a63f2)

See merge request !257

[2pnc] Fix/2pnc

See merge request !258

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

* Remove deprecated, energy-related functions
* Test is isothermal anyway

(cherry picked from commit 182a63f2)

Fix/mpfalowdim

Improve/fix handling of branching points when dealing with network grids (2D in 3D)

See merge request !254

for dim < dimWorld (i.e. 2 < 3), the algorithm for the setup of the interactionvolume seed is more complex
than the one for dim = dimWorld = 2. This commit introduces a forwarding to the more simple algorithm if the
face does not touch a branching point.

we don't want to compare positions for the detection of branching points.
Note that the new implementation fails for hanging nodes on a 2d grid embedded
in a 3d domain.

Dennis Gläser authored 8 years ago and Timo Koch committed 8 years ago

for hanging nodes accessing the localscvfindexset was wrong, as indexInInside()
might be the same for two different intersections.

Dennis Gläser authored 8 years ago and Timo Koch committed 8 years ago

we introduced an element flux variables cache update in the cclocaljacobian
to make use of the fact that the transmissibilities are potentially not solution
dependent. In that case this process is skipped.

Dennis Gläser authored 8 years ago and Timo Koch committed 8 years ago

The stencils vector class is now set separately for the specific cell-centered
methods. Some methods might lead to non-symmetric global matrices, thus, the stencils
have to be set up differently.

Dennis Gläser authored 8 years ago and Timo Koch committed 8 years ago

We introduce method-specific implementations that should inherit from a
mpfa-specific base class (which inherits from the scvf base class). We define
an interface for the constructor that has to be met by all the implementations.
We do this so that the classes instantiating scv faces do not have to be
method-specific. We add a local index to the constructor which corresponds
to the local vertex index an scvf is connected to for the mpfa-o-fps scheme.