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

Merge pull request #2290 from akva2/noecl_flush_fluidsystem

Browse Source 
Avoid deck usage on non-root processes setting up FluidSystem
This commit is contained in:
Bård Skaflestad 2020-01-21 10:47:44 +01:00 committed by GitHub
commit 570cf08fc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ebos/eclproblem.hh
View File

@ -2475,8 +2475,32 @@ private:
const auto& simulator = this->simulator(); const auto& simulator = this->simulator();
const auto& deck = simulator.vanguard().deck(); const auto& deck = simulator.vanguard().deck();
const auto& eclState = simulator.vanguard().eclState(); const auto& eclState = simulator.vanguard().eclState();
const auto& comm = simulator.gridView().comm();
FluidSystem::initFromDeck(deck, eclState); if (comm.rank() == 0)
FluidSystem::initFromDeck(deck, eclState);
#if HAVE_MPI
if (comm.size() > 1) {
if (comm.rank() == 0) {
EclMpiSerializer ser(comm);
size_t size = FluidSystem::packSize(ser);
std::vector<char> buffer(size);
int position = 0;
FluidSystem::pack(buffer, position, ser);
comm.broadcast(&position, 1, 0);
comm.broadcast(buffer.data(), position, 0);
} else {
int size;
comm.broadcast(&size, 1, 0);
std::vector<char> buffer(size);
comm.broadcast(buffer.data(), size, 0);
int position = 0;
EclMpiSerializer ser(comm);
FluidSystem::unpack(buffer, position, ser);
}
}
#endif
} }
void readInitialCondition_() void readInitialCondition_()

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

@ -1323,9 +1323,6 @@ std::size_t packSize(const std::shared_ptr<T>& data,
return size; return size;
} }
template std::size_t packSize(const std::shared_ptr<SpiralICD>& data,
Dune::MPIHelper::MPICommunicator comm);
template<class T> template<class T>
std::size_t packSize(const std::unique_ptr<T>& data, std::size_t packSize(const std::unique_ptr<T>& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@ -3143,9 +3140,6 @@ void pack(const std::unique_ptr<T>& data, std::vector<char>& buffer, int& positi
pack(*data, buffer, position, comm); pack(*data, buffer, position, comm);
} }
template void pack(const std::shared_ptr<SpiralICD>& data, std::vector<char>& buffer,
int& position, Dune::MPIHelper::MPICommunicator comm);
void pack(const Dimension& data, void pack(const Dimension& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@ -4670,11 +4664,11 @@ void unpack(GasPvtMultiplexer<Scalar,enableThermal>& data,
DryGasPvt<Scalar>* realPvt = new DryGasPvt<Scalar>; DryGasPvt<Scalar>* realPvt = new DryGasPvt<Scalar>;
unpack(*realPvt, buffer, position, comm); unpack(*realPvt, buffer, position, comm);
pvt = realPvt; pvt = realPvt;
} else if (data.gasPvtApproach() == PvtApproach::WetGasPvt) { } else if (approach == PvtApproach::WetGasPvt) {
WetGasPvt<Scalar>* realPvt = new WetGasPvt<Scalar>; WetGasPvt<Scalar>* realPvt = new WetGasPvt<Scalar>;
unpack(*realPvt, buffer, position, comm); unpack(*realPvt, buffer, position, comm);
pvt = realPvt; pvt = realPvt;
} else if (data.gasPvtApproach() == PvtApproach::ThermalGasPvt) { } else if (approach == PvtApproach::ThermalGasPvt) {
GasPvtThermal<Scalar>* realPvt = new GasPvtThermal<Scalar>; GasPvtThermal<Scalar>* realPvt = new GasPvtThermal<Scalar>;
unpack(*realPvt, buffer, position, comm); unpack(*realPvt, buffer, position, comm);
pvt = realPvt; pvt = realPvt;
@ -4958,7 +4952,7 @@ void unpack(WaterPvtMultiplexer<Scalar,enableThermal>& data,
auto* realPvt = new ConstantCompressibilityWaterPvt<Scalar>; auto* realPvt = new ConstantCompressibilityWaterPvt<Scalar>;
unpack(*realPvt, buffer, position, comm); unpack(*realPvt, buffer, position, comm);
pvt = realPvt; pvt = realPvt;
} else if (data.approach() == PvtApproach::ThermalWaterPvt) { } else if (approach == PvtApproach::ThermalWaterPvt) {
auto* realPvt = new WaterPvtThermal<Scalar>; auto* realPvt = new WaterPvtThermal<Scalar>;
unpack(*realPvt, buffer, position, comm); unpack(*realPvt, buffer, position, comm);
pvt = realPvt; pvt = realPvt;
@ -5474,10 +5468,6 @@ void unpack(std::unique_ptr<T>& data, std::vector<char>& buffer, int& position,
} }
} }
template void unpack(std::shared_ptr<SpiralICD>& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm);
void unpack(Dimension& data, void unpack(Dimension& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@ -6470,37 +6460,57 @@ void unpack(GuideRateConfig::GroupTarget& data,
unpack(data.target, buffer, position, comm); unpack(data.target, buffer, position, comm);
} }
#define INSTANTIATE_PACK_VECTOR(T) \ #define INSTANTIATE_PACK_VECTOR(...) \
template std::size_t packSize(const std::vector<T>& data, \ template std::size_t packSize(const std::vector<__VA_ARGS__>& data, \
Dune::MPIHelper::MPICommunicator comm); \ Dune::MPIHelper::MPICommunicator comm); \
template void pack(const std::vector<T>& data, \ template void pack(const std::vector<__VA_ARGS__>& data, \
std::vector<char>& buffer, int& position, \ std::vector<char>& buffer, int& position, \
Dune::MPIHelper::MPICommunicator comm); \ Dune::MPIHelper::MPICommunicator comm); \
template void unpack(std::vector<T>& data, \ template void unpack(std::vector<__VA_ARGS__>& data, \
std::vector<char>& buffer, int& position, \ std::vector<char>& buffer, int& position, \
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
INSTANTIATE_PACK_VECTOR(double); INSTANTIATE_PACK_VECTOR(double)
INSTANTIATE_PACK_VECTOR(std::vector<double>); INSTANTIATE_PACK_VECTOR(std::vector<double>)
INSTANTIATE_PACK_VECTOR(bool); INSTANTIATE_PACK_VECTOR(bool)
INSTANTIATE_PACK_VECTOR(char); INSTANTIATE_PACK_VECTOR(char)
INSTANTIATE_PACK_VECTOR(Opm::Tabulated1DFunction<double>); INSTANTIATE_PACK_VECTOR(Opm::Tabulated1DFunction<double>)
INSTANTIATE_PACK_VECTOR(std::array<double, 3>)
#undef INSTANTIATE_PACK_VECTOR #undef INSTANTIATE_PACK_VECTOR
#define INSTANTIATE_PACK(T) \ #define INSTANTIATE_PACK_SHARED_PTR(...) \
template std::size_t packSize(const T& data, \ template std::size_t packSize(const std::shared_ptr<__VA_ARGS__>& data, \
Dune::MPIHelper::MPICommunicator comm); \ Dune::MPIHelper::MPICommunicator comm); \
template void pack(const T& data, \ template void pack(const std::shared_ptr<__VA_ARGS__>& data, \
std::vector<char>& buffer, int& position, \ std::vector<char>& buffer, int& position, \
Dune::MPIHelper::MPICommunicator comm); \ Dune::MPIHelper::MPICommunicator comm); \
template void unpack(T& data, \ template void unpack(std::shared_ptr<__VA_ARGS__>& data, \
std::vector<char>& buffer, int& position, \ std::vector<char>& buffer, int& position, \
Dune::MPIHelper::MPICommunicator comm); Dune::MPIHelper::MPICommunicator comm);
INSTANTIATE_PACK(double); INSTANTIATE_PACK_SHARED_PTR(Opm::GasPvtMultiplexer<double, true>)
INSTANTIATE_PACK(std::size_t); INSTANTIATE_PACK_SHARED_PTR(Opm::OilPvtMultiplexer<double, true>)
INSTANTIATE_PACK(bool); INSTANTIATE_PACK_SHARED_PTR(Opm::WaterPvtMultiplexer<double, true>)
INSTANTIATE_PACK(int); INSTANTIATE_PACK_SHARED_PTR(SpiralICD)
#undef INSTANTIATE_PACK_SHARED_PTR
#define INSTANTIATE_PACK(...) \
template std::size_t packSize(const __VA_ARGS__& data, \
Dune::MPIHelper::MPICommunicator comm); \
template void pack(const __VA_ARGS__& data, \
std::vector<char>& buffer, int& position, \
Dune::MPIHelper::MPICommunicator comm); \
template void unpack(__VA_ARGS__& data, \
std::vector<char>& buffer, int& position, \
Dune::MPIHelper::MPICommunicator comm);
INSTANTIATE_PACK(double)
INSTANTIATE_PACK(std::size_t)
INSTANTIATE_PACK(bool)
INSTANTIATE_PACK(int)
INSTANTIATE_PACK(std::array<short,3>)
INSTANTIATE_PACK(std::array<bool,3>)
INSTANTIATE_PACK(unsigned char)
#undef INSTANTIATE_PACK #undef INSTANTIATE_PACK
} // end namespace Mpi } // end namespace Mpi