diff --git a/opm/io/eclipse/rst/segment.hpp b/opm/io/eclipse/rst/segment.hpp index 6ccd43b40..19aa73685 100644 --- a/opm/io/eclipse/rst/segment.hpp +++ b/opm/io/eclipse/rst/segment.hpp @@ -47,7 +47,7 @@ struct RstSegment { double area; double volume; double dist_bhp_ref; - double bhp_ref_dz; + double node_depth; double total_flow; double water_flow_fraction; double gas_flow_fraction; diff --git a/opm/output/eclipse/VectorItems/msw.hpp b/opm/output/eclipse/VectorItems/msw.hpp index 5d89a02f8..9b321b9bf 100644 --- a/opm/output/eclipse/VectorItems/msw.hpp +++ b/opm/output/eclipse/VectorItems/msw.hpp @@ -49,7 +49,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems SegArea = 4, // Cross-sectional area of segment SegVolume = 5, // Physical volume of segment DistBHPRef = 6, // Segment's distance to BHP reference node - DepthBHPRef = 7, // Segment's depth differential to BHP ref. node + SegNodeDepth = 7, // Segment's node depth TotFlowRate = 8, // Normalised total segment flow rate WatFlowFract = 9, // Normalised Water flow rate fraction diff --git a/src/opm/input/eclipse/Schedule/MSW/Segment.cpp b/src/opm/input/eclipse/Schedule/MSW/Segment.cpp index 597fa4e37..59a998eb9 100644 --- a/src/opm/input/eclipse/Schedule/MSW/Segment.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/Segment.cpp @@ -63,7 +63,7 @@ namespace Opm { , m_branch(rst_segment.branch) , m_outlet_segment(rst_segment.outlet_segment) , m_total_length( rst_segment.dist_bhp_ref ) - , m_depth(rst_segment.bhp_ref_dz) + , m_depth(rst_segment.node_depth) , m_internal_diameter(if_invalid_value(rst_segment.diameter)) , m_roughness(if_invalid_value(rst_segment.roughness)) , m_cross_area(if_invalid_value(rst_segment.area)) diff --git a/src/opm/io/eclipse/rst/segment.cpp b/src/opm/io/eclipse/rst/segment.cpp index f374dec45..59dc44d0e 100644 --- a/src/opm/io/eclipse/rst/segment.cpp +++ b/src/opm/io/eclipse/rst/segment.cpp @@ -66,7 +66,7 @@ RstSegment::RstSegment(const ::Opm::UnitSystem& unit_system, int segment_number, area( area_to_si(unit_system, rseg[VI::RSeg::SegArea])), volume( unit_system.to_si(M::volume, rseg[VI::RSeg::SegVolume])), dist_bhp_ref( unit_system.to_si(M::length, rseg[VI::RSeg::DistBHPRef])), - bhp_ref_dz( unit_system.to_si(M::length, rseg[VI::RSeg::DepthBHPRef])), + node_depth( unit_system.to_si(M::length, rseg[VI::RSeg::SegNodeDepth])), total_flow( unit_system.to_si(M::rate, rseg[VI::RSeg::TotFlowRate])), water_flow_fraction( rseg[VI::RSeg::WatFlowFract]), gas_flow_fraction( rseg[VI::RSeg::GasFlowFract]), diff --git a/src/opm/output/eclipse/AggregateMSWData.cpp b/src/opm/output/eclipse/AggregateMSWData.cpp index 1d8cec615..4e7be694a 100644 --- a/src/opm/output/eclipse/AggregateMSWData.cpp +++ b/src/opm/output/eclipse/AggregateMSWData.cpp @@ -793,7 +793,7 @@ namespace { rSeg[iS + Ix::OutletDepthDiff] = units.from_si(M::length, welSegSet.depthTopSegment()); rSeg[iS + Ix::SegVolume] = volFromLengthUnitConv*welSegSet.volumeTopSegment(); rSeg[iS + Ix::DistBHPRef] = rSeg[iS + Ix::DistOutlet]; - rSeg[iS + Ix::DepthBHPRef] = rSeg[iS + Ix::OutletDepthDiff]; + rSeg[iS + Ix::SegNodeDepth] = rSeg[iS + Ix::OutletDepthDiff]; // // branch according to whether multisegment well calculations are switched on or not @@ -853,7 +853,7 @@ namespace { rSeg[iS + Ix::SegArea] = areaFromLengthUnitConv * segment.crossArea(); rSeg[iS + Ix::SegVolume] = volFromLengthUnitConv * segment.volume(); rSeg[iS + Ix::DistBHPRef] = units.from_si(M::length, (segment.totalLength())); - rSeg[iS + Ix::DepthBHPRef] = units.from_si(M::length, (segment.depth())); + rSeg[iS + Ix::SegNodeDepth] = units.from_si(M::length, (segment.depth())); // see section above for explanation of values // branch according to whether multisegment well calculations are switched on or not