OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2333 from joakim-hove/segment-remove-flag

Browse Source 
Remove members from WellSegment class
This commit is contained in:
Kai Bao 2020-02-13 14:39:49 +01:00 committed by GitHub
commit 53e118c31c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
opm/simulators/utils/ParallelRestart.cpp
View File

@ -1353,13 +1353,7 @@ std::size_t packSize(const UnitSystem& data,
std::size_t packSize(const WellSegments& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.wellName(), comm) +
packSize(data.depthTopSegment(), comm) +
packSize(data.lengthTopSegment(), comm) +
packSize(data.volumeTopSegment(), comm) +
packSize(data.lengthDepthType(), comm) +
packSize(data.compPressureDrop(), comm) +
packSize(data.multiPhaseModel(), comm) +
return packSize(data.compPressureDrop(), comm) +
packSize(data.segments(), comm) +
packSize(data.segmentNumberIndex(), comm);
@ -3114,13 +3108,7 @@ void pack(const WellSegments& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.wellName(), buffer, position, comm);
pack(data.depthTopSegment(), buffer, position, comm);
pack(data.lengthTopSegment(), buffer, position, comm);
pack(data.volumeTopSegment(), buffer, position, comm);
pack(data.lengthDepthType(), buffer, position, comm);
pack(data.compPressureDrop(), buffer, position, comm);
pack(data.multiPhaseModel(), buffer, position, comm);
pack(data.segments(), buffer, position, comm);
pack(data.segmentNumberIndex(), buffer, position, comm);
}
@ -5476,26 +5464,16 @@ void unpack(WellSegments& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::string wellName;
double depthTopSegment, lengthTopSegment, volumeTopSegment;
WellSegments::CompPressureDrop compPressureDrop;
WellSegments::LengthDepth lengthDepthType;
WellSegments::MultiPhaseModel multiPhaseModel;
std::vector<Segment> segments;
std::map<int,int> segmentNumberIndex;
unpack(wellName, buffer, position, comm);
unpack(depthTopSegment, buffer, position, comm);
unpack(lengthTopSegment, buffer, position, comm);
unpack(volumeTopSegment, buffer, position, comm);
unpack(lengthDepthType, buffer, position, comm);
unpack(compPressureDrop, buffer, position, comm);
unpack(multiPhaseModel, buffer, position, comm);
unpack(segments, buffer, position, comm);
unpack(segmentNumberIndex, buffer, position, comm);
data = WellSegments(wellName, depthTopSegment, lengthTopSegment,
volumeTopSegment, lengthDepthType, compPressureDrop,
multiPhaseModel, segments, segmentNumberIndex);
data = WellSegments(compPressureDrop,
segments, segmentNumberIndex);
}
void unpack(Well& data,

10
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -1167,16 +1167,6 @@ namespace Opm
template <typename TypeTag>
WellSegments::MultiPhaseModel
MultisegmentWell<TypeTag>::
multiphaseModel() const
{
return segmentSet().multiPhaseModel();
}
template <typename TypeTag>

8
tests/test_ParallelRestart.cpp
View File

@ -1650,11 +1650,9 @@ BOOST_AUTO_TEST_CASE(WellSegments)
Opm::Segment::SegmentType::SICD,
std::make_shared<Opm::SpiralICD>(),
std::make_shared<Opm::Valve>());
Opm::WellSegments val1("test", 1.0, 2.0, 3.0,
Opm::WellSegments::LengthDepth::ABS,
Opm::WellSegments::CompPressureDrop::HF_,
Opm::WellSegments::MultiPhaseModel::DF,
{seg, seg}, {{1,2},{3,4}});
Opm::WellSegments val1(Opm::WellSegments::CompPressureDrop::HF_,
{seg, seg},
{{1,2},{3,4}});
auto val2 = PackUnpack(val1);
DO_CHECKS(WellSegments)