Refactor primary variable switching

1. Read DISGAS and VAPOIL from deck 
2. Determine primalVariable_ and use it to switch primary variables. 

Tested on SPE1 
All ctests pass

The old phaseCondtion is still used for the property calculation.