Feature/2p1c wettability

Introduced switch depending on formulation for privarswitch in volVars and spatialParams.

• adapt/create tests for changed wettability

Fixes #522 (closed)

Additionally: fix bug in 2p volVars with bf82b1e7 (already merged to master !1173 (merged))