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 TimeStampUTC

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-17 13:21:23 +01:00
parent 563e1d9fbc
commit e87ec7b5a4
2 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,7 +285,6 @@ HANDLE_AS_POD(data::CurrentControl)
HANDLE_AS_POD(data::Rates) HANDLE_AS_POD(data::Rates)
HANDLE_AS_POD(data::Segment) HANDLE_AS_POD(data::Segment)
HANDLE_AS_POD(MLimits) HANDLE_AS_POD(MLimits)
HANDLE_AS_POD(TimeStampUTC::YMD)
HANDLE_AS_POD(Tuning) HANDLE_AS_POD(Tuning)
HANDLE_AS_POD(WellBrineProperties) HANDLE_AS_POD(WellBrineProperties)
HANDLE_AS_POD(WellFoamProperties) HANDLE_AS_POD(WellFoamProperties)
@@ -915,16 +914,6 @@ std::size_t packSize(const RestartSchedule& data,
packSize(data.rptsched_restart, comm); packSize(data.rptsched_restart, comm);
} }
std::size_t packSize(const TimeStampUTC& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.ymd(), comm) +
packSize(data.hour(), comm) +
packSize(data.minutes(), comm) +
packSize(data.seconds(), comm) +
packSize(data.microseconds(), comm);
}
std::size_t packSize(const WellPolymerProperties& data, std::size_t packSize(const WellPolymerProperties& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -1842,17 +1831,6 @@ void pack(const RestartSchedule& data,
pack(data.rptsched_restart, buffer, position, comm); pack(data.rptsched_restart, buffer, position, comm);
} }
void pack(const TimeStampUTC& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.ymd(), buffer, position, comm);
pack(data.hour(), buffer, position, comm);
pack(data.minutes(), buffer, position, comm);
pack(data.seconds(), buffer, position, comm);
pack(data.microseconds(), buffer, position, comm);
}
void pack(const WellPolymerProperties& data, void pack(const WellPolymerProperties& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@@ -3105,21 +3083,6 @@ void unpack(RestartSchedule& data,
unpack(data.rptsched_restart, buffer, position, comm); unpack(data.rptsched_restart, buffer, position, comm);
} }
void unpack(TimeStampUTC& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
TimeStampUTC::YMD ymd;
int hour, minutes, seconds, usec;
unpack(ymd, buffer, position, comm);
unpack(hour, buffer, position, comm);
unpack(minutes, buffer, position, comm);
unpack(seconds, buffer, position, comm);
unpack(usec, buffer, position, comm);
data = TimeStampUTC(ymd, hour, minutes, seconds, usec);
}
void unpack(WellPolymerProperties& data, void unpack(WellPolymerProperties& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@@ -3174,12 +3137,14 @@ INSTANTIATE_PACK_VECTOR(bool)
INSTANTIATE_PACK_VECTOR(char) INSTANTIATE_PACK_VECTOR(char)
INSTANTIATE_PACK_VECTOR(int) INSTANTIATE_PACK_VECTOR(int)
INSTANTIATE_PACK_VECTOR(size_t) INSTANTIATE_PACK_VECTOR(size_t)
INSTANTIATE_PACK_VECTOR(std::time_t)
INSTANTIATE_PACK_VECTOR(std::array<double, 3>) INSTANTIATE_PACK_VECTOR(std::array<double, 3>)
INSTANTIATE_PACK_VECTOR(std::pair<bool,double>) INSTANTIATE_PACK_VECTOR(std::pair<bool,double>)
INSTANTIATE_PACK_VECTOR(std::shared_ptr<Group>) INSTANTIATE_PACK_VECTOR(std::shared_ptr<Group>)
INSTANTIATE_PACK_VECTOR(std::shared_ptr<VFPInjTable>) INSTANTIATE_PACK_VECTOR(std::shared_ptr<VFPInjTable>)
INSTANTIATE_PACK_VECTOR(std::shared_ptr<VFPProdTable>) INSTANTIATE_PACK_VECTOR(std::shared_ptr<VFPProdTable>)
INSTANTIATE_PACK_VECTOR(std::shared_ptr<Well>) INSTANTIATE_PACK_VECTOR(std::shared_ptr<Well>)
INSTANTIATE_PACK_VECTOR(std::map<std::string,int>)
INSTANTIATE_PACK_VECTOR(std::pair<std::string,std::vector<int>>) INSTANTIATE_PACK_VECTOR(std::pair<std::string,std::vector<int>>)
INSTANTIATE_PACK_VECTOR(std::pair<int,std::vector<int>>) INSTANTIATE_PACK_VECTOR(std::pair<int,std::vector<int>>)

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

@@ -72,7 +72,6 @@ class RestartSchedule;
class RFTConfig; class RFTConfig;
class Segment; class Segment;
class SpiralICD; class SpiralICD;
class TimeStampUTC;
class Tuning; class Tuning;
class UDAValue; class UDAValue;
class UnitSystem; class UnitSystem;
@@ -452,7 +451,6 @@ ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(SpiralICD) ADD_PACK_PROTOTYPES(SpiralICD)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(TimeMap) ADD_PACK_PROTOTYPES(TimeMap)
ADD_PACK_PROTOTYPES(TimeStampUTC)
ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(Tuning)
ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UDAValue)
ADD_PACK_PROTOTYPES(UnitSystem) ADD_PACK_PROTOTYPES(UnitSystem)