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

Removing extra overloads of rsSat() and rvSat().

Browse Source 
Also a few minor fixes to docs and indentation while in the area.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-03-05 18:47:04 +01:00
parent 64769f1062
commit a347e35304
5 changed files with 24 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -546,39 +546,6 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
// ------ Rs bubble point curve ------ // ------ Rs bubble point curve ------
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
V BlackoilPropsAdFromDeck::rsSat(const V& po,
const Cells& cells) const
{
if (!phase_usage_.phase_used[Oil]) {
OPM_THROW(std::runtime_error, "Cannot call rsMax(): oil phase not present.");
}
const int n = cells.size();
mapPvtRegions(cells);
assert(po.size() == n);
V rbub(n);
V drbubdp(n);
props_[phase_usage_.phase_pos[Oil]]->rsSat(n, pvt_region_.data(), po.data(), rbub.data(), drbubdp.data());
return rbub;
}
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
V BlackoilPropsAdFromDeck::rsSat(const V& po,
const V& so,
const Cells& cells) const
{
V rs = rsSat(po, cells);
applyVap(rs, so, cells, vap2_);
return rs;
}
/// Bubble point curve for Rs as function of oil pressure. /// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
@ -618,45 +585,12 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
return rs; return rs;
} }
// ------ Condensation curve ------ // ------ Rv condensation curve ------
/// Condensation curve for Rv as function of oil pressure. /// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs. /// \return Array of n condensation point values for Rv.
V BlackoilPropsAdFromDeck::rvSat(const V& po,
const Cells& cells) const
{
if (!phase_usage_.phase_used[Gas]) {
OPM_THROW(std::runtime_error, "Cannot call rvMax(): gas phase not present.");
}
const int n = cells.size();
mapPvtRegions(cells);
assert(po.size() == n);
V rv(n);
V drvdp(n);
props_[phase_usage_.phase_pos[Gas]]->rvSat(n, pvt_region_.data(), po.data(), rv.data(), drvdp.data());
return rv;
}
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
V BlackoilPropsAdFromDeck::rvSat(const V& po,
const V& so,
const Cells& cells) const
{
V rv = rvSat(po, cells);
applyVap(rv, so, cells, vap1_);
return rv;
}
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
ADB BlackoilPropsAdFromDeck::rvSat(const ADB& po, ADB BlackoilPropsAdFromDeck::rvSat(const ADB& po,
const Cells& cells) const const Cells& cells) const
{ {
@ -682,7 +616,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values. /// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs. /// \return Array of n condensation point values for Rv.
ADB BlackoilPropsAdFromDeck::rvSat(const ADB& po, ADB BlackoilPropsAdFromDeck::rvSat(const ADB& po,
const ADB& so, const ADB& so,
const Cells& cells) const const Cells& cells) const

20
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@ -245,23 +245,7 @@ namespace Opm
/// Condensation curve for Rv as function of oil pressure. /// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs. /// \return Array of n condensation point values for Rv.
V rvSat(const V& po,
const Cells& cells) const;
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
V rvSat(const V& po,
const V& so,
const Cells& cells) const;
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
ADB rvSat(const ADB& po, ADB rvSat(const ADB& po,
const Cells& cells) const; const Cells& cells) const;
@ -269,7 +253,7 @@ namespace Opm
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values. /// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs. /// \return Array of n condensation point values for Rv.
ADB rvSat(const ADB& po, ADB rvSat(const ADB& po,
const ADB& so, const ADB& so,
const Cells& cells) const; const Cells& cells) const;

46
opm/autodiff/BlackoilPropsAdInterface.hpp
View File

@ -174,24 +174,6 @@ namespace Opm
// ------ Rs bubble point curve ------ // ------ Rs bubble point curve ------
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
virtual
V rsSat(const V& po,
const Cells& cells) const = 0;
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
virtual
V rsSat(const V& po,
const V& so,
const Cells& cells) const = 0;
/// Bubble point curve for Rs as function of oil pressure. /// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
@ -210,39 +192,21 @@ namespace Opm
const ADB& so, const ADB& so,
const Cells& cells) const = 0; const Cells& cells) const = 0;
// ------ Rs bubble point curve ------ // ------ Rv condensation curve ------
/// Bubble point curve for Rs as function of oil pressure. /// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs. /// \return Array of n condensation point values for Rv.
virtual
V rvSat(const V& po,
const Cells& cells) const = 0;
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
virtual
V rvSat(const V& po,
const V& so,
const Cells& cells) const = 0;
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
virtual virtual
ADB rvSat(const ADB& po, ADB rvSat(const ADB& po,
const Cells& cells) const = 0; const Cells& cells) const = 0;
/// Bubble point curve for Rs as function of oil pressure. /// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values. /// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values. /// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values. /// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs. /// \return Array of n condensation point values for Rv.
virtual virtual
ADB rvSat(const ADB& po, ADB rvSat(const ADB& po,
const ADB& so, const ADB& so,

21
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -2154,10 +2154,10 @@ namespace detail {
template<class T> template<class T>
V V
FullyImplicitBlackoilSolver<T>::fluidRsSat(const V& p, FullyImplicitBlackoilSolver<T>::fluidRsSat(const V& p,
const V& satOil, const V& satOil,
const std::vector<int>& cells) const const std::vector<int>& cells) const
{ {
return fluid_.rsSat(p, satOil, cells); return fluid_.rsSat(ADB::constant(p), ADB::constant(satOil), cells).value();
} }
@ -2167,19 +2167,20 @@ namespace detail {
template<class T> template<class T>
ADB ADB
FullyImplicitBlackoilSolver<T>::fluidRsSat(const ADB& p, FullyImplicitBlackoilSolver<T>::fluidRsSat(const ADB& p,
const ADB& satOil, const ADB& satOil,
const std::vector<int>& cells) const const std::vector<int>& cells) const
{ {
return fluid_.rsSat(p, satOil, cells); return fluid_.rsSat(p, satOil, cells);
} }
template<class T> template<class T>
V V
FullyImplicitBlackoilSolver<T>::fluidRvSat(const V& p, FullyImplicitBlackoilSolver<T>::fluidRvSat(const V& p,
const V& satOil, const V& satOil,
const std::vector<int>& cells) const const std::vector<int>& cells) const
{ {
return fluid_.rvSat(p, satOil, cells); return fluid_.rvSat(ADB::constant(p), ADB::constant(satOil), cells).value();
} }
@ -2189,8 +2190,8 @@ namespace detail {
template<class T> template<class T>
ADB ADB
FullyImplicitBlackoilSolver<T>::fluidRvSat(const ADB& p, FullyImplicitBlackoilSolver<T>::fluidRvSat(const ADB& p,
const ADB& satOil, const ADB& satOil,
const std::vector<int>& cells) const const std::vector<int>& cells) const
{ {
return fluid_.rvSat(p, satOil, cells); return fluid_.rvSat(p, satOil, cells);
} }

5
opm/autodiff/RateConverter.hpp
View File

@ -528,8 +528,9 @@ namespace Opm {
// pressure into account. This facility uses the // pressure into account. This facility uses the
// average *hydrocarbon* pressure rather than // average *hydrocarbon* pressure rather than
// average phase pressure. // average phase pressure.
Rmax_.col(io) = props_.rsSat(p_avg_, T_avg_, repcells_); typedef BlackoilPropsAdInterface::ADB ADB;
Rmax_.col(ig) = props_.rvSat(p_avg_, T_avg_, repcells_); Rmax_.col(io) = props_.rsSat(ADB::constant(p_avg_), ADB::constant(T_avg_), repcells_).value();
Rmax_.col(ig) = props_.rvSat(ADB::constant(p_avg_), ADB::constant(T_avg_), repcells_).value();
} }
} }