Merge pull request #404 from atgeirr/fix-initblackoilsurfvol

Guard against erroneous use of initBlackoilSurfvol().

opm/core/simulator/initState_impl.hpp

@@ -616,6 +616,10 @@ namespace Opm
                              const BlackoilPropertiesInterface& props,
                              State& state)
     {
+        if (props.numPhases() != 3) {
+            OPM_THROW(std::runtime_error, "initBlackoilSurfvol() is only supported in three-phase simulations.");
+        }
+
         const std::vector<double>& rs = state.gasoilratio();
 
         //make input for computation of the A matrix