Change name to initBlackoilStateFromDeckUsingRS

The second input of initBlackoilStateFromDeck that computes surface
volumes based on gas/oil ratio is changed from
BlackoilPropertiesInterface to Props. To avoid duplication with the old
initBlackoilStateFromDeck its name is changed to
initBlackoilSurfvolUsingRS.

opm/core/simulator/initState_impl.hpp

@@ -609,11 +609,11 @@ namespace Opm
         }
     }   
     /// Initialize surface volume from pressure and saturation by z = As.
-    /// Here the RS factor is used to compute an intial z for the
+    /// Here the gas/oil ratio is used to compute an intial z for the
     /// computation of A.
     template <class Props, class State>
-    void initBlackoilSurfvol(const UnstructuredGrid& grid,
-                             const BlackoilPropertiesInterface& props,
+    void initBlackoilSurfvolUsingRS(const UnstructuredGrid& grid,
+                             const Props& props,
                              State& state)
     {
         if (props.numPhases() != 3) {
@@ -739,7 +739,7 @@ namespace Opm
                 int c_deck = (grid.global_cell == NULL) ? c : grid.global_cell[c];
                 state.gasoilratio()[c] = rs_deck[c_deck];
             }
-            initBlackoilSurfvol(grid, props, state);
+            initBlackoilSurfvolUsingRS(grid, props, state);
             computeSaturation(props,state);
         } else {
             OPM_THROW(std::runtime_error, "Temporarily, we require the RS field.");