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 OilVaporiationProperties

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-17 14:00:35 +01:00
parent c00d2f2cb3
commit e5e8c0c516
3 changed files with 2 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp>
@@ -338,17 +337,6 @@ template
std::size_t packSize(const std::map<Phase,Group::GroupInjectionProperties>& data, std::size_t packSize(const std::map<Phase,Group::GroupInjectionProperties>& data,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
std::size_t packSize(const OilVaporizationProperties& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getType(), comm) +
packSize(data.vap1(), comm) +
packSize(data.vap2(), comm) +
packSize(data.maxDRSDT(), comm) +
packSize(data.maxDRSDT_allCells(), comm) +
packSize(data.maxDRVDT(), comm);
}
std::size_t packSize(const Events& data, std::size_t packSize(const Events& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -1176,19 +1164,6 @@ void pack(const WellType& data, std::vector<char>& buffer, int& position,
pack(data.preferred_phase(), buffer, position, comm); pack(data.preferred_phase(), buffer, position, comm);
} }
void pack(const OilVaporizationProperties& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getType(), buffer, position, comm);
pack(data.vap1(), buffer, position, comm);
pack(data.vap2(), buffer, position, comm);
pack(data.maxDRSDT(), buffer, position, comm);
pack(data.maxDRSDT_allCells(), buffer, position, comm);
pack(data.maxDRVDT(), buffer, position, comm);
}
void pack(const Events& data, void pack(const Events& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@@ -2076,24 +2051,6 @@ void unpack(WellType& data, std::vector<char>& buffer, int& position, Dune::MPIH
data = WellType( producer, preferred_phase ); data = WellType( producer, preferred_phase );
} }
void unpack(OilVaporizationProperties& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
OilVaporizationProperties::OilVaporization type;
double vap1, vap2;
std::vector<double> maxDRSDT, maxDRVDT;
std::vector<bool> maxDRSDT_allCells;
unpack(type, buffer, position, comm);
unpack(vap1, buffer, position, comm);
unpack(vap2, buffer, position, comm);
unpack(maxDRSDT, buffer, position, comm);
unpack(maxDRSDT_allCells, buffer, position, comm);
unpack(maxDRVDT, buffer, position, comm);
data = OilVaporizationProperties(type, vap1, vap2, maxDRSDT,
maxDRSDT_allCells, maxDRVDT);
}
void unpack(Events& data, void unpack(Events& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@@ -3068,7 +3025,6 @@ INSTANTIATE_PACK(std::unordered_map<std::string,std::string>)
INSTANTIATE_PACK(std::pair<bool,double>) INSTANTIATE_PACK(std::pair<bool,double>)
INSTANTIATE_PACK(std::pair<bool,std::size_t>) INSTANTIATE_PACK(std::pair<bool,std::size_t>)
INSTANTIATE_PACK(DynamicState<int>) INSTANTIATE_PACK(DynamicState<int>)
INSTANTIATE_PACK(DynamicState<OilVaporizationProperties>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<Action::Actions>>) INSTANTIATE_PACK(DynamicState<std::shared_ptr<Action::Actions>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSale>>) INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSale>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSump>>) INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSump>>)

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

@@ -65,7 +65,6 @@ template<class T> class IOrderSet;
class Location; class Location;
class MessageLimits; class MessageLimits;
class MLimits; class MLimits;
class OilVaporizationProperties;
class Segment; class Segment;
class SpiralICD; class SpiralICD;
class Tuning; class Tuning;
@@ -437,7 +436,6 @@ ADD_PACK_PROTOTYPES(Group::GroupProductionProperties)
ADD_PACK_PROTOTYPES(Location) ADD_PACK_PROTOTYPES(Location)
ADD_PACK_PROTOTYPES(MessageLimits) ADD_PACK_PROTOTYPES(MessageLimits)
ADD_PACK_PROTOTYPES(MLimits) ADD_PACK_PROTOTYPES(MLimits)
ADD_PACK_PROTOTYPES(OilVaporizationProperties)
ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(Segment)

4
tests/test_ParallelRestart.cpp
View File

@@ -1274,12 +1274,12 @@ BOOST_AUTO_TEST_CASE(OilVaporizationProperties)
Opm::OilVaporizationProperties val1(VapType::VAPPARS, Opm::OilVaporizationProperties val1(VapType::VAPPARS,
1.0, 2.0, {5.0, 6.0}, 1.0, 2.0, {5.0, 6.0},
{false, true}, {7.0, 8.0}); {false, true}, {7.0, 8.0});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(OilVaporizationProperties) DO_CHECKS(OilVaporizationProperties)
val1 = Opm::OilVaporizationProperties(VapType::DRDT, val1 = Opm::OilVaporizationProperties(VapType::DRDT,
1.0, 2.0, {5.0, 6.0}, 1.0, 2.0, {5.0, 6.0},
{false, true}, {7.0, 8.0}); {false, true}, {7.0, 8.0});
val2 = PackUnpack(val1); val2 = PackUnpack2(val1);
DO_CHECKS(OilVaporizationProperties) DO_CHECKS(OilVaporizationProperties)
#endif #endif
} }