From a27015d00ccba65e9ba124cc30c73ad47963477a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Spjelkavik?= <bsp@sintef.no>
Date: Thu, 3 Feb 2011 15:41:20 +0100
Subject: [PATCH] No longer converts units.

---
 dune/porsol/blackoil/BlackoilFluid.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dune/porsol/blackoil/BlackoilFluid.hpp b/dune/porsol/blackoil/BlackoilFluid.hpp
index c1569f09..61160260 100644
--- a/dune/porsol/blackoil/BlackoilFluid.hpp
+++ b/dune/porsol/blackoil/BlackoilFluid.hpp
@@ -26,7 +26,6 @@
 #include <dune/porsol/blackoil/fluid/FluidStateBlackoil.hpp>
 #include <dune/common/EclipseGridParser.hpp>
 #include <dune/common/fvector.hh>
-#include <dune/common/Units.hpp>
 #include <vector>
 
 
@@ -50,11 +49,10 @@ namespace Opm
         {
             fmi_params_.init(parser);
             FluidSystemBlackoil<>::init(parser);
-            const double density_unit = parser.units().density;
             const std::vector<double>& dens = parser.getDENSITY().densities_[0];
-            surface_densities_[Oil] = Dune::unit::convert::from(dens[0], density_unit);
-            surface_densities_[Water] = Dune::unit::convert::from(dens[1], density_unit);
-            surface_densities_[Gas] = Dune::unit::convert::from(dens[2], density_unit);
+            surface_densities_[Oil] = dens[0];
+            surface_densities_[Water] = dens[1];
+            surface_densities_[Gas] = dens[2];
         }
         FluidState computeState(PhaseVec phase_pressure, CompVec z) const
         {