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

remove old serialization support for WellGuideRate

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-18 09:29:02 +01:00
parent c4e3d9c806
commit d791636919
3 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,15 +654,6 @@ std::size_t packSize(const WellPolymerProperties& data,
packSize(data.m_skprpolytable, comm); packSize(data.m_skprpolytable, comm);
} }
std::size_t packSize(const Well::WellGuideRate& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.available, comm) +
packSize(data.guide_rate, comm) +
packSize(data.guide_phase, comm) +
packSize(data.scale_factor, comm);
}
////// pack routines ////// pack routines
template<class T> template<class T>
@@ -1276,16 +1267,6 @@ void pack(const WellPolymerProperties& data,
pack(data.m_skprpolytable, buffer, position, comm); pack(data.m_skprpolytable, buffer, position, comm);
} }
void pack(const Well::WellGuideRate& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.available, buffer, position, comm);
pack(data.guide_rate, buffer, position, comm);
pack(data.guide_phase, buffer, position, comm);
pack(data.scale_factor, buffer, position, comm);
}
/// unpack routines /// unpack routines
template<class T> template<class T>
@@ -2125,16 +2106,6 @@ void unpack(WellPolymerProperties& data,
unpack(data.m_skprpolytable, buffer, position, comm); unpack(data.m_skprpolytable, buffer, position, comm);
} }
void unpack(Well::WellGuideRate& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(data.available, buffer, position, comm);
unpack(data.guide_rate, buffer, position, comm);
unpack(data.guide_phase, buffer, position, comm);
unpack(data.scale_factor, buffer, position, comm);
}
#define INSTANTIATE_PACK_VECTOR(...) \ #define INSTANTIATE_PACK_VECTOR(...) \
template std::size_t packSize(const std::vector<__VA_ARGS__>& data, \ template std::size_t packSize(const std::vector<__VA_ARGS__>& data, \
Dune::MPIHelper::MPICommunicator comm); \ Dune::MPIHelper::MPICommunicator comm); \

1
opm/simulators/utils/ParallelRestart.hpp
View File

@@ -392,7 +392,6 @@ ADD_PACK_PROTOTYPES(VFPInjTable)
ADD_PACK_PROTOTYPES(VFPProdTable) ADD_PACK_PROTOTYPES(VFPProdTable)
ADD_PACK_PROTOTYPES(Well) ADD_PACK_PROTOTYPES(Well)
ADD_PACK_PROTOTYPES(WellType) ADD_PACK_PROTOTYPES(WellType)
ADD_PACK_PROTOTYPES(Well::WellGuideRate)
ADD_PACK_PROTOTYPES(Well::WellInjectionProperties) ADD_PACK_PROTOTYPES(Well::WellInjectionProperties)
ADD_PACK_PROTOTYPES(Well::WellProductionProperties) ADD_PACK_PROTOTYPES(Well::WellProductionProperties)
ADD_PACK_PROTOTYPES(WellBrineProperties) ADD_PACK_PROTOTYPES(WellBrineProperties)

2
tests/test_ParallelRestart.cpp
View File

@@ -1458,7 +1458,7 @@ BOOST_AUTO_TEST_CASE(WellGuideRate)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::Well::WellGuideRate val1{true, 1.0, Opm::Well::GuideRateTarget::COMB, 2.0}; Opm::Well::WellGuideRate val1{true, 1.0, Opm::Well::GuideRateTarget::COMB, 2.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Well::WellGuideRate) DO_CHECKS(Well::WellGuideRate)
#endif #endif
} }