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

Add return of wdfac type

Browse Source
This commit is contained in:
Tor Harald Sandve 2023-11-20 15:46:52 +01:00
parent fcb438aed4
commit 98220372eb
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/input/eclipse/Schedule/Well/WDFAC.hpp
View File

@ -53,6 +53,8 @@ namespace Opm {
bool useDFactor() const; bool useDFactor() const;
bool useConnectionDFactor() const; bool useConnectionDFactor() const;
bool useWellDFactor() const;
WDFACTYPE getType() const;
bool operator==(const WDFAC& other) const; bool operator==(const WDFAC& other) const;
bool operator!=(const WDFAC& other) const; bool operator!=(const WDFAC& other) const;

5
src/opm/input/eclipse/Schedule/Well/WDFAC.cpp
View File

@ -109,10 +109,9 @@ namespace Opm {
return m_type != WDFACTYPE::NONE; return m_type != WDFACTYPE::NONE;
} }
bool WDFAC::useConnectionDFactor() const { WDFACTYPE WDFAC::getType() const {
return m_type == WDFACTYPE::CON_DFACTOR; return m_type;
} }
bool WDFAC::operator!=(const WDFAC& other) const { bool WDFAC::operator!=(const WDFAC& other) const {
return !(*this == other); return !(*this == other);
} }

8
tests/parser/ScheduleTests.cpp
View File

@ -5780,9 +5780,9 @@ END
double phi = 0.3; double phi = 0.3;
// WDFAC overwrites D factor in COMDAT // WDFAC overwrites D factor in COMDAT
BOOST_CHECK(!wdfac11.useConnectionDFactor()); BOOST_CHECK(wdfac11.getType() != WDFACTYPE::CON_DFACTOR);
BOOST_CHECK(wdfac11.useDFactor()); BOOST_CHECK(wdfac11.useDFactor());
BOOST_CHECK(!wdfac21.useConnectionDFactor()); BOOST_CHECK(wdfac21.getType() != WDFACTYPE::CON_DFACTOR);
BOOST_CHECK_CLOSE(wdfac11.getDFactor(rho, mu, k, phi, rw, h), 1*Opm::unit::day, 1e-12); BOOST_CHECK_CLOSE(wdfac11.getDFactor(rho, mu, k, phi, rw, h), 1*Opm::unit::day, 1e-12);
BOOST_CHECK_CLOSE(wdfac21.getDFactor(rho, mu, k, phi, rw, h), 2*Opm::unit::day, 1e-12); BOOST_CHECK_CLOSE(wdfac21.getDFactor(rho, mu, k, phi, rw, h), 2*Opm::unit::day, 1e-12);
@ -5800,9 +5800,9 @@ END
const auto& well23 = sched.getWell("W2", 3); const auto& well23 = sched.getWell("W2", 3);
const auto& wdfac13 = well13.getWDFAC(); const auto& wdfac13 = well13.getWDFAC();
const auto& wdfac23 = well23.getWDFAC(); const auto& wdfac23 = well23.getWDFAC();
BOOST_CHECK(wdfac13.useConnectionDFactor()); BOOST_CHECK(wdfac13.getType() == WDFACTYPE::CON_DFACTOR);
BOOST_CHECK(wdfac13.useDFactor()); BOOST_CHECK(wdfac13.useDFactor());
BOOST_CHECK(!wdfac23.useConnectionDFactor()); BOOST_CHECK(wdfac23.getType() != WDFACTYPE::CON_DFACTOR);
BOOST_CHECK_CLOSE(well13.getConnections()[0].dFactor(), 0*Opm::unit::day, 1e-12); BOOST_CHECK_CLOSE(well13.getConnections()[0].dFactor(), 0*Opm::unit::day, 1e-12);