OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer converts units.

Browse Source
This commit is contained in:
Bjørn Spjelkavik 2011-02-03 15:41:20 +01:00
parent 4c10c38965
commit a27015d00c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dune/porsol/blackoil/BlackoilFluid.hpp
View File

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