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 Rock2dTable

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-17 10:07:46 +01:00
parent 6f070e6bcf
commit cda171ff47
3 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
@@ -353,12 +352,6 @@ std::size_t packSize(const WellType& data, Dune::MPIHelper::MPICommunicator comm
packSize(data.preferred_phase(), comm); packSize(data.preferred_phase(), comm);
} }
std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.pvmultValues(), comm) +
packSize(data.pressureValues(), comm);
}
std::size_t packSize(const Rock2dtrTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const Rock2dtrTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.transMultValues(), comm) + return packSize(data.transMultValues(), comm) +
@@ -1401,13 +1394,6 @@ void pack(const WellType& data, std::vector<char>& buffer, int& position,
pack(data.preferred_phase(), buffer, position, comm); pack(data.preferred_phase(), buffer, position, comm);
} }
void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.pvmultValues(), buffer, position, comm);
pack(data.pressureValues(), buffer, position, comm);
}
void pack(const Rock2dtrTable& data, std::vector<char>& buffer, int& position, void pack(const Rock2dtrTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -2489,16 +2475,6 @@ void unpack(WellType& data, std::vector<char>& buffer, int& position, Dune::MPIH
data = WellType( producer, preferred_phase ); data = WellType( producer, preferred_phase );
} }
void unpack(Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<std::vector<double>> pvmultValues;
std::vector<double> pressureValues;
unpack(pvmultValues, buffer, position, comm);
unpack(pressureValues, buffer, position, comm);
data = Rock2dTable(pvmultValues, pressureValues);
}
void unpack(Rock2dtrTable& data, std::vector<char>& buffer, int& position, void unpack(Rock2dtrTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@@ -74,7 +74,6 @@ class RestartConfig;
class RestartSchedule; class RestartSchedule;
class RFTConfig; class RFTConfig;
class RocktabTable; class RocktabTable;
class Rock2dTable;
class Rock2dtrTable; class Rock2dtrTable;
class Segment; class Segment;
class SimpleTable; class SimpleTable;
@@ -466,7 +465,6 @@ ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartSchedule) ADD_PACK_PROTOTYPES(RestartSchedule)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(RFTConfig) ADD_PACK_PROTOTYPES(RFTConfig)
ADD_PACK_PROTOTYPES(Rock2dTable)
ADD_PACK_PROTOTYPES(Rock2dtrTable) ADD_PACK_PROTOTYPES(Rock2dtrTable)
ADD_PACK_PROTOTYPES(RocktabTable) ADD_PACK_PROTOTYPES(RocktabTable)
ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(Segment)

2
tests/test_ParallelRestart.cpp
View File

@@ -715,7 +715,7 @@ BOOST_AUTO_TEST_CASE(Rock2dTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::Rock2dTable val1({{1.0,2.0},{3.0,4.0}}, {1.0, 2.0, 3.0}); Opm::Rock2dTable val1({{1.0,2.0},{3.0,4.0}}, {1.0, 2.0, 3.0});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Rock2dTable) DO_CHECKS(Rock2dTable)
#endif #endif
} }