2p1c primary variable switch and mixed wettability concept not consistent with other 2p compositional models

The 2p1c model is not adapted (at least in some parts) to the new mixed-wettability concept for two-phase flow.