OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change interface of surfaceDensity()

Browse Source 
Add phaseIdx as input and return array of n density values for the
phase. And adapt the usage accordingly.
This commit is contained in:
Tor Harald Sandve 2015-11-10 14:22:14 +01:00
parent a46b64adcd
commit a47c9add9b
7 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -782,12 +782,11 @@ namespace detail {
std::vector<double> perf_depth(pdepth.data(), pdepth.data() + nperf);
// Surface density.
const std::vector<V> rhos = fluid_.surfaceDensity(well_cells);
// The compute density segment wants the surface densities as
// an np * number of wells cells array
V rho = superset(rhos[0], Span(nperf, pu.num_phases, 0), nperf*pu.num_phases);
V rho = superset(fluid_.surfaceDensity(0 , well_cells), Span(nperf, pu.num_phases, 0), nperf*pu.num_phases);
for (int phase = 1; phase < pu.num_phases; ++phase) {
rho += superset(rhos[phase], Span(nperf, pu.num_phases, phase), nperf*pu.num_phases);
rho += superset(fluid_.surfaceDensity(phase , well_cells), Span(nperf, pu.num_phases, phase), nperf*pu.num_phases);
}
std::vector<double> surf_dens_perf(rho.data(), rho.data() + nperf * pu.num_phases);
@ -2692,15 +2691,14 @@ namespace detail {
const ADB& rs,
const ADB& rv) const
{
std::vector<V> rhos = fluid_.surfaceDensity(cells_);
ADB rho = rhos[phase] * b;
const V& rhos = fluid_.surfaceDensity(phase, cells_);
const Opm::PhaseUsage& pu = fluid_.phaseUsage();
ADB rho = rhos * b;
if (phase == Oil && active_[Gas]) {
// It is correct to index into rhos with canonical phase indices.
rho += rhos[Gas] * rs * b;
rho += fluid_.surfaceDensity(pu.phase_pos[ Gas ], cells_) * rs * b;
}
if (phase == Gas && active_[Oil]) {
// It is correct to index into rhos with canonical phase indices.
rho += rhos[Oil] * rv * b;
rho += fluid_.surfaceDensity(pu.phase_pos[ Oil ], cells_) * rv * b;
}
return rho;
}

21
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -349,25 +349,20 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
// ------ Density ------
/// Densities of stock components at surface conditions.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of number of phases with n density values each.
std::vector<V> BlackoilPropsAdFromDeck::surfaceDensity(const Cells& cells) const
/// \param[in] phaseIdx
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n density values for phase given by phaseIdx.
V BlackoilPropsAdFromDeck::surfaceDensity(const int phaseIdx, const Cells& cells) const
{
assert( !(phaseIdx > numPhases()));
const int n = cells.size();
std::vector<V> rhos(BlackoilPhases::MaxNumPhases);
for (size_t phaseIdx = 0; phaseIdx < rhos.size(); ++phaseIdx) {
rhos[phaseIdx] = V::Zero(n);
}
V rhos = V::Zero(n);
for (int cellIdx = 0; cellIdx < n; ++cellIdx) {
int pvtRegionIdx = cellPvtRegionIdx_[cellIdx];
const double* rho = &densities_[pvtRegionIdx][0];
for (size_t phaseIdx = 0; phaseIdx < rhos.size(); ++phaseIdx) {
rhos[phaseIdx][cellIdx] = rho[phaseIdx];
}
const auto* rho = &densities_[pvtRegionIdx][0];
rhos[cellIdx] = rho[phaseIdx];
}
return rhos;
}

7
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@ -187,9 +187,10 @@ namespace Opm
// ------ Density ------
/// Densities of stock components at surface conditions.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of number of phases with n density values each.
std::vector<V> surfaceDensity(const Cells& cells) const;
/// \param[in] phaseIdx
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n density values for phase given by phaseIdx.
V surfaceDensity(const int phaseIdx , const Cells& cells) const;
// ------ Viscosity ------

7
opm/autodiff/BlackoilPropsAdInterface.hpp
View File

@ -88,9 +88,10 @@ namespace Opm
// ------ Density ------
/// Densities of stock components at surface conditions.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of number of phases with n density values each.
virtual std::vector<V> surfaceDensity(const Cells& cells) const = 0;
/// \param[in] phaseIdx
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n density values for phase given by phaseIdx.
virtual V surfaceDensity(const int PhaseIdx, const Cells& cells) const = 0;
// ------ Viscosity ------

22
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -340,9 +340,6 @@ namespace Opm {
// Use cell values for the temperature as the wells don't knows its temperature yet.
const ADB perf_temp = subset(state.temperature, well_cells);
// Surface density.
std::vector<V> surf_dens = fluid_.surfaceDensity(well_cells);
// Compute b, rsmax, rvmax values for perforations.
// Evaluate the properties using average well block pressures
// and cell values for rs, rv, phase condition and temperature.
@ -370,10 +367,18 @@ namespace Opm {
const V rssat = fluidRsSat(avg_press, perf_so, well_cells);
rsmax_perf.assign(rssat.data(), rssat.data() + nperf);
}
V surf_dens_copy = superset(fluid_.surfaceDensity(0, well_cells), Span(nperf, pu.num_phases, 0), nperf*pu.num_phases);
for (int phase = 1; phase < pu.num_phases; ++phase) {
if ( phase != pu.phase_pos[BlackoilPhases::Vapour]) {
continue; // the gas surface density is added after the solvent is accounted for.
}
surf_dens_copy += superset(fluid_.surfaceDensity(phase, well_cells), Span(nperf, pu.num_phases, phase), nperf*pu.num_phases);
}
if (pu.phase_used[BlackoilPhases::Vapour]) {
const ADB perf_rv = subset(state.rv, well_cells);
V bg = fluid_.bGas(avg_press_ad, perf_temp, perf_rv, perf_cond, well_cells).value();
V rhog = fluid_.surfaceDensity(pu.phase_pos[BlackoilPhases::Vapour], well_cells);
if (has_solvent_) {
const V bs = solvent_props_.bSolvent(avg_press_ad,well_cells).value();
// A weighted sum of the b-factors of gas and solvent are used.
@ -404,22 +409,17 @@ namespace Opm {
bg = bg * (ones - F_solvent);
bg = bg + F_solvent * bs;
const V& rhog = surf_dens[pu.phase_pos[BlackoilPhases::Vapour]];
const V& rhos = solvent_props_.solventSurfaceDensity(well_cells);
surf_dens[pu.phase_pos[BlackoilPhases::Vapour]] = ( (ones - F_solvent) * rhog ) + (F_solvent * rhos);
rhog = ( (ones - F_solvent) * rhog ) + (F_solvent * rhos);
}
b.col(pu.phase_pos[BlackoilPhases::Vapour]) = bg;
surf_dens_copy += superset(rhog, Span(nperf, pu.num_phases, pu.phase_pos[BlackoilPhases::Vapour]), nperf*pu.num_phases);
const V rvsat = fluidRvSat(avg_press, perf_so, well_cells);
rvmax_perf.assign(rvsat.data(), rvsat.data() + nperf);
}
// b and surf_dens_perf is row major, so can just copy data.
V surf_dens_copy = superset(surf_dens[0], Span(nperf, pu.num_phases, 0), nperf*pu.num_phases);
for (int phase = 1; phase < pu.num_phases; ++phase) {
surf_dens_copy += superset(surf_dens[phase], Span(nperf, pu.num_phases, phase), nperf*pu.num_phases);
}
std::vector<double> b_perf(b.data(), b.data() + nperf * pu.num_phases);
std::vector<double> surf_dens_perf(surf_dens_copy.data(), surf_dens_copy.data() + nperf * pu.num_phases);

8
opm/autodiff/ImpesTPFAAD.cpp
View File

@ -623,9 +623,9 @@ namespace {
V ImpesTPFAAD::fluidRho(const int phase, const V& p, const V& T, const std::vector<int>& cells) const
{
std::vector<V> rhos = fluid_.surfaceDensity(cells);
V rho = fluid_.surfaceDensity(phase, cells);
V b = fluidFvf(phase, p, T, cells);
V rho = rhos[phase] * b;
rho = rho * b;
return rho;
}
@ -635,9 +635,9 @@ namespace {
ADB ImpesTPFAAD::fluidRho(const int phase, const ADB& p, const ADB& T, const std::vector<int>& cells) const
{
std::vector<V> rhos = fluid_.surfaceDensity(cells);
const V& rhos = fluid_.surfaceDensity(phase, cells);
ADB b = fluidFvf(phase, p, T, cells);
ADB rho = rhos[phase] * b;
ADB rho = rhos * b;
return rho;
}

19
tests/test_boprops_ad.cpp
View File

@ -119,21 +119,20 @@ BOOST_FIXTURE_TEST_CASE(SurfaceDensity, TestFixture<SetupSimple>)
typedef Opm::BlackoilPropsAdFromDeck::V V;
std::vector<V> rho0AD = boprops_ad.surfaceDensity(cells);
BOOST_REQUIRE_EQUAL(rho0AD.size(), 3);
enum { Water = Opm::BlackoilPropsAdFromDeck::Water };
BOOST_REQUIRE_EQUAL(rho0AD[Water].size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD[ Water ][0], 1000.0);
V rho0AD_Water = boprops_ad.surfaceDensity(Water, cells);
BOOST_REQUIRE_EQUAL(rho0AD_Water.size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD_Water[0], 1000.0);
enum { Oil = Opm::BlackoilPropsAdFromDeck::Oil };
BOOST_REQUIRE_EQUAL(rho0AD[Oil].size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD[ Oil ][0], 800.0);
V rho0AD_Oil = boprops_ad.surfaceDensity(Oil, cells);
BOOST_REQUIRE_EQUAL(rho0AD_Oil.size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD_Oil[0], 800.0);
enum { Gas = Opm::BlackoilPropsAdFromDeck::Gas };
BOOST_REQUIRE_EQUAL(rho0AD[Gas].size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD[ Gas ][0], 1.0);
V rho0AD_Gas = boprops_ad.surfaceDensity(Gas, cells);
BOOST_REQUIRE_EQUAL(rho0AD_Gas.size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD_Gas[0], 1.0);
}