Use default primary variable (Sg) for cells almost full of water

The first commit make sure Sg is used as primary variable for cells almost full of water also when updatePrimalVariableFromState is called.  

With this commit Andreas hack for setting primary variable is no longer needed in order to run Oves Vappars test. The effect on Norne is not known.