Thomas Fetzer authored Mar 23, 2017 and Martin Schneider committed May 31, 2017

This property defines whether the initial and Dirichlet conditions are given as mole fractions for the wetting phase "true" or non-wetting phase "false".

Conflicts:
	dumux/porousmediumflow/2pnc/implicit/volumevariables.hh

[staggerednc][test] Fix tests and update ref solution

See merge request !490

* Old test used parabolic velocity profile as initital and boundary condition
  although Re was way over 1000. This led to some strange behaviour regarding
  the pressure gradient

* We now give the system some additional time so that the "right" pressure gradient
  can evolve before injecting the tracer

* Add output of deltaP

Fix/documentation for nex

See merge request !486

Feature/cleanup cc assembly

See merge request !487

Some links were outdated/not working.

The bc types were not used anywhere and are removed from the interface.
Now they don't have to be instantiated anymore in the evalFlux_ routine which is called
by the cclocaljacobian during assembly. This commit removes this call as well.

Thomas Fetzer authored Apr 24, 2017 and Timo Koch committed Apr 24, 2017

(cherry picked from commit 0a63a893)

Merge branch 'fix/gnuplotinterface' into 'master'

See merge request !481

[io][gnuplotinterface] Fix issue with outputDirectory for interactive plot

See merge request !480

Thomas Fetzer authored Apr 18, 2017 and Timo Koch committed Apr 18, 2017

(cherry picked from commit 4d0e694f)

Thomas Fetzer authored Apr 18, 2017 and Timo Koch committed Apr 18, 2017

Fix deprecation of plot(), thanks Timo for the heads-up.

(cherry picked from commit 25fd3f26)

[freeflow][fluxvars] Use correct volVars von nc

See merge request !477

* downStreamVolVars were wrong

Docu/fixtypos

See merge request !476

Merge branch 'feature/logo-readme' into 'master'

See merge request !475

[Readme] Reference dumux logo

See merge request !474

Port using adl for std mathfunctions to next

See merge request !406

Dennis Gläser authored Feb 09, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit 46facbd6)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit 0410f946)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit ab989eae)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit f5d0ca73)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit a5343e8f)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit 407f34c3)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit e2422de1)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit 19dcaddf)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit fa4df77b)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit ecd85fc1)

Sina Ackermann authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit 3b9e129a)

Katharina Heck authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit dd1ed250)

Katharina Heck authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit e84de5fa)

Katharina Heck authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit 120e441a)

Katharina Heck authored Feb 01, 2017 and Timo Koch committed Apr 06, 2017

(cherry picked from commit 774a513d)