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 BCConfig

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-12 15:55:44 +01:00
parent 33cf3826aa
commit 855baf2cb6
3 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.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/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
@@ -349,7 +348,6 @@ std::size_t packSize(const std::array<T,N>& data, Dune::MPIHelper::MPICommunicat
HANDLE_AS_POD(Actdims) HANDLE_AS_POD(Actdims)
HANDLE_AS_POD(Aqudims) HANDLE_AS_POD(Aqudims)
HANDLE_AS_POD(BCConfig::BCFace)
HANDLE_AS_POD(data::Connection) HANDLE_AS_POD(data::Connection)
HANDLE_AS_POD(data::CurrentControl) HANDLE_AS_POD(data::CurrentControl)
HANDLE_AS_POD(data::Rates) HANDLE_AS_POD(data::Rates)
@@ -494,11 +492,6 @@ std::size_t packSize(const Aquancon& data, Dune::MPIHelper::MPICommunicator comm
return packSize(data.data(), comm); return packSize(data.data(), comm);
} }
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) std::size_t packSize(const RockConfig& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.active(), comm) + return packSize(data.active(), comm) +
@@ -2021,12 +2014,6 @@ void pack(const Aquancon& data, std::vector<char>& buffer, int& position,
pack(data.data(), buffer, position, comm); pack(data.data(), buffer, position, comm);
} }
void pack(const BCConfig& bc, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(bc.faces(), buffer, position, comm);
}
void pack(const RockConfig& data, std::vector<char>& buffer, int& position, void pack(const RockConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -3711,15 +3698,6 @@ void unpack(Aquancon& data, std::vector<char>& buffer, int& position, Dune::MPIH
data = Aquancon(aquiferCells); data = Aquancon(aquiferCells);
} }
void unpack(BCConfig& bc, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<BCConfig::BCFace> faces;
unpack(faces, buffer, position, comm);
bc = BCConfig(faces);
}
void unpack(Rock2dTable& data, std::vector<char>& buffer, int& position, void unpack(Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@@ -41,7 +41,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/DenT.hpp> #include <opm/parser/eclipse/EclipseState/Tables/DenT.hpp>
#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp> #include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
@@ -505,8 +504,6 @@ ADD_PACK_PROTOTYPES(AquiferCT)
ADD_PACK_PROTOTYPES(AquiferCT::AQUCT_data) ADD_PACK_PROTOTYPES(AquiferCT::AQUCT_data)
ADD_PACK_PROTOTYPES(Aquifetp) ADD_PACK_PROTOTYPES(Aquifetp)
ADD_PACK_PROTOTYPES(Aquifetp::AQUFETP_data) ADD_PACK_PROTOTYPES(Aquifetp::AQUFETP_data)
ADD_PACK_PROTOTYPES(BCConfig)
ADD_PACK_PROTOTYPES(BCConfig::BCFace)
ADD_PACK_PROTOTYPES(BrineDensityTable) ADD_PACK_PROTOTYPES(BrineDensityTable)
ADD_PACK_PROTOTYPES(ColumnSchema) ADD_PACK_PROTOTYPES(ColumnSchema)
ADD_PACK_PROTOTYPES(Connection) ADD_PACK_PROTOTYPES(Connection)

2
tests/test_ParallelRestart.cpp
View File

@@ -855,7 +855,7 @@ BOOST_AUTO_TEST_CASE(BCConfig)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::BCConfig val1({{10,11,12,13,14,15,Opm::BCType::RATE, Opm::FaceDir::XPlus, Opm::BCComponent::GAS, 100}}); Opm::BCConfig val1({{10,11,12,13,14,15,Opm::BCType::RATE, Opm::FaceDir::XPlus, Opm::BCComponent::GAS, 100}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(BCConfig) DO_CHECKS(BCConfig)
#endif #endif
} }