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 #2182 from blattms/parallel-restart-fixes

Browse Source 
ParallelRestart: use references and allow non-default template parame…
This commit is contained in:
Atgeirr Flø Rasmussen 2019-11-26 11:14:14 +01:00 committed by GitHub
commit 937369166d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,8 +90,8 @@ std::size_t packSize(const std::pair<T1,T2>& data, Dune::MPIHelper::MPICommunica
return packSize(data.first, comm) + packSize(data.second, comm); return packSize(data.first, comm) + packSize(data.second, comm);
} }
template<class T> template<class T, class A>
std::size_t packSize(const std::vector<T>& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const std::vector<T,A>& data, Dune::MPIHelper::MPICommunicator comm)
{ {
if (std::is_pod<T>::value) if (std::is_pod<T>::value)
// size written automatically // size written automatically
@ -125,8 +125,8 @@ std::size_t packSize(const std::string& str, Dune::MPIHelper::MPICommunicator co
return packSize(str.c_str(), comm); return packSize(str.c_str(), comm);
} }
template<class T1, class T2> template<class T1, class T2, class C, class A>
std::size_t packSize(const std::map<T1,T2> data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const std::map<T1,T2,C,A>& data, Dune::MPIHelper::MPICommunicator comm)
{ {
std::size_t totalSize = packSize(data.size(), comm); std::size_t totalSize = packSize(data.size(), comm);
for (const auto& entry: data) for (const auto& entry: data)
@ -136,8 +136,8 @@ std::size_t packSize(const std::map<T1,T2> data, Dune::MPIHelper::MPICommunicato
return totalSize; return totalSize;
} }
template<class T1, class T2> template<class T1, class T2, class H, class P, class A>
std::size_t packSize(const std::unordered_map<T1,T2> data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const std::unordered_map<T1,T2,H,P,A>& data, Dune::MPIHelper::MPICommunicator comm)
{ {
std::size_t totalSize = packSize(data.size(), comm); std::size_t totalSize = packSize(data.size(), comm);
for (const auto& entry: data) for (const auto& entry: data)
@ -277,8 +277,8 @@ void pack(const std::pair<T1,T2>& data, std::vector<char>& buffer, int& position
pack(data.second, buffer, position, comm); pack(data.second, buffer, position, comm);
} }
template<class T> template<class T, class A>
void pack(const std::vector<T>& data, std::vector<char>& buffer, int& position, void pack(const std::vector<T, A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
if (std::is_pod<T>::value) if (std::is_pod<T>::value)
@ -317,8 +317,8 @@ void pack(const std::string& str, std::vector<char>& buffer, int& position,
pack(str.c_str(), buffer, position, comm); pack(str.c_str(), buffer, position, comm);
} }
template<class T1, class T2> template<class T1, class T2, class C, class A>
void pack(const std::map<T1,T2>& data, std::vector<char>& buffer, int& position, void pack(const std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
pack(data.size(), buffer, position, comm); pack(data.size(), buffer, position, comm);
@ -329,8 +329,8 @@ void pack(const std::map<T1,T2>& data, std::vector<char>& buffer, int& position,
} }
} }
template<class T1, class T2> template<class T1, class T2, class H, class P, class A>
void pack(const std::unordered_map<T1,T2>& data, std::vector<char>& buffer, int& position, void pack(const std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
pack(data.size(), buffer, position, comm); pack(data.size(), buffer, position, comm);
@ -486,8 +486,8 @@ void unpack(std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
unpack(data.second, buffer, position, comm); unpack(data.second, buffer, position, comm);
} }
template<class T> template<class T, class A>
void unpack(std::vector<T>& data, std::vector<char>& buffer, int& position, void unpack(std::vector<T,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
std::size_t length=0; std::size_t length=0;
@ -529,8 +529,8 @@ void unpack(std::string& str, std::vector<char>& buffer, int& position,
str.append(cStr.data()); str.append(cStr.data());
} }
template<class T1, class T2> template<class T1, class T2, class C, class A>
void unpack(std::map<T1,T2>& data, std::vector<char>& buffer, int& position, void unpack(std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
std::size_t size=0; std::size_t size=0;
@ -544,8 +544,8 @@ void unpack(std::map<T1,T2>& data, std::vector<char>& buffer, int& position,
} }
} }
template<class T1, class T2> template<class T1, class T2, class H, class P, class A>
void unpack(std::unordered_map<T1,T2>& data, std::vector<char>& buffer, int& position, void unpack(std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
std::size_t size=0; std::size_t size=0;

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

@ -61,18 +61,18 @@ std::size_t packSize(const T& data, Dune::MPIHelper::MPICommunicator comm);
template<class T1, class T2> template<class T1, class T2>
std::size_t packSize(const std::pair<T1,T2>& data, Dune::MPIHelper::MPICommunicator comm); std::size_t packSize(const std::pair<T1,T2>& data, Dune::MPIHelper::MPICommunicator comm);
template<class T> template<class T, class A>
std::size_t packSize(const std::vector<T>& data, Dune::MPIHelper::MPICommunicator comm); std::size_t packSize(const std::vector<T,A>& data, Dune::MPIHelper::MPICommunicator comm);
std::size_t packSize(const char* str, Dune::MPIHelper::MPICommunicator comm); std::size_t packSize(const char* str, Dune::MPIHelper::MPICommunicator comm);
std::size_t packSize(const std::string& str, Dune::MPIHelper::MPICommunicator comm); std::size_t packSize(const std::string& str, Dune::MPIHelper::MPICommunicator comm);
template<class T1, class T2> template<class T1, class T2, class C, class A>
std::size_t packSize(const std::map<T1,T2> data, Dune::MPIHelper::MPICommunicator comm); std::size_t packSize(const std::map<T1,T2,C,A>& data, Dune::MPIHelper::MPICommunicator comm);
template<class T1, class T2> template<class T1, class T2, class H, class P, class A>
std::size_t packSize(const std::unordered_map<T1,T2> data, Dune::MPIHelper::MPICommunicator comm); std::size_t packSize(const std::unordered_map<T1,T2,H,P,A>& data, Dune::MPIHelper::MPICommunicator comm);
std::size_t packSize(const data::Rates& data, Dune::MPIHelper::MPICommunicator comm); std::size_t packSize(const data::Rates& data, Dune::MPIHelper::MPICommunicator comm);
@ -123,8 +123,8 @@ template<class T1, class T2>
void pack(const std::pair<T1,T2>& data, std::vector<char>& buffer, int& position, void pack(const std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
template<class T> template<class T, class A>
void pack(const std::vector<T>& data, std::vector<char>& buffer, int& position, void pack(const std::vector<T,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
@ -134,13 +134,13 @@ void pack(const char* str, std::vector<char>& buffer, int& position,
void pack(const std::string& str, std::vector<char>& buffer, int& position, void pack(const std::string& str, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
template<class T1, class T2> template<class T1, class T2, class C, class A>
void pack(const std::map<T1,T2>& data, std::vector<char>& buffer, int& position, void pack(const std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
template<class T1, class T2> template<class T1, class T2, class H, class P, class A>
void pack(const std::unordered_map<T1,T2>& data, std::vector<char>& buffer, int& position, void pack(const std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
@ -202,8 +202,8 @@ template<class T1, class T2>
void unpack(std::pair<T1,T2>& data, std::vector<char>& buffer, int& position, void unpack(std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
template<class T> template<class T, class A>
void unpack(std::vector<T>& data, std::vector<char>& buffer, int& position, void unpack(std::vector<T,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
@ -213,12 +213,12 @@ void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& posit
void unpack(std::string& str, std::vector<char>& buffer, int& position, void unpack(std::string& str, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
template<class T1, class T2> template<class T1, class T2, class C, class A>
void unpack(std::map<T1,T2>& data, std::vector<char>& buffer, int& position, void unpack(std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
template<class T1, class T2> template<class T1, class T2, class H, class P, class A>
void unpack(std::unordered_map<T1,T2>& data, std::vector<char>& buffer, int& position, void unpack(std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
void unpack(data::Rates& data, std::vector<char>& buffer, int& position, void unpack(data::Rates& data, std::vector<char>& buffer, int& position,