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

Merge pull request #2477 from akva2/serialize_internal_eclstate_part5

Browse Source 
Internal serialization in EclipseState - part 5
This commit is contained in:
Arne Morten Kvarving
2020-03-17 13:59:12 +01:00
committed by GitHub
parent 6f7d15c56e f12c83bd8e
commit aab9bb8883
3 changed files with 43 additions and 1474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@@ -26,10 +26,6 @@
#include <opm/output/eclipse/RestartValue.hpp> #include <opm/output/eclipse/RestartValue.hpp>
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/output/eclipse/Summary.hpp> #include <opm/output/eclipse/Summary.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
#include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp>
@@ -39,7 +35,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.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/Tables/DenT.hpp>
#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp> #include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
#include <dune/common/parallel/mpihelper.hh> #include <dune/common/parallel/mpihelper.hh>
@@ -62,75 +57,28 @@ namespace Action {
class Quantity; class Quantity;
} }
class Aqudims;
class BrineDensityTable;
class ColumnSchema;
class Connection; class Connection;
class DeckItem; class DeckItem;
class DeckRecord; class DeckRecord;
class DENSITYRecord;
class DensityTable;
class Dimension; class Dimension;
class Eqldims;
class Events; class Events;
template<class T> class IOrderSet; template<class T> class IOrderSet;
class JFunc;
class Location; class Location;
class MessageLimits; class MessageLimits;
class MLimits; class MLimits;
class OilVaporizationProperties; class OilVaporizationProperties;
class PlymwinjTable;
class PlyshlogTable;
class PlyvmhRecord;
class PlyvmhTable;
class PolyInjTable;
class PVCDORecord;
class PvcdoTable;
class PlmixparRecord;
class PlmixparTable;
class PvtgTable;
class PvtoTable;
class PVTWRecord;
class PvtwsaltTable;
class PvtwTable;
class Regdims;
class RestartConfig; class RestartConfig;
class RestartSchedule; class RestartSchedule;
class RFTConfig; class RFTConfig;
class ROCKRecord;
class RockTable;
class RocktabTable;
class Rock2dTable;
class Rock2dtrTable;
class Segment; class Segment;
class ShrateRecord;
class ShrateTable;
class SimpleTable;
class SkprpolyTable;
class SkprwatTable;
class SolventDensityTable;
class SpiralICD; class SpiralICD;
class StandardCond;
class Stone1exRecord;
class Stone1exTable;
class Tabdims;
class TableColumn;
class TableContainer;
class TableManager;
class TableSchema;
class TimeStampUTC; class TimeStampUTC;
class TlmixparRecord;
class TlmixparTable;
class Tuning; class Tuning;
class UDAValue; class UDAValue;
class UnitSystem; class UnitSystem;
class Valve; class Valve;
class VFPInjTable; class VFPInjTable;
class VFPProdTable; class VFPProdTable;
class VISCREFRecord;
class ViscrefTable;
class WATDENTRecord;
class WatdentTable;
class WellConnections; class WellConnections;
class WellEconProductionLimits; class WellEconProductionLimits;
class WellFoamProperties; class WellFoamProperties;
@@ -465,16 +413,6 @@ ADD_PACK_PROTOTYPES(Action::AST)
ADD_PACK_PROTOTYPES(Action::ASTNode) ADD_PACK_PROTOTYPES(Action::ASTNode)
ADD_PACK_PROTOTYPES(Action::Condition) ADD_PACK_PROTOTYPES(Action::Condition)
ADD_PACK_PROTOTYPES(Action::Quantity) ADD_PACK_PROTOTYPES(Action::Quantity)
ADD_PACK_PROTOTYPES(Aqudims)
ADD_PACK_PROTOTYPES(AquiferConfig)
ADD_PACK_PROTOTYPES(Aquancon)
ADD_PACK_PROTOTYPES(Aquancon::AquancCell)
ADD_PACK_PROTOTYPES(AquiferCT)
ADD_PACK_PROTOTYPES(AquiferCT::AQUCT_data)
ADD_PACK_PROTOTYPES(Aquifetp)
ADD_PACK_PROTOTYPES(Aquifetp::AQUFETP_data)
ADD_PACK_PROTOTYPES(BrineDensityTable)
ADD_PACK_PROTOTYPES(ColumnSchema)
ADD_PACK_PROTOTYPES(Connection) ADD_PACK_PROTOTYPES(Connection)
ADD_PACK_PROTOTYPES(data::CellData) ADD_PACK_PROTOTYPES(data::CellData)
ADD_PACK_PROTOTYPES(data::Connection) ADD_PACK_PROTOTYPES(data::Connection)
@@ -488,12 +426,7 @@ ADD_PACK_PROTOTYPES(Deck)
ADD_PACK_PROTOTYPES(DeckItem) ADD_PACK_PROTOTYPES(DeckItem)
ADD_PACK_PROTOTYPES(DeckKeyword) ADD_PACK_PROTOTYPES(DeckKeyword)
ADD_PACK_PROTOTYPES(DeckRecord) ADD_PACK_PROTOTYPES(DeckRecord)
ADD_PACK_PROTOTYPES(DENSITYRecord)
ADD_PACK_PROTOTYPES(DensityTable)
ADD_PACK_PROTOTYPES(DenT)
ADD_PACK_PROTOTYPES(DenT::entry)
ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(Eqldims)
ADD_PACK_PROTOTYPES(Events) ADD_PACK_PROTOTYPES(Events)
ADD_PACK_PROTOTYPES(GConSale) ADD_PACK_PROTOTYPES(GConSale)
ADD_PACK_PROTOTYPES(GConSale::GCONSALEGroup) ADD_PACK_PROTOTYPES(GConSale::GCONSALEGroup)
@@ -506,66 +439,26 @@ ADD_PACK_PROTOTYPES(GuideRateModel)
ADD_PACK_PROTOTYPES(Group) ADD_PACK_PROTOTYPES(Group)
ADD_PACK_PROTOTYPES(Group::GroupInjectionProperties) ADD_PACK_PROTOTYPES(Group::GroupInjectionProperties)
ADD_PACK_PROTOTYPES(Group::GroupProductionProperties) ADD_PACK_PROTOTYPES(Group::GroupProductionProperties)
ADD_PACK_PROTOTYPES(JFunc)
ADD_PACK_PROTOTYPES(Location) ADD_PACK_PROTOTYPES(Location)
ADD_PACK_PROTOTYPES(MessageLimits) ADD_PACK_PROTOTYPES(MessageLimits)
ADD_PACK_PROTOTYPES(MLimits) ADD_PACK_PROTOTYPES(MLimits)
ADD_PACK_PROTOTYPES(OilVaporizationProperties) ADD_PACK_PROTOTYPES(OilVaporizationProperties)
ADD_PACK_PROTOTYPES(PlmixparRecord)
ADD_PACK_PROTOTYPES(PlmixparTable)
ADD_PACK_PROTOTYPES(PlymwinjTable)
ADD_PACK_PROTOTYPES(PlyshlogTable)
ADD_PACK_PROTOTYPES(PlyvmhRecord)
ADD_PACK_PROTOTYPES(PlyvmhTable)
ADD_PACK_PROTOTYPES(PolyInjTable)
ADD_PACK_PROTOTYPES(PVCDORecord)
ADD_PACK_PROTOTYPES(PvcdoTable)
ADD_PACK_PROTOTYPES(PvtgTable)
ADD_PACK_PROTOTYPES(PvtoTable)
ADD_PACK_PROTOTYPES(PVTWRecord)
ADD_PACK_PROTOTYPES(PvtwsaltTable)
ADD_PACK_PROTOTYPES(PvtwTable)
ADD_PACK_PROTOTYPES(Regdims)
ADD_PACK_PROTOTYPES(RestartConfig) ADD_PACK_PROTOTYPES(RestartConfig)
ADD_PACK_PROTOTYPES(RestartKey) 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(ROCKRecord)
ADD_PACK_PROTOTYPES(RockTable)
ADD_PACK_PROTOTYPES(Rock2dTable)
ADD_PACK_PROTOTYPES(Rock2dtrTable)
ADD_PACK_PROTOTYPES(RocktabTable)
ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(ShrateRecord)
ADD_PACK_PROTOTYPES(ShrateTable)
ADD_PACK_PROTOTYPES(SimpleTable)
ADD_PACK_PROTOTYPES(SkprpolyTable)
ADD_PACK_PROTOTYPES(SkprwatTable)
ADD_PACK_PROTOTYPES(SolventDensityTable)
ADD_PACK_PROTOTYPES(SpiralICD) ADD_PACK_PROTOTYPES(SpiralICD)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(Stone1exRecord)
ADD_PACK_PROTOTYPES(Stone1exTable)
ADD_PACK_PROTOTYPES(Tabdims)
ADD_PACK_PROTOTYPES(TableColumn)
ADD_PACK_PROTOTYPES(TableContainer)
ADD_PACK_PROTOTYPES(TableManager)
ADD_PACK_PROTOTYPES(TableSchema)
ADD_PACK_PROTOTYPES(TimeMap) ADD_PACK_PROTOTYPES(TimeMap)
ADD_PACK_PROTOTYPES(TimeStampUTC) ADD_PACK_PROTOTYPES(TimeStampUTC)
ADD_PACK_PROTOTYPES(TlmixparRecord)
ADD_PACK_PROTOTYPES(TlmixparTable)
ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(Tuning)
ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UDAValue)
ADD_PACK_PROTOTYPES(UnitSystem) ADD_PACK_PROTOTYPES(UnitSystem)
ADD_PACK_PROTOTYPES(Valve) ADD_PACK_PROTOTYPES(Valve)
ADD_PACK_PROTOTYPES(VFPInjTable) ADD_PACK_PROTOTYPES(VFPInjTable)
ADD_PACK_PROTOTYPES(VFPProdTable) ADD_PACK_PROTOTYPES(VFPProdTable)
ADD_PACK_PROTOTYPES(VISCREFRecord)
ADD_PACK_PROTOTYPES(ViscrefTable)
ADD_PACK_PROTOTYPES(WATDENTRecord)
ADD_PACK_PROTOTYPES(WatdentTable)
ADD_PACK_PROTOTYPES(Well) ADD_PACK_PROTOTYPES(Well)
ADD_PACK_PROTOTYPES(WellType) ADD_PACK_PROTOTYPES(WellType)
ADD_PACK_PROTOTYPES(Well::WellGuideRate) ADD_PACK_PROTOTYPES(Well::WellGuideRate)

83
tests/test_ParallelRestart.cpp
View File

@@ -29,6 +29,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/EclipseState/Aquancon.hpp> #include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferCT.hpp> #include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Aquifetp.hpp> #include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp> #include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Runspec.hpp> #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
@@ -714,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
} }
@@ -724,7 +725,7 @@ BOOST_AUTO_TEST_CASE(Rock2dtrTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::Rock2dtrTable val1({{1.0,2.0},{3.0,4.0}}, {1.0, 2.0, 3.0}); Opm::Rock2dtrTable 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(Rock2dtrTable) DO_CHECKS(Rock2dtrTable)
#endif #endif
} }
@@ -735,10 +736,10 @@ BOOST_AUTO_TEST_CASE(ColumnSchema)
#if HAVE_MPI #if HAVE_MPI
Opm::ColumnSchema val1("test1", Opm::Table::INCREASING, Opm::ColumnSchema val1("test1", Opm::Table::INCREASING,
Opm::Table::DEFAULT_LINEAR); Opm::Table::DEFAULT_LINEAR);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(ColumnSchema) DO_CHECKS(ColumnSchema)
val1 = Opm::ColumnSchema("test2", Opm::Table::DECREASING, 1.0); val1 = Opm::ColumnSchema("test2", Opm::Table::DECREASING, 1.0);
val2 = PackUnpack(val1); val2 = PackUnpack2(val1);
DO_CHECKS(ColumnSchema) DO_CHECKS(ColumnSchema)
#endif #endif
} }
@@ -748,7 +749,7 @@ BOOST_AUTO_TEST_CASE(TableSchema)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::TableSchema val1 = getTableSchema(); Opm::TableSchema val1 = getTableSchema();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(TableSchema) DO_CHECKS(TableSchema)
#endif #endif
} }
@@ -758,7 +759,7 @@ BOOST_AUTO_TEST_CASE(TableColumn)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::TableColumn val1 = getTableColumn(); Opm::TableColumn val1 = getTableColumn();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(TableColumn) DO_CHECKS(TableColumn)
#endif #endif
} }
@@ -768,7 +769,7 @@ BOOST_AUTO_TEST_CASE(SimpleTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::SimpleTable val1 = getSimpleTable(); Opm::SimpleTable val1 = getSimpleTable();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SimpleTable) DO_CHECKS(SimpleTable)
#endif #endif
} }
@@ -783,7 +784,7 @@ BOOST_AUTO_TEST_CASE(TableContainer)
Opm::TableContainer val1(2); Opm::TableContainer val1(2);
val1.addTable(0, std::make_shared<Opm::SimpleTable>(tab1)); val1.addTable(0, std::make_shared<Opm::SimpleTable>(tab1));
val1.addTable(1, std::make_shared<Opm::SimpleTable>(tab1)); val1.addTable(1, std::make_shared<Opm::SimpleTable>(tab1));
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(TableContainer) DO_CHECKS(TableContainer)
#endif #endif
} }
@@ -921,7 +922,7 @@ BOOST_AUTO_TEST_CASE(Tabdims)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::Tabdims val1(1,2,3,4,5,6); Opm::Tabdims val1(1,2,3,4,5,6);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Tabdims) DO_CHECKS(Tabdims)
#endif #endif
} }
@@ -1010,7 +1011,7 @@ BOOST_AUTO_TEST_CASE(PvtgTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PvtgTable val1 = getPvtgTable(); Opm::PvtgTable val1 = getPvtgTable();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PvtgTable) DO_CHECKS(PvtgTable)
#endif #endif
} }
@@ -1020,7 +1021,7 @@ BOOST_AUTO_TEST_CASE(PvtoTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PvtoTable val1 = getPvtoTable(); Opm::PvtoTable val1 = getPvtoTable();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PvtoTable) DO_CHECKS(PvtoTable)
#endif #endif
} }
@@ -1031,7 +1032,7 @@ BOOST_AUTO_TEST_CASE(JFunc)
#if HAVE_MPI #if HAVE_MPI
Opm::JFunc val1(Opm::JFunc::Flag::BOTH, 1.0, 2.0, Opm::JFunc val1(Opm::JFunc::Flag::BOTH, 1.0, 2.0,
3.0, 4.0, Opm::JFunc::Direction::XY); 3.0, 4.0, Opm::JFunc::Direction::XY);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(JFunc) DO_CHECKS(JFunc)
#endif #endif
} }
@@ -1041,7 +1042,7 @@ BOOST_AUTO_TEST_CASE(PVTWRecord)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0}; Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PVTWRecord) DO_CHECKS(PVTWRecord)
#endif #endif
} }
@@ -1051,7 +1052,7 @@ BOOST_AUTO_TEST_CASE(PvtwTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PvtwTable val1({Opm::PVTWRecord{1.0, 2.0, 3.0, 4.0, 5.0}}); Opm::PvtwTable val1({Opm::PVTWRecord{1.0, 2.0, 3.0, 4.0, 5.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PvtwTable) DO_CHECKS(PvtwTable)
#endif #endif
} }
@@ -1061,7 +1062,7 @@ BOOST_AUTO_TEST_CASE(PVCDORecord)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0}; Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PVTWRecord) DO_CHECKS(PVTWRecord)
#endif #endif
} }
@@ -1071,7 +1072,7 @@ BOOST_AUTO_TEST_CASE(PvcdoTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PvcdoTable val1({Opm::PVCDORecord{1.0, 2.0, 3.0, 4.0, 5.0}}); Opm::PvcdoTable val1({Opm::PVCDORecord{1.0, 2.0, 3.0, 4.0, 5.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PvcdoTable) DO_CHECKS(PvcdoTable)
#endif #endif
} }
@@ -1081,7 +1082,7 @@ BOOST_AUTO_TEST_CASE(DENSITYRecord)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::DENSITYRecord val1{1.0, 2.0, 3.0}; Opm::DENSITYRecord val1{1.0, 2.0, 3.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(DENSITYRecord) DO_CHECKS(DENSITYRecord)
#endif #endif
} }
@@ -1091,7 +1092,7 @@ BOOST_AUTO_TEST_CASE(DensityTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::DensityTable val1({Opm::DENSITYRecord{1.0, 2.0, 3.0}}); Opm::DensityTable val1({Opm::DENSITYRecord{1.0, 2.0, 3.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(DensityTable) DO_CHECKS(DensityTable)
#endif #endif
} }
@@ -1101,7 +1102,7 @@ BOOST_AUTO_TEST_CASE(VISCREFRecord)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::VISCREFRecord val1{1.0, 2.0}; Opm::VISCREFRecord val1{1.0, 2.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(VISCREFRecord) DO_CHECKS(VISCREFRecord)
#endif #endif
} }
@@ -1111,7 +1112,7 @@ BOOST_AUTO_TEST_CASE(ViscrefTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::ViscrefTable val1({Opm::VISCREFRecord{1.0, 2.0}}); Opm::ViscrefTable val1({Opm::VISCREFRecord{1.0, 2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(ViscrefTable) DO_CHECKS(ViscrefTable)
#endif #endif
} }
@@ -1121,7 +1122,7 @@ BOOST_AUTO_TEST_CASE(WATDENTRecord)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::WATDENTRecord val1{1.0, 2.0, 3.0}; Opm::WATDENTRecord val1{1.0, 2.0, 3.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(WATDENTRecord) DO_CHECKS(WATDENTRecord)
#endif #endif
} }
@@ -1131,7 +1132,7 @@ BOOST_AUTO_TEST_CASE(WatdentTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::WatdentTable val1({Opm::WATDENTRecord{1.0, 2.0, 3.0}}); Opm::WatdentTable val1({Opm::WATDENTRecord{1.0, 2.0, 3.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(WatdentTable) DO_CHECKS(WatdentTable)
#endif #endif
} }
@@ -1141,7 +1142,7 @@ BOOST_AUTO_TEST_CASE(PlymwinjTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PlymwinjTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}); Opm::PlymwinjTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PlymwinjTable) DO_CHECKS(PlymwinjTable)
#endif #endif
} }
@@ -1151,7 +1152,7 @@ BOOST_AUTO_TEST_CASE(SkprpolyTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::SkprpolyTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}, 3.0); Opm::SkprpolyTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}, 3.0);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SkprpolyTable) DO_CHECKS(SkprpolyTable)
#endif #endif
} }
@@ -1161,7 +1162,7 @@ BOOST_AUTO_TEST_CASE(SkprwatTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::SkprwatTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}); Opm::SkprwatTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SkprwatTable) DO_CHECKS(SkprwatTable)
#endif #endif
} }
@@ -1171,7 +1172,7 @@ BOOST_AUTO_TEST_CASE(Regdims)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::Regdims val1(1,2,3,4,5); Opm::Regdims val1(1,2,3,4,5);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Regdims) DO_CHECKS(Regdims)
#endif #endif
} }
@@ -1181,7 +1182,7 @@ BOOST_AUTO_TEST_CASE(Eqldims)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::Eqldims val1(1,2,3,4,5); Opm::Eqldims val1(1,2,3,4,5);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Eqldims) DO_CHECKS(Eqldims)
#endif #endif
} }
@@ -1191,7 +1192,7 @@ BOOST_AUTO_TEST_CASE(Aqudims)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::Aqudims val1(1,2,3,4,5,6,7,8); Opm::Aqudims val1(1,2,3,4,5,6,7,8);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Aqudims) DO_CHECKS(Aqudims)
#endif #endif
} }
@@ -1201,7 +1202,7 @@ BOOST_AUTO_TEST_CASE(ROCKRecord)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::ROCKRecord val1{1.0,2.0}; Opm::ROCKRecord val1{1.0,2.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(ROCKRecord) DO_CHECKS(ROCKRecord)
#endif #endif
} }
@@ -1211,7 +1212,7 @@ BOOST_AUTO_TEST_CASE(RockTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::RockTable val1({Opm::ROCKRecord{1.0,2.0}}); Opm::RockTable val1({Opm::ROCKRecord{1.0,2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(RockTable) DO_CHECKS(RockTable)
#endif #endif
} }
@@ -1260,7 +1261,7 @@ BOOST_AUTO_TEST_CASE(TableManager)
{7.0, 8.0}, {7.0, 8.0},
77, 77,
1.0); 1.0);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(TableManager) DO_CHECKS(TableManager)
#endif #endif
} }
@@ -1763,7 +1764,7 @@ BOOST_AUTO_TEST_CASE(AquiferCT)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::AquiferCT val1 = getAquiferCT(); Opm::AquiferCT val1 = getAquiferCT();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(AquiferCT); DO_CHECKS(AquiferCT);
#endif #endif
} }
@@ -1773,7 +1774,7 @@ BOOST_AUTO_TEST_CASE(Aquifetp)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::Aquifetp val1 = getAquifetp(); Opm::Aquifetp val1 = getAquifetp();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Aquifetp); DO_CHECKS(Aquifetp);
#endif #endif
} }
@@ -1783,7 +1784,7 @@ BOOST_AUTO_TEST_CASE(Aquancon)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::Aquancon val1 = getAquancon(); Opm::Aquancon val1 = getAquancon();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Aquancon); DO_CHECKS(Aquancon);
#endif #endif
} }
@@ -1795,7 +1796,7 @@ BOOST_AUTO_TEST_CASE(AquferConfig)
Opm::AquiferCT ct = getAquiferCT(); Opm::AquiferCT ct = getAquiferCT();
Opm::Aquancon conn = getAquancon(); Opm::Aquancon conn = getAquancon();
Opm::AquiferConfig val1(fetp, ct, conn); Opm::AquiferConfig val1(fetp, ct, conn);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(AquiferConfig); DO_CHECKS(AquiferConfig);
#endif #endif
} }
@@ -2170,7 +2171,7 @@ BOOST_AUTO_TEST_CASE(BrineDensityTable)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::BrineDensityTable val1({1.0, 2.0, 3.0}); Opm::BrineDensityTable val1({1.0, 2.0, 3.0});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(BrineDensityTable) DO_CHECKS(BrineDensityTable)
#endif #endif
} }
@@ -2212,7 +2213,7 @@ BOOST_AUTO_TEST_CASE(PvtwsaltTable)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::PvtwsaltTable val1(1.0, 2.0, {3.0, 4.0, 5.0}); Opm::PvtwsaltTable val1(1.0, 2.0, {3.0, 4.0, 5.0});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PvtwsaltTable) DO_CHECKS(PvtwsaltTable)
#endif #endif
} }
@@ -2328,7 +2329,7 @@ BOOST_AUTO_TEST_CASE(DenT)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::DenT val1 = getDenT(); Opm::DenT val1 = getDenT();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(DenT) DO_CHECKS(DenT)
#endif #endif
} }
@@ -2350,7 +2351,7 @@ BOOST_AUTO_TEST_CASE(SolventDensityTable)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::SolventDensityTable val1({1.0, 2.0, 3.0}); Opm::SolventDensityTable val1({1.0, 2.0, 3.0});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SolventDensityTable) DO_CHECKS(SolventDensityTable)
#endif #endif
} }
@@ -2372,7 +2373,7 @@ BOOST_AUTO_TEST_CASE(PlyshlogTable)
Opm::OrderedMap<std::string, Opm::TableColumn> data; Opm::OrderedMap<std::string, Opm::TableColumn> data;
data.insert({"test3", getTableColumn()}); data.insert({"test3", getTableColumn()});
Opm::PlyshlogTable val1(getTableSchema(), data, true, 1.0, 2.0, 3.0, true, true); Opm::PlyshlogTable val1(getTableSchema(), data, true, 1.0, 2.0, 3.0, true, true);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PlyshlogTable) DO_CHECKS(PlyshlogTable)
#endif #endif
} }
@@ -2384,7 +2385,7 @@ BOOST_AUTO_TEST_CASE(RocktabTable)
Opm::OrderedMap<std::string, Opm::TableColumn> data; Opm::OrderedMap<std::string, Opm::TableColumn> data;
data.insert({"test3", getTableColumn()}); data.insert({"test3", getTableColumn()});
Opm::RocktabTable val1(getTableSchema(), data, true, true); Opm::RocktabTable val1(getTableSchema(), data, true, true);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(RocktabTable) DO_CHECKS(RocktabTable)
#endif #endif
} }