OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-07 23:13:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Serialize RockConfig

Browse Source
This commit is contained in:
Joakim Hove 2020-01-27 11:13:06 +01:00
parent 645b07bf7f
commit d15ad322c1
3 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
@ -520,6 +521,15 @@ std::size_t packSize(const BCConfig& bc, Dune::MPIHelper::MPICommunicator comm)
return packSize(bc.faces(), comm);
}
std::size_t packSize(const RockConfig& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.active(), comm) +
packSize(data.rocknum_property(), comm) +
packSize(data.comp(), comm) +
packSize(data.num_rock_tables(), comm) +
packSize(data.water_compaction(), comm) +
packSize(data.hysteresis_mode(), comm);
}
std::size_t packSize(const NNC& data, Dune::MPIHelper::MPICommunicator comm)
{
@ -613,6 +623,7 @@ std::size_t packSize(const SimulationConfig& data, Dune::MPIHelper::MPICommunica
{
return packSize(data.getThresholdPressure(), comm) +
packSize(data.bcconfig(), comm) +
packSize(data.rock_config(), comm) +
packSize(data.useCPR(), comm) +
packSize(data.hasDISGAS(), comm) +
packSize(data.hasVAPOIL(), comm) +
@ -2344,6 +2355,18 @@ void pack(const BCConfig& bc, std::vector<char>& buffer, int& position,
pack(bc.faces(), buffer, position, comm);
}
void pack(const RockConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.active(), buffer, position, comm);
pack(data.rocknum_property(), buffer, position, comm);
pack(data.comp(), buffer, position, comm);
pack(data.num_rock_tables(), buffer, position, comm);
pack(data.water_compaction(), buffer, position, comm);
pack(data.hysteresis_mode(), buffer, position, comm);
}
void pack(const NNC& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
@ -2452,6 +2475,7 @@ void pack(const SimulationConfig& data, std::vector<char>& buffer, int& position
{
pack(data.getThresholdPressure(), buffer, position, comm);
pack(data.bcconfig(), buffer, position, comm);
pack(data.rock_config(), buffer, position, comm);
pack(data.useCPR(), buffer, position, comm);
pack(data.hasDISGAS(), buffer, position, comm);
pack(data.hasVAPOIL(), buffer, position, comm);
@ -4330,6 +4354,26 @@ void unpack(RestartValue& data, std::vector<char>& buffer, int& position,
unpack(data.extra, buffer, position, comm);
}
void unpack(RockConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
RockConfig rock_config;
bool active;
std::vector<RockConfig::RockComp> rock_comp;
std::string rocknum_property;
std::size_t num_rock_tables;
bool water_compaction;
RockConfig::Hysteresis hyst_mode;
unpack(active, buffer, position, comm);
unpack(rocknum_property, buffer, position, comm);
unpack(rock_comp, buffer, position, comm);
unpack(num_rock_tables, buffer, position, comm);
unpack(water_compaction, buffer, position, comm);
unpack(hyst_mode, buffer, position, comm);
data = RockConfig(active, rock_comp, rocknum_property, num_rock_tables, water_compaction, hyst_mode);
}
void unpack(ThresholdPressure& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
@ -4500,14 +4544,16 @@ void unpack(SimulationConfig& data, std::vector<char>& buffer, int& position,
{
ThresholdPressure thresholdPressure;
BCConfig bc;
RockConfig rock_config;
bool useCPR, DISGAS, VAPOIL, isThermal;
unpack(thresholdPressure, buffer, position, comm);
unpack(bc, buffer, position, comm);
unpack(rock_config, buffer, position, comm);
unpack(useCPR, buffer, position, comm);
unpack(DISGAS, buffer, position, comm);
unpack(VAPOIL, buffer, position, comm);
unpack(isThermal, buffer, position, comm);
data = SimulationConfig(thresholdPressure, bc, useCPR, DISGAS, VAPOIL, isThermal);
data = SimulationConfig(thresholdPressure, bc, rock_config, useCPR, DISGAS, VAPOIL, isThermal);
}
void unpack(TimeMap& data, std::vector<char>& buffer, int& position,

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

@ -123,6 +123,7 @@ class Regdims;
class RestartConfig;
class RestartSchedule;
class RFTConfig;
class RockConfig;
class ROCKRecord;
class RockTable;
class Rock2dTable;
@ -726,6 +727,7 @@ ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartSchedule)
ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(RFTConfig)
ADD_PACK_PROTOTYPES(RockConfig)
ADD_PACK_PROTOTYPES(ROCKRecord)
ADD_PACK_PROTOTYPES(RockTable)
ADD_PACK_PROTOTYPES(Rock2dTable)

19
tests/test_ParallelRestart.cpp
View File

@ -74,6 +74,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
@ -183,6 +184,12 @@ Opm::ThresholdPressure getThresholdPressure()
{{{1,2},{false,3.0}},{{2,3},{true,4.0}}});
}
Opm::RockConfig getRockConfig()
{
return Opm::RockConfig(true, {{100, 0.25}, {200, 0.30}}, "ROCKNUM", 10, false, Opm::RockConfig::Hysteresis::HYSTER);
}
Opm::BCConfig getBCConfig()
{
@ -604,6 +611,16 @@ BOOST_AUTO_TEST_CASE(ThresholdPressure)
#endif
}
BOOST_AUTO_TEST_CASE(RockConfig)
{
#if HAVE_MPI
Opm::RockConfig val1 = getRockConfig();
auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));
BOOST_CHECK(val1 == std::get<0>(val2));
#endif
}
BOOST_AUTO_TEST_CASE(EDITNNC)
{
@ -774,7 +791,7 @@ BOOST_AUTO_TEST_CASE(InitConfig)
BOOST_AUTO_TEST_CASE(SimulationConfig)
{
#if HAVE_MPI
Opm::SimulationConfig val1(getThresholdPressure(), getBCConfig(), false, true, false, true);
Opm::SimulationConfig val1(getThresholdPressure(), getBCConfig(), getRockConfig(), false, true, false, true);
auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));
BOOST_CHECK(val1 == std::get<0>(val2));