From e63e318d40098b6051b9a2ffc4f98cab7a9f8bcb Mon Sep 17 00:00:00 2001
From: Liu Ming <miliu@statoil.com>
Date: Thu, 20 Feb 2014 16:58:02 +0800
Subject: [PATCH] apply PVT function changes.

---
 .../fullyimplicit/.PolymerPropsAd.cpp.swp       | Bin 0 -> 16384 bytes
 .../fullyimplicit/BlackoilPropsAdFromDeck.cpp   |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 opm/polymer/fullyimplicit/.PolymerPropsAd.cpp.swp

diff --git a/opm/polymer/fullyimplicit/.PolymerPropsAd.cpp.swp b/opm/polymer/fullyimplicit/.PolymerPropsAd.cpp.swp
new file mode 100644
index 0000000000000000000000000000000000000000..fb8319f398a8c5d5f8127f9271647d19984edd8c
GIT binary patch
literal 16384
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
Z_q0#iF8$l%1qm)bcImy~r56uM{{{4EU1b0O

literal 0
HcmV?d00001

diff --git a/opm/polymer/fullyimplicit/BlackoilPropsAdFromDeck.cpp b/opm/polymer/fullyimplicit/BlackoilPropsAdFromDeck.cpp
index 4333a6a3c..62120f4ca 100644
--- a/opm/polymer/fullyimplicit/BlackoilPropsAdFromDeck.cpp
+++ b/opm/polymer/fullyimplicit/BlackoilPropsAdFromDeck.cpp
@@ -543,7 +543,7 @@ namespace Opm
         assert(po.size() == n);
         V rbub(n);
         V drbubdp(n);
-        props_[Oil]->rbub(n, po.data(), rbub.data(), drbubdp.data());
+        props_[Oil]->rsSat(n, po.data(), rbub.data(), drbubdp.data());
         return rbub;
     }
 
@@ -561,7 +561,7 @@ namespace Opm
         assert(po.size() == n);
         V rbub(n);
         V drbubdp(n);
-        props_[Oil]->rbub(n, po.value().data(), rbub.data(), drbubdp.data());
+        props_[Oil]->rsSat(n, po.value().data(), rbub.data(), drbubdp.data());
         ADB::M drbubdp_diag = spdiag(drbubdp);
         const int num_blocks = po.numBlocks();
         std::vector<ADB::M> jacs(num_blocks);