From 0ebd25f66a49909281426e46c73dc9e7f224d409 Mon Sep 17 00:00:00 2001
From: Kai Bao <kai.bao@sintef.no>
Date: Mon, 23 May 2016 15:42:05 +0200
Subject: [PATCH] fixing the compilation error due to rebasing.

---
 opm/autodiff/BlackoilSolventModel_impl.hpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/opm/autodiff/BlackoilSolventModel_impl.hpp b/opm/autodiff/BlackoilSolventModel_impl.hpp
index 009bda4bf..77eeea780 100644
--- a/opm/autodiff/BlackoilSolventModel_impl.hpp
+++ b/opm/autodiff/BlackoilSolventModel_impl.hpp
@@ -378,6 +378,11 @@ namespace Opm {
 
         }
     }
+
+
+
+
+
     template <class Grid>
     void
     BlackoilSolventModel<Grid>::
@@ -410,7 +415,7 @@ namespace Opm {
         varstart += dss.size();
 
         // Extract well parts np phase rates + bhp
-        const V dwells = subset(dx, Span(Base::numWellVars(), 1, varstart));
+        const V dwells = subset(dx, Span(wellModel().numWellVars(), 1, varstart));
         varstart += dwells.size();
 
         assert(varstart == dx.size());
@@ -616,10 +621,7 @@ namespace Opm {
             std::copy(&rv[0], &rv[0] + nc, reservoir_state.rv().begin());
         }
 
-        // TODO: gravity should be stored as a member
-        // const double gravity = detail::getGravity(geo_.gravity(), UgGridHelpers::dimensions(grid_));
-        // asImpl().stdWells().updateWellState(dwells, gravity, dpMaxRel(), fluid_.phaseUsage(), active_, vfp_properties_, well_state);
-        Base::updateWellState(dwells,well_state);
+        wellModel().updateWellState(dwells, dpMaxRel(), well_state);
 
         // Update phase conditions used for property calculations.
         updatePhaseCondFromPrimalVariable(reservoir_state);