From b76a77128c08014b6fe108a7314b72f0947e344b Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Tue, 12 Aug 2014 15:49:47 +0200
Subject: [PATCH] adapt to the reference pressure != surface pressure change in
 opm-material

---
 examples/problems/eclproblem.hh       | 6 +++---
 examples/problems/reservoirproblem.hh | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/examples/problems/eclproblem.hh b/examples/problems/eclproblem.hh
index fb671f248..2799bade8 100644
--- a/examples/problems/eclproblem.hh
+++ b/examples/problems/eclproblem.hh
@@ -676,7 +676,7 @@ private:
             // set the reference densities
             Opm::DeckRecordConstPtr densityRecord =
                 deck->getKeyword("DENSITY")->getRecord(regionIdx);
-            FluidSystem::setSurfaceDensities(densityRecord->getItem("OIL")->getSIDouble(0),
+            FluidSystem::setReferenceDensities(densityRecord->getItem("OIL")->getSIDouble(0),
                                              densityRecord->getItem("WATER")->getSIDouble(0),
                                              densityRecord->getItem("GAS")->getSIDouble(0),
                                              regionIdx);
@@ -816,8 +816,8 @@ private:
 
             // calculate composition of the real and the saturated oil phase in terms of
             // mass fractions.
-            Scalar rhooRef = FluidSystem::surfaceDensity(oilPhaseIdx, /*regionIdx=*/0);
-            Scalar rhogRef = FluidSystem::surfaceDensity(gasPhaseIdx, /*regionIdx=*/0);
+            Scalar rhooRef = FluidSystem::referenceDensity(oilPhaseIdx, /*regionIdx=*/0);
+            Scalar rhogRef = FluidSystem::referenceDensity(gasPhaseIdx, /*regionIdx=*/0);
             Scalar XoGReal = RsReal*rhogRef / (RsReal*rhogRef + rhooRef);
 
             // convert mass to mole fractions
diff --git a/examples/problems/reservoirproblem.hh b/examples/problems/reservoirproblem.hh
index f189eaf16..49e67fe2d 100644
--- a/examples/problems/reservoirproblem.hh
+++ b/examples/problems/reservoirproblem.hh
@@ -243,9 +243,7 @@ public:
             { 6.21542e+07, 4.7e-05 }
         };
 
-        FluidSystem::setSurfaceDensities(/*oil=*/720.51,
-                                         /*water=*/1009.32,
-                                         /*gas=*/1.1245);
+        FluidSystem::setReferenceDensities(/*oil=*/786, /*water=*/1037, /*gas=*/0.97);
         FluidSystem::setGasFormationVolumeFactor(Bg);
         FluidSystem::setSaturatedOilGasDissolutionFactor(Rs);
         FluidSystem::setSaturatedOilFormationVolumeFactor(Bo);
@@ -253,9 +251,6 @@ public:
         FluidSystem::setGasViscosity(mug);
         FluidSystem::setWaterViscosity(9.6e-4);
         FluidSystem::setWaterCompressibility(1.450377e-10);
-        FluidSystem::setSurfaceDensities(/*oil=*/786,
-                                         /*water=*/1037,
-                                         /*gas=*/0.97);
         FluidSystem::initEnd();
 
         pReservoir_ = 330e5;