From 8c8ed13c162738b87a2f19a4c53a9bfca21917a3 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Tue, 13 May 2014 12:59:11 +0200 Subject: [PATCH] incorperate the review comments/decisions for multi-region PVT the largest change is that all classes below opm/core/props/pvt take the PVT region index as an argument, the higher-level ones (i.e., BlackoilProps*) take cell indices. --- opm/core/simulator/EquilibrationHelpers.hpp | 2 +- opm/core/simulator/initStateEquil.hpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/opm/core/simulator/EquilibrationHelpers.hpp b/opm/core/simulator/EquilibrationHelpers.hpp index dd90e3689..e97d5077f 100644 --- a/opm/core/simulator/EquilibrationHelpers.hpp +++ b/opm/core/simulator/EquilibrationHelpers.hpp @@ -139,7 +139,7 @@ namespace Opm props_.matrix(1, &p, &z[0], &c_[0], &A[0], dAdp); std::vector rho(np, 0.0); - props_.density(1, &A[0], &rho[0]); + props_.density(1, &A[0], &c_[0], &rho[0]); return rho; } diff --git a/opm/core/simulator/initStateEquil.hpp b/opm/core/simulator/initStateEquil.hpp index e5f8c8ec2..a4ec1ee4f 100644 --- a/opm/core/simulator/initStateEquil.hpp +++ b/opm/core/simulator/initStateEquil.hpp @@ -369,8 +369,6 @@ namespace Opm const UnstructuredGrid& G , const double grav) { - typedef Miscibility::NoMixing NoMix; - for (typename RMap::RegionId r = 0, nr = reg.numRegions(); r < nr; ++r)