OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-30 13:03:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add computeRs() function and use from InitialStateComputer.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2014-02-27 13:14:48 +01:00 committed by Andreas Lauser
parent a340781958
commit 5aa1a0f999
2 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
opm/core/simulator/initStateEquil.hpp
View File

@ -154,6 +154,28 @@ namespace Opm
/**
* Compute initial Rs values.
*
* \tparam CellRangeType Type of cell range that demarcates the
* cells pertaining to the current
* equilibration region. Must implement
* methods begin() and end() to bound the range
* as well as provide an inner type,
* const_iterator, to traverse the range.
*
* \param[in] grid Grid.
* \param[in] cells Range that spans the cells of the current
* equilibration region.
* \param[in] oil_pressure Oil pressure for each cell in range.
* \param[in] rs_func Rs as function of pressure and depth.
* \return Rs values, one for each cell in the 'cells' range.
*/
template <class CellRangeType>
std::vector<double> computeRs(const UnstructuredGrid& grid,
const CellRangeType& cells,
const std::vector<double> oil_pressure,
const Miscibility::RsFunction& rs_func);
namespace DeckDependent {
@ -314,16 +336,20 @@ namespace Opm
const PVec press = phasePressures(G, eqreg, cells, grav);
const PVec sat = phaseSaturations(eqreg, cells, props, press);
const Vec rs(cells.size());
const Vec rv(cells.size());
const int np = props.numPhases();
for (int p = 0; p < np; ++p) {
copyFromRegion(press[p], cells, pp_[p]);
copyFromRegion(sat[p], cells, sat_[p]);
}
copyFromRegion(rs, cells, rs_);
copyFromRegion(rv, cells, rv_);
if (props.phaseUsage().phase_used[BlackoilPhases::Liquid]
&& props.phaseUsage().phase_used[BlackoilPhases::Vapour]) {
const int oilpos = props.phaseUsage().phase_pos[BlackoilPhases::Liquid];
const Vec rs = computeRs(G, cells, press[oilpos], *(rs_func_[r]));
const Vec rv(cells.size(), 0.0);
std::cout << "rs.size() = " << rs.size() << std::endl;
copyFromRegion(rs, cells, rs_);
copyFromRegion(rv, cells, rv_);
}
}
}

35
opm/core/simulator/initStateEquil_impl.hpp
View File

@ -638,6 +638,41 @@ namespace Opm
}
/**
* Compute initial Rs values.
*
* \tparam CellRangeType Type of cell range that demarcates the
* cells pertaining to the current
* equilibration region. Must implement
* methods begin() and end() to bound the range
* as well as provide an inner type,
* const_iterator, to traverse the range.
*
* \param[in] grid Grid.
* \param[in] cells Range that spans the cells of the current
* equilibration region.
* \param[in] oil_pressure Oil pressure for each cell in range.
* \param[in] rs_func Rs as function of pressure and depth.
* \return Rs values, one for each cell in the 'cells' range.
*/
template <class CellRangeType>
std::vector<double> computeRs(const UnstructuredGrid& grid,
const CellRangeType& cells,
const std::vector<double> oil_pressure,
const Miscibility::RsFunction& rs_func)
{
assert(grid.dimensions == 3);
std::vector<double> rs(cells.size());
int count = 0;
for (auto it = cells.begin(); it != cells.end(); ++it, ++count) {
const double depth = grid.cell_centroids[3*(*it) + 2];
rs[count] = rs_func(depth, oil_pressure[count]);
}
return rs;
}
} // namespace Equil