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

Fixed naming convention

Browse Source
This commit is contained in:
Håkon Hægland
2023-05-09 08:59:50 +02:00
parent 2f260fe90a
commit 5a99e005fb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,9 @@ namespace Opm {
public:
static WVFPDP serializationTestObject();
double getDP (double bhp_tab, double thp_limit) const;
double getDPDP() const { return m_dp; }
double getDPFP() const { return m_fp; }
double getPressureLoss (double bhp_tab, double thp_limit) const;
double getPressureAdjustment() const { return m_dp; }
double getPLossScalingFactor() const { return m_fp; }
void update(const DeckRecord& record);
void update(const RestartIO::RstWell& rst_well);

6
src/opm/input/eclipse/Schedule/Well/WVFPDP.cpp
View File

@@ -31,8 +31,8 @@ namespace Opm {
WVFPDP WVFPDP::serializationTestObject()
{
WVFPDP result;
result.m_dp = 0.0;
result.m_fp = 1.0;
result.m_dp = 1.23;
result.m_fp = 0.456;
return result;
}
@@ -52,7 +52,7 @@ namespace Opm {
this->m_fp = rst_well.vfp_bhp_scaling_factor;
}
double WVFPDP::getDP(double bhp_tab, double thp_limit) const {
double WVFPDP::getPressureLoss(double bhp_tab, double thp_limit) const {
auto dpt = bhp_tab - thp_limit;
return m_dp + (m_fp-1)*dpt;
}

4
src/opm/output/eclipse/AggregateWellData.cpp
View File

@@ -1038,8 +1038,8 @@ namespace {
const auto& options = well.getWVFPDP();
sWell[Ix::VfpBhpAdjustment] = swprop(M::pressure, options.getDPDP());
sWell[Ix::VfpBhpScalingFact] = options.getDPFP();
sWell[Ix::VfpBhpAdjustment] = swprop(M::pressure, options.getPressureAdjustment());
sWell[Ix::VfpBhpScalingFact] = options.getPLossScalingFactor();
}
template <class SWellArray>