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

Merge pull request #1526 from joakim-hove/wells-rst-units

Browse Source 
Wells rst units
This commit is contained in:
Joakim Hove
2020-03-03 16:35:26 +01:00
committed by GitHub
parent ab757c4a1c 6af2bcdb6f
commit a02811ed63
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/output/eclipse/VectorItems/connection.hpp
View File

@@ -57,7 +57,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
item30 = 29, // Unknown
item31 = 30, // Unknown
item41 = 40, // = 0 for connection factor not defined, = 1 for connection factor defined
CFInDeck = 40, // = 0 for connection factor not defined, = 1 for connection factor defined
};
} // SConn

16
src/opm/io/eclipse/rst/well.cpp
View File

@@ -57,17 +57,17 @@ RstWell::RstWell(const ::Opm::UnitSystem& unit_system,
hist_requested_control( iwel[VI::IWell::HistReqWCtrl]),
msw_index( iwel[VI::IWell::MsWID]),
completion_ordering( iwel[VI::IWell::CompOrd]),
orat_target( unit_system.to_si(M::liquid_surface_rate, swel[VI::SWell::OilRateTarget])),
wrat_target( unit_system.to_si(M::liquid_surface_rate, swel[VI::SWell::WatRateTarget])),
grat_target( unit_system.to_si(M::gas_surface_rate, swel[VI::SWell::GasRateTarget])),
lrat_target( unit_system.to_si(M::liquid_surface_rate, swel[VI::SWell::LiqRateTarget])),
resv_target( unit_system.to_si(M::rate, swel[VI::SWell::ResVRateTarget])),
thp_target( unit_system.to_si(M::pressure, swel[VI::SWell::THPTarget])),
bhp_target_float( unit_system.to_si(M::pressure, swel[VI::SWell::BHPTarget])),
orat_target( unit_system.to_si(M::identity, swel[VI::SWell::OilRateTarget])),
wrat_target( unit_system.to_si(M::identity, swel[VI::SWell::WatRateTarget])),
grat_target( unit_system.to_si(M::identity, swel[VI::SWell::GasRateTarget])),
lrat_target( unit_system.to_si(M::identity, swel[VI::SWell::LiqRateTarget])),
resv_target( unit_system.to_si(M::identity, swel[VI::SWell::ResVRateTarget])),
thp_target( unit_system.to_si(M::identity, swel[VI::SWell::THPTarget])),
bhp_target_float( unit_system.to_si(M::identity, swel[VI::SWell::BHPTarget])),
hist_lrat_target( unit_system.to_si(M::liquid_surface_rate, swel[VI::SWell::HistLiqRateTarget])),
hist_grat_target( unit_system.to_si(M::gas_surface_rate, swel[VI::SWell::HistGasRateTarget])),
hist_bhp_target( unit_system.to_si(M::pressure, swel[VI::SWell::HistBHPTarget])),
datum_depth( unit_system.to_si(M::length, xwel[VI::SWell::DatumDepth])),
datum_depth( unit_system.to_si(M::length, swel[VI::SWell::DatumDepth])),
oil_rate( unit_system.to_si(M::liquid_surface_rate, xwel[VI::XWell::OilPrRate])),
water_rate( unit_system.to_si(M::liquid_surface_rate, xwel[VI::XWell::WatPrRate])),
gas_rate( unit_system.to_si(M::gas_surface_rate, xwel[VI::XWell::GasPrRate])),

2
src/opm/output/eclipse/AggregateConnectionData.cpp
View File

@@ -191,7 +191,7 @@ namespace {
sConn[Ix::item30] = -1.0e+20f;
sConn[Ix::item31] = -1.0e+20f;
sConn[Ix::item41] = (conn.ctfAssignedFromInput()) ? 1 : 0;
sConn[Ix::CFInDeck] = (conn.ctfAssignedFromInput()) ? 1 : 0;
}
} // SConn