OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2990 from totto82/rename_ext

Browse Source 
rename extrapolate to explicit_lookup in vfpexp
This commit is contained in:
Bård Skaflestad
2022-04-20 09:54:25 +02:00
committed by GitHub
parent 35835efbbe 09f80a3da1
commit a5d19c4cf0
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/input/eclipse/Schedule/Well/WVFPEXP.hpp
View File

@@ -35,7 +35,7 @@ namespace Opm {
void update(const DeckRecord& record);
bool extrapolate() const;
bool explicit_lookup() const;
bool shut() const;
bool prevent() const;
@@ -45,13 +45,13 @@ namespace Opm {
template<class Serializer>
void serializeOp(Serializer& serializer)
{
serializer(m_extrapolate);
serializer(m_explicit);
serializer(m_shut);
serializer(m_prevent);
}
private:
bool m_extrapolate;
bool m_explicit;
bool m_shut;
Prevent m_prevent;
};

10
src/opm/input/eclipse/Schedule/Well/WVFPEXP.cpp
View File

@@ -27,7 +27,7 @@ namespace Opm {
WVFPEXP WVFPEXP::serializeObject()
{
WVFPEXP result;
result.m_extrapolate = true;
result.m_explicit = true;
result.m_shut = true;
result.m_prevent = Prevent::No;
@@ -35,7 +35,7 @@ namespace Opm {
}
bool WVFPEXP::operator==(const WVFPEXP& other) const {
return (m_extrapolate == other.m_extrapolate)
return (m_explicit == other.m_explicit)
&& (m_shut == other.m_shut)
&& (m_prevent == other.m_prevent);
}
@@ -45,7 +45,7 @@ namespace Opm {
const auto& close = record.getItem<ParserKeywords::WVFPEXP::CLOSE>().get<std::string>(0);
const auto& prevent_thp = record.getItem<ParserKeywords::WVFPEXP::PREVENT_THP>().get<std::string>(0);
//const auto& extrapolation_control = record.getItem<ParserKeywords::WVFPEXP::EXTRAPOLATION_CONTROL>().get<std::string>(0);
m_extrapolate = (exp_imp == "EXP");
m_explicit = (exp_imp == "EXP");
m_shut = (close == "YES");
if (prevent_thp == "YES1")
m_prevent = Prevent::First;
@@ -55,8 +55,8 @@ namespace Opm {
m_prevent = Prevent::No;
}
bool WVFPEXP::extrapolate() const {
return m_extrapolate;
bool WVFPEXP::explicit_lookup() const {
return m_explicit;
}
bool WVFPEXP::shut() const {

4
tests/parser/ScheduleTests.cpp
View File

@@ -5116,11 +5116,11 @@ END
const auto& wvfpexp1 = well1.getWVFPEXP();
const auto& wvfpexp2 = well2.getWVFPEXP();
BOOST_CHECK(!wvfpexp1.extrapolate());
BOOST_CHECK(!wvfpexp1.explicit_lookup());
BOOST_CHECK(!wvfpexp1.shut());
BOOST_CHECK(!wvfpexp1.prevent());
BOOST_CHECK(wvfpexp2.extrapolate());
BOOST_CHECK(wvfpexp2.explicit_lookup());
BOOST_CHECK(wvfpexp2.shut());
BOOST_CHECK(wvfpexp2.prevent());
}