Implements unit conversion for connection factor.

This commit is contained in:
Williham Williham Totland
2020-04-24 15:35:39 +02:00
parent 5e5aadb4ea
commit 305b4b21a7

View File

@@ -424,8 +424,8 @@ namespace {
return std::to_string(connection.satTableId());
}
std::string conn_factor(const context&, std::size_t, std::size_t) const {
return std::to_string(connection.CF()).substr(0, 10);
std::string conn_factor(const context& ctx, std::size_t, std::size_t) const {
return std::to_string(ctx.unit_system.from_si(Opm::UnitSystem::measure::transmissibility, connection.CF())).substr(0, 10);
}
std::string int_diam(const context& ctx, std::size_t, std::size_t) const {
@@ -454,11 +454,11 @@ namespace {
{ 7, {"WELL" ,"NAME" , }, &WellConnection::well_name , left_align },
{ 12, {"GRID" ,"BLOCK" , }, &WellConnection::grid_block , },
{ 3, {"CMPL" ,"NO#" , }, &WellConnection::cmpl_no , right_align },
{ 7, {"CENTRE" ,"DEPTH" ,"METRES" }, &WellConnection::centre_depth , right_align, Opm::UnitSystem::measure::length },
{ 7, {"CENTRE" ,"DEPTH" ,"METRES" }, &WellConnection::centre_depth , right_align, Opm::UnitSystem::measure::length },
{ 3, {"OPEN" ,"SHUT" , }, &WellConnection::open_shut , },
{ 3, {"SAT" ,"TAB" , }, &WellConnection::sat_tab , },
{ 8, {"CONNECTION" ,"FACTOR*" ,"CPM3/D/B" }, &WellConnection::conn_factor , right_align },
{ 6, {"INT" ,"DIAM" ,"METRES" }, &WellConnection::int_diam , right_align, Opm::UnitSystem::measure::length },
{ 11, {"CONNECTION" ,"FACTOR*" ,"CPM3/D/B" }, &WellConnection::conn_factor , right_align, Opm::UnitSystem::measure::transmissibility },
{ 6, {"INT" ,"DIAM" ,"METRES" }, &WellConnection::int_diam , right_align, Opm::UnitSystem::measure::length },
{ 7, {"K H" ,"VALUE" ,"MD.METRE" }, &WellConnection::kh_value , right_align },
{ 6, {"SKIN" ,"FACTOR" , }, &WellConnection::skin_factor , right_align },
{ 10, {"CONNECTION" ,"D-FACTOR 1" ,"DAY/SM3" }, &WellConnection::dfactor , },