From 64231809f5807c2f259244a93eb8ea4d9bae727f Mon Sep 17 00:00:00 2001
From: osae <osae@iris.no>
Date: Tue, 12 Aug 2014 19:36:25 +0200
Subject: [PATCH] Bugfix, correcting incomplete merge.

---
 opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp b/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
index 4dd01c49a..5a204de3b 100644
--- a/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
+++ b/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
@@ -476,16 +476,12 @@ namespace {
 
             if (active_[ Gas]) {
                 // Define Sg Rs and Rv in terms of xvar.
-                const ADB& rsSat = fluidRsSat(state.pressure, cells_);
-                const ADB& rvSat = fluidRvSat(state.pressure, cells_);
                 const ADB& xvar = vars[ nextvar++ ];
                 const ADB& sg = isSg*xvar + isRv* so;
                 state.saturation[ pu.phase_pos[ Gas ] ] = sg;
                 so = so - sg;
-
-                std::vector<int> all_cells = buildAllCells(nc);
-                ADB rsSat = fluidRsSat(state.pressure, so, all_cells);
-                ADB rvSat = fluidRvSat(state.pressure, so, all_cells);
+                const ADB rsSat = fluidRsSat(state.pressure, so, cells_);
+                const ADB rvSat = fluidRvSat(state.pressure, so, cells_);
 
                 if (has_disgas_) {
                     state.rs = (1-isRs) * rsSat + isRs*xvar;