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 NNC and EDITNNC

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-12 15:29:47 +01:00
parent 94f7150d10
commit a576c786dd
3 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,14 +29,12 @@
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp> #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp> #include <opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp> #include <opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp> #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp> #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp> #include <opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp>
@ -520,16 +518,6 @@ std::size_t packSize(const RockConfig& data, Dune::MPIHelper::MPICommunicator co
packSize(data.hysteresis_mode(), comm); packSize(data.hysteresis_mode(), comm);
} }
std::size_t packSize(const NNC& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.data(), comm);
}
std::size_t packSize(const EDITNNC& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.data(), comm);
}
std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.pvmultValues(), comm) + return packSize(data.pvmultValues(), comm) +
@ -2075,18 +2063,6 @@ void pack(const RockConfig& data, std::vector<char>& buffer, int& position,
} }
void pack(const NNC& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.data(), buffer, position, comm);
}
void pack(const EDITNNC& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.data(), buffer, position, comm);
}
void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position, void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -3789,22 +3765,6 @@ void unpack(BCConfig& bc, std::vector<char>& buffer, int& position,
bc = BCConfig(faces); bc = BCConfig(faces);
} }
void unpack(NNC& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<NNCdata> res;
unpack(res, buffer, position, comm);
data = NNC(res);
}
void unpack(EDITNNC& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<NNCdata> res;
unpack(res, buffer, position, comm);
data = EDITNNC(res);
}
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)
{ {

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

@ -80,7 +80,6 @@ class Dimension;
class EclHysterConfig; class EclHysterConfig;
class EclipseConfig; class EclipseConfig;
class Eqldims; class Eqldims;
class EDITNNC;
class EndpointScaling; class EndpointScaling;
class Equil; class Equil;
class EquilRecord; class EquilRecord;
@ -100,8 +99,6 @@ class MessageLimits;
class MLimits; class MLimits;
class MULTREGTRecord; class MULTREGTRecord;
class MULTREGTScanner; class MULTREGTScanner;
class NNC;
struct NNCdata;
class OilVaporizationProperties; class OilVaporizationProperties;
class Phases; class Phases;
class PlymwinjTable; class PlymwinjTable;
@ -534,7 +531,6 @@ ADD_PACK_PROTOTYPES(DenT::entry)
ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(EclHysterConfig) ADD_PACK_PROTOTYPES(EclHysterConfig)
ADD_PACK_PROTOTYPES(EclipseConfig) ADD_PACK_PROTOTYPES(EclipseConfig)
ADD_PACK_PROTOTYPES(EDITNNC)
ADD_PACK_PROTOTYPES(EndpointScaling) ADD_PACK_PROTOTYPES(EndpointScaling)
ADD_PACK_PROTOTYPES(Equil) ADD_PACK_PROTOTYPES(Equil)
ADD_PACK_PROTOTYPES(Eqldims) ADD_PACK_PROTOTYPES(Eqldims)
@ -565,8 +561,6 @@ ADD_PACK_PROTOTYPES(MessageLimits)
ADD_PACK_PROTOTYPES(MLimits) ADD_PACK_PROTOTYPES(MLimits)
ADD_PACK_PROTOTYPES(MULTREGTRecord) ADD_PACK_PROTOTYPES(MULTREGTRecord)
ADD_PACK_PROTOTYPES(MULTREGTScanner) ADD_PACK_PROTOTYPES(MULTREGTScanner)
ADD_PACK_PROTOTYPES(NNC)
ADD_PACK_PROTOTYPES(NNCdata)
ADD_PACK_PROTOTYPES(OilVaporizationProperties) ADD_PACK_PROTOTYPES(OilVaporizationProperties)
ADD_PACK_PROTOTYPES(Phases) ADD_PACK_PROTOTYPES(Phases)
ADD_PACK_PROTOTYPES(PlmixparRecord) ADD_PACK_PROTOTYPES(PlmixparRecord)

4
tests/test_ParallelRestart.cpp
View File

@ -694,7 +694,7 @@ BOOST_AUTO_TEST_CASE(EDITNNC)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::EDITNNC val1({{1,2,1.0},{2,3,2.0}}); Opm::EDITNNC val1({{1,2,1.0},{2,3,2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(EDITNNC) DO_CHECKS(EDITNNC)
#endif #endif
} }
@ -704,7 +704,7 @@ BOOST_AUTO_TEST_CASE(NNC)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::NNC val1({{1,2,1.0},{2,3,2.0}}); Opm::NNC val1({{1,2,1.0},{2,3,2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(NNC) DO_CHECKS(NNC)
#endif #endif
} }