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

Merge pull request #95 from atgeirr/pure-virtual

Browse Source 
Make BlackoilPropsAdInterface pure virtual again.
This commit is contained in:
Bård Skaflestad 2014-03-04 14:32:36 +01:00
commit b639aefaaf
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/autodiff/BlackoilPropsAd.cpp
View File

@ -817,5 +817,16 @@ namespace Opm
return adbCapPressures;
}
/// Saturation update for hysteresis behavior.
/// \param[in] cells Array of n cell indices to be associated with the saturation values.
void BlackoilPropsAd::updateSatHyst(const std::vector<double>& /* saturation */,
const std::vector<int>& /* cells */)
{
OPM_THROW(std::logic_error, "BlackoilPropsAd class does not support hysteresis.");
}
} // namespace Opm

4
opm/autodiff/BlackoilPropsAd.hpp
View File

@ -316,6 +316,10 @@ namespace Opm
const ADB& sg,
const Cells& cells) const;
/// Saturation update for hysteresis behavior.
/// \param[in] cells Array of n cell indices to be associated with the saturation values.
void updateSatHyst(const std::vector<double>& saturation,
const std::vector<int>& cells);
private:
const BlackoilPropertiesInterface& props_;
PhaseUsage pu_;

2
opm/autodiff/BlackoilPropsAdInterface.hpp
View File

@ -320,7 +320,7 @@ namespace Opm
/// \param[in] cells Array of n cell indices to be associated with the saturation values.
virtual
void updateSatHyst(const std::vector<double>& saturation,
const std::vector<int>& cells) {assert(false); } // Please implement me ...
const std::vector<int>& cells) = 0;
};
} // namespace Opm