diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index d335fe0a0..179b20355 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -807,9 +807,6 @@ std::size_t packSize(const Tabulated1DFunction& data, packSize(data.yValues(), comm); } -template std::size_t packSize(const Tabulated1DFunction& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const SolventPvt& data, Dune::MPIHelper::MPICommunicator comm) @@ -820,9 +817,6 @@ std::size_t packSize(const SolventPvt& data, packSize(data.inverseSolventBMu(), comm); } -template std::size_t packSize(const SolventPvt& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const IntervalTabulated2DFunction& data, Dune::MPIHelper::MPICommunicator comm) @@ -834,16 +828,6 @@ std::size_t packSize(const IntervalTabulated2DFunction& data, packSize(data.yExtrapolate(), comm); } -template std::size_t packSize(const IntervalTabulated2DFunction& data, - Dune::MPIHelper::MPICommunicator comm); - -template -std::size_t packSize(const std::vector>& data, - Dune::MPIHelper::MPICommunicator comm); -template -std::size_t packSize(const std::map>& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const UniformXTabulated2DFunction& data, Dune::MPIHelper::MPICommunicator comm) @@ -854,9 +838,6 @@ std::size_t packSize(const UniformXTabulated2DFunction& data, packSize(data.interpolationGuide(), comm); } -template std::size_t packSize(const UniformXTabulated2DFunction& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const DryGasPvt& data, Dune::MPIHelper::MPICommunicator comm) @@ -867,9 +848,6 @@ std::size_t packSize(const DryGasPvt& data, packSize(data.inverseGasBMu(), comm); } -template std::size_t packSize(const DryGasPvt& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const GasPvtThermal& data, Dune::MPIHelper::MPICommunicator comm) @@ -889,9 +867,6 @@ std::size_t packSize(const GasPvtThermal& data, return size; } -template std::size_t packSize(const GasPvtThermal& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const GasPvtMultiplexer& data, Dune::MPIHelper::MPICommunicator comm) @@ -913,11 +888,6 @@ std::size_t packSize(const GasPvtMultiplexer& data, return size; } -template std::size_t packSize(const GasPvtMultiplexer& data, - Dune::MPIHelper::MPICommunicator comm); -template std::size_t packSize(const GasPvtMultiplexer& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const WetGasPvt& data, Dune::MPIHelper::MPICommunicator comm) @@ -934,9 +904,6 @@ std::size_t packSize(const WetGasPvt& data, packSize(data.vapPar1(), comm); } -template std::size_t packSize(const WetGasPvt& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const OilPvtMultiplexer& data, Dune::MPIHelper::MPICommunicator comm) @@ -961,11 +928,6 @@ std::size_t packSize(const OilPvtMultiplexer& data, return size; } -template std::size_t packSize(const OilPvtMultiplexer& data, - Dune::MPIHelper::MPICommunicator comm); -template std::size_t packSize(const OilPvtMultiplexer& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const ConstantCompressibilityOilPvt& data, Dune::MPIHelper::MPICommunicator comm) @@ -978,9 +940,6 @@ std::size_t packSize(const ConstantCompressibilityOilPvt& data, packSize(data.oilViscosibility(), comm); } -template std::size_t packSize(const ConstantCompressibilityOilPvt& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const DeadOilPvt& data, Dune::MPIHelper::MPICommunicator comm) @@ -991,9 +950,6 @@ std::size_t packSize(const DeadOilPvt& data, packSize(data.inverseOilBMu(), comm); } -template std::size_t packSize(const DeadOilPvt& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const LiveOilPvt& data, Dune::MPIHelper::MPICommunicator comm) @@ -1011,9 +967,6 @@ std::size_t packSize(const LiveOilPvt& data, packSize(data.vapPar2(), comm); } -template std::size_t packSize(const LiveOilPvt& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const OilPvtThermal& data, Dune::MPIHelper::MPICommunicator comm) @@ -1036,9 +989,6 @@ std::size_t packSize(const OilPvtThermal& data, return size; } -template std::size_t packSize(const OilPvtThermal& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const WaterPvtMultiplexer& data, Dune::MPIHelper::MPICommunicator comm) @@ -1057,11 +1007,6 @@ std::size_t packSize(const WaterPvtMultiplexer return size; } -template std::size_t packSize(const WaterPvtMultiplexer& data, - Dune::MPIHelper::MPICommunicator comm); -template std::size_t packSize(const WaterPvtMultiplexer& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const ConstantCompressibilityWaterPvt& data, Dune::MPIHelper::MPICommunicator comm) @@ -1074,9 +1019,6 @@ std::size_t packSize(const ConstantCompressibilityWaterPvt& data, packSize(data.waterViscosibility(), comm); } -template std::size_t packSize(const ConstantCompressibilityWaterPvt& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const WaterPvtThermal& data, Dune::MPIHelper::MPICommunicator comm) @@ -1107,9 +1049,6 @@ std::size_t packSize(const WaterPvtThermal& data, return size; } -template std::size_t packSize(const WaterPvtThermal& data, - Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const EclEpsScalingPointsInfo& data, Dune::MPIHelper::MPICommunicator comm) @@ -2681,9 +2620,6 @@ void pack(const Tabulated1DFunction& data, std::vector& buffer, pack(data.yValues(), buffer, position, comm); } -template void pack(const Tabulated1DFunction& data, std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - template void pack(const IntervalTabulated2DFunction& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -2695,20 +2631,6 @@ void pack(const IntervalTabulated2DFunction& data, std::vector& bu pack(data.yExtrapolate(), buffer, position, comm); } -template void pack(const IntervalTabulated2DFunction& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - -template -void pack(const std::vector>& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - -template -void pack(const std::map>& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - template void pack(const UniformXTabulated2DFunction& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -2719,10 +2641,6 @@ void pack(const UniformXTabulated2DFunction& data, std::vector& bu pack(data.interpolationGuide(), buffer, position, comm); } -template void pack(const UniformXTabulated2DFunction& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - template void pack(const SolventPvt& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -2733,10 +2651,6 @@ void pack(const SolventPvt& data, std::vector& buffer, int& positi pack(data.inverseSolventBMu(), buffer, position, comm); } -template void pack(const SolventPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const GasPvtMultiplexer& data, std::vector& buffer, int& position, @@ -2757,13 +2671,6 @@ void pack(const GasPvtMultiplexer& data, } } -template void pack(const GasPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); -template void pack(const GasPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const DryGasPvt& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -2774,10 +2681,6 @@ void pack(const DryGasPvt& data, std::vector& buffer, int& positio pack(data.inverseGasBMu(), buffer, position, comm); } -template void pack(const DryGasPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const GasPvtThermal& data, std::vector& buffer, int& position, @@ -2796,10 +2699,6 @@ void pack(const GasPvtThermal& data, pack(*data.isoThermalPvt(), buffer, position, comm); } -template void pack(const GasPvtThermal& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const WetGasPvt& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -2816,10 +2715,6 @@ void pack(const WetGasPvt& data, std::vector& buffer, int& positio pack(data.vapPar1(), buffer, position, comm); } -template void pack(const WetGasPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const OilPvtMultiplexer& data, std::vector& buffer, int& position, @@ -2843,13 +2738,6 @@ void pack(const OilPvtMultiplexer& data, } } -template void pack(const OilPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); -template void pack(const OilPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const ConstantCompressibilityOilPvt& data, std::vector& buffer, int& position, @@ -2863,10 +2751,6 @@ void pack(const ConstantCompressibilityOilPvt& data, pack(data.oilViscosibility(), buffer, position, comm); } -template void pack(const ConstantCompressibilityOilPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const DeadOilPvt& data, std::vector& buffer, int& position, @@ -2878,10 +2762,6 @@ void pack(const DeadOilPvt& data, pack(data.inverseOilBMu(), buffer, position, comm); } -template void pack(const DeadOilPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const LiveOilPvt& data, std::vector& buffer, int& position, @@ -2900,10 +2780,6 @@ void pack(const LiveOilPvt& data, pack(data.vapPar2(), buffer, position, comm); } -template void pack(const LiveOilPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const OilPvtThermal& data, std::vector& buffer, int& position, @@ -2925,10 +2801,6 @@ void pack(const OilPvtThermal& data, pack(*data.isoThermalPvt(), buffer, position, comm); } -template void pack(const OilPvtThermal& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const WaterPvtMultiplexer& data, std::vector& buffer, int& position, @@ -2946,13 +2818,6 @@ void pack(const WaterPvtMultiplexer& data, } } -template void pack(const WaterPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); -template void pack(const WaterPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const ConstantCompressibilityWaterPvt& data, std::vector& buffer, int& position, @@ -2966,10 +2831,6 @@ void pack(const ConstantCompressibilityWaterPvt& data, pack(data.waterViscosibility(), buffer, position, comm); } -template void pack(const ConstantCompressibilityWaterPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void pack(const WaterPvtThermal& data, std::vector& buffer, int& position, @@ -2999,10 +2860,6 @@ void pack(const WaterPvtThermal& data, } } -template void pack(const WaterPvtThermal& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - void pack(const OilVaporizationProperties& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4856,9 +4713,6 @@ void unpack(Tabulated1DFunction& data, std::vector& buffer, data = Tabulated1DFunction(xValues, yValues, false); } -template void unpack(Tabulated1DFunction& data, std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - template void unpack(IntervalTabulated2DFunction& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4875,18 +4729,6 @@ void unpack(IntervalTabulated2DFunction& data, std::vector& buffer xExtrapolate, yExtrapolate); } -template void unpack(IntervalTabulated2DFunction& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - -template void unpack(std::vector>& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - -template void unpack(std::map>& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - template void unpack(UniformXTabulated2DFunction& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4902,10 +4744,6 @@ void unpack(UniformXTabulated2DFunction& data, std::vector& buffer interpolationGuide); } -template void unpack(UniformXTabulated2DFunction& data, - std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - template void unpack(SolventPvt& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4922,10 +4760,6 @@ void unpack(SolventPvt& data, std::vector& buffer, int& position, solventMu, inverseSolventBMu); } -template void unpack(SolventPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(GasPvtMultiplexer& data, std::vector& buffer, int& position, @@ -4951,13 +4785,6 @@ void unpack(GasPvtMultiplexer& data, data = GasPvtMultiplexer(approach, pvt); } -template void unpack(GasPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); -template void unpack(GasPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(DryGasPvt& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4974,10 +4801,6 @@ void unpack(DryGasPvt& data, std::vector& buffer, int& position, gasMu, inverseGasBMu); } -template void unpack(DryGasPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(GasPvtThermal& data, std::vector& buffer, int& position, @@ -5010,10 +4833,6 @@ void unpack(GasPvtThermal& data, enableInternalEnergy); } -template void unpack(GasPvtThermal& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(WetGasPvt& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -5043,10 +4862,6 @@ void unpack(WetGasPvt& data, std::vector& buffer, int& position, saturationPressure, vapPar1); } -template void unpack(WetGasPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(OilPvtMultiplexer& data, std::vector& buffer, int& position, @@ -5076,13 +4891,6 @@ void unpack(OilPvtMultiplexer& data, data = OilPvtMultiplexer(approach, pvt); } -template void unpack(OilPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); -template void unpack(OilPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(ConstantCompressibilityOilPvt& data, std::vector& buffer, int& position, @@ -5106,10 +4914,6 @@ void unpack(ConstantCompressibilityOilPvt& data, oilViscosibility); } -template void unpack(ConstantCompressibilityOilPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(DeadOilPvt& data, std::vector& buffer, int& position, @@ -5127,10 +4931,6 @@ void unpack(DeadOilPvt& data, oilMu, inverseOilBMu); } -template void unpack(DeadOilPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(LiveOilPvt& data, std::vector& buffer, int& position, @@ -5169,10 +4969,6 @@ void unpack(LiveOilPvt& data, vapPar2); } -template void unpack(LiveOilPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(OilPvtThermal& data, std::vector& buffer, int& position, @@ -5210,10 +5006,6 @@ void unpack(OilPvtThermal& data, enableInternalEnergy); } -template void unpack(OilPvtThermal& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(WaterPvtMultiplexer& data, std::vector& buffer, int& position, @@ -5235,13 +5027,6 @@ void unpack(WaterPvtMultiplexer& data, data = WaterPvtMultiplexer(approach, pvt); } -template void unpack(WaterPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); -template void unpack(WaterPvtMultiplexer& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(ConstantCompressibilityWaterPvt& data, std::vector& buffer, int& position, @@ -5265,10 +5050,6 @@ void unpack(ConstantCompressibilityWaterPvt& data, waterViscosibility); } -template void unpack(ConstantCompressibilityWaterPvt& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(WaterPvtThermal& data, std::vector& buffer, int& position, @@ -5318,10 +5099,6 @@ void unpack(WaterPvtThermal& data, enableInternalEnergy); } -template void unpack(WaterPvtThermal& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - void unpack(OilVaporizationProperties& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -6840,9 +6617,10 @@ INSTANTIATE_PACK_VECTOR(std::vector) INSTANTIATE_PACK_VECTOR(bool) INSTANTIATE_PACK_VECTOR(char) INSTANTIATE_PACK_VECTOR(int) -INSTANTIATE_PACK_VECTOR(Opm::Tabulated1DFunction) +INSTANTIATE_PACK_VECTOR(Tabulated1DFunction) INSTANTIATE_PACK_VECTOR(std::array) INSTANTIATE_PACK_VECTOR(EclEpsScalingPointsInfo) +INSTANTIATE_PACK_VECTOR(IntervalTabulated2DFunction) #undef INSTANTIATE_PACK_VECTOR #define INSTANTIATE_PACK_SHARED_PTR(...) \ @@ -6881,6 +6659,27 @@ INSTANTIATE_PACK(unsigned char) INSTANTIATE_PACK(EclEpsScalingPointsInfo) INSTANTIATE_PACK(EclTwoPhaseApproach) INSTANTIATE_PACK(EclMultiplexerApproach) +INSTANTIATE_PACK(Tabulated1DFunction) +INSTANTIATE_PACK(IntervalTabulated2DFunction) +INSTANTIATE_PACK(UniformXTabulated2DFunction) +INSTANTIATE_PACK(std::map>) +INSTANTIATE_PACK(SolventPvt) +INSTANTIATE_PACK(GasPvtMultiplexer) +INSTANTIATE_PACK(GasPvtMultiplexer) +INSTANTIATE_PACK(DryGasPvt) +INSTANTIATE_PACK(GasPvtThermal) +INSTANTIATE_PACK(WetGasPvt) +INSTANTIATE_PACK(OilPvtMultiplexer) +INSTANTIATE_PACK(OilPvtMultiplexer) +INSTANTIATE_PACK(ConstantCompressibilityOilPvt) +INSTANTIATE_PACK(DeadOilPvt) +INSTANTIATE_PACK(LiveOilPvt) +INSTANTIATE_PACK(OilPvtThermal) +INSTANTIATE_PACK(WaterPvtMultiplexer) +INSTANTIATE_PACK(WaterPvtMultiplexer) +INSTANTIATE_PACK(ConstantCompressibilityWaterPvt) +INSTANTIATE_PACK(WaterPvtThermal) + #undef INSTANTIATE_PACK } // end namespace Mpi diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index b82b3140a..01730eb28 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -496,13 +496,17 @@ std::tuple PackUnpack(const T& in) } +#define DO_CHECKS(TYPE_NAME) \ + BOOST_CHECK_MESSAGE(std::get<1>(val2) == std::get<2>(val2), "Packed size differ from unpack size for " #TYPE_NAME); \ + BOOST_CHECK_MESSAGE(val1 == std::get<0>(val2), "Deserialized " #TYPE_NAME " differ"); + + BOOST_AUTO_TEST_CASE(Solution) { #if HAVE_MPI - Opm::data::Solution sol1 = getSolution(); - auto sol2 = PackUnpack(sol1); - BOOST_CHECK(std::get<1>(sol2) == std::get<2>(sol2)); - BOOST_CHECK(sol1 == std::get<0>(sol2)); + Opm::data::Solution val1 = getSolution(); + auto val2 = PackUnpack(val1); + DO_CHECKS(data::Solution) #endif } @@ -510,10 +514,9 @@ BOOST_AUTO_TEST_CASE(Solution) BOOST_AUTO_TEST_CASE(Rates) { #if HAVE_MPI - Opm::data::Rates rat1 = getRates(); - auto rat2 = PackUnpack(rat1); - BOOST_CHECK(std::get<1>(rat2) == std::get<2>(rat2)); - BOOST_CHECK(rat1 == std::get<0>(rat2)); + Opm::data::Rates val1 = getRates(); + auto val2 = PackUnpack(val1); + DO_CHECKS(data::Rates) #endif } @@ -521,10 +524,9 @@ BOOST_AUTO_TEST_CASE(Rates) BOOST_AUTO_TEST_CASE(dataConnection) { #if HAVE_MPI - Opm::data::Connection con1 = getConnection(); - auto con2 = PackUnpack(con1); - BOOST_CHECK(std::get<1>(con2) == std::get<2>(con2)); - BOOST_CHECK(con1 == std::get<0>(con2)); + Opm::data::Connection val1 = getConnection(); + auto val2 = PackUnpack(val1); + DO_CHECKS(data::Connection) #endif } @@ -532,10 +534,9 @@ BOOST_AUTO_TEST_CASE(dataConnection) BOOST_AUTO_TEST_CASE(dataSegment) { #if HAVE_MPI - Opm::data::Segment seg1 = getSegment(); - auto seg2 = PackUnpack(seg1); - BOOST_CHECK(std::get<1>(seg2) == std::get<2>(seg2)); - BOOST_CHECK(seg1 == std::get<0>(seg2)); + Opm::data::Segment val1 = getSegment(); + auto val2 = PackUnpack(val1); + DO_CHECKS(data::Segment) #endif } @@ -543,10 +544,9 @@ BOOST_AUTO_TEST_CASE(dataSegment) BOOST_AUTO_TEST_CASE(dataWell) { #if HAVE_MPI - Opm::data::Well well1 = getWell(); - auto well2 = PackUnpack(well1); - BOOST_CHECK(std::get<1>(well2) == std::get<2>(well2)); - BOOST_CHECK(well1 == std::get<0>(well2)); + Opm::data::Well val1 = getWell(); + auto val2 = PackUnpack(val1); + DO_CHECKS(data::Well) #endif } @@ -554,11 +554,10 @@ BOOST_AUTO_TEST_CASE(dataWell) BOOST_AUTO_TEST_CASE(WellRates) { #if HAVE_MPI - Opm::data::WellRates wells1; - wells1.insert({"test_well", getWell()}); - auto wells2 = PackUnpack(wells1); - BOOST_CHECK(std::get<1>(wells2) == std::get<2>(wells2)); - BOOST_CHECK(wells1 == std::get<0>(wells2)); + Opm::data::WellRates val1; + val1.insert({"test_well", getWell()}); + auto val2 = PackUnpack(val1); + DO_CHECKS(data::WellRates) #endif } @@ -566,13 +565,12 @@ BOOST_AUTO_TEST_CASE(WellRates) BOOST_AUTO_TEST_CASE(CellData) { #if HAVE_MPI - Opm::data::CellData data1; - data1.dim = Opm::UnitSystem::measure::length; - data1.data = {1.0, 2.0, 3.0}; - data1.target = Opm::data::TargetType::RESTART_SOLUTION; - auto data2 = PackUnpack(data1); - BOOST_CHECK(std::get<1>(data2) == std::get<2>(data2)); - BOOST_CHECK(data1 == std::get<0>(data2)); + Opm::data::CellData val1; + val1.dim = Opm::UnitSystem::measure::length; + val1.data = {1.0, 2.0, 3.0}; + val1.target = Opm::data::TargetType::RESTART_SOLUTION; + auto val2 = PackUnpack(val1); + DO_CHECKS(data::cellData) #endif } @@ -580,10 +578,9 @@ BOOST_AUTO_TEST_CASE(CellData) BOOST_AUTO_TEST_CASE(RestartKey) { #if HAVE_MPI - Opm::RestartKey key1("key", Opm::UnitSystem::measure::length, true); - auto key2 = PackUnpack(key1); - BOOST_CHECK(std::get<1>(key2) == std::get<2>(key2)); - BOOST_CHECK(key1 == std::get<0>(key2)); + Opm::RestartKey val1("key", Opm::UnitSystem::measure::length, true); + auto val2 = PackUnpack(val1); + DO_CHECKS(RestartKey) #endif } @@ -595,8 +592,7 @@ BOOST_AUTO_TEST_CASE(RestartValue) wells1.insert({"test_well", getWell()}); Opm::RestartValue val1(getSolution(), wells1); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(RestartValue) #endif } @@ -606,8 +602,7 @@ BOOST_AUTO_TEST_CASE(ThresholdPressure) #if HAVE_MPI Opm::ThresholdPressure val1 = getThresholdPressure(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(ThresholdPressure) #endif } @@ -616,8 +611,7 @@ 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)); + DO_CHECKS(RockConfig) #endif } @@ -627,8 +621,7 @@ BOOST_AUTO_TEST_CASE(EDITNNC) #if HAVE_MPI Opm::EDITNNC val1({{1,2,1.0},{2,3,2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(EDITNNC) #endif } @@ -638,8 +631,7 @@ BOOST_AUTO_TEST_CASE(NNC) #if HAVE_MPI Opm::NNC val1({{1,2,1.0},{2,3,2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(NNC) #endif } @@ -649,8 +641,7 @@ BOOST_AUTO_TEST_CASE(Rock2dTable) #if HAVE_MPI Opm::Rock2dTable val1({{1.0,2.0},{3.0,4.0}}, {1.0, 2.0, 3.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Rock2dTable) #endif } @@ -660,8 +651,7 @@ BOOST_AUTO_TEST_CASE(Rock2dtrTable) #if HAVE_MPI Opm::Rock2dtrTable val1({{1.0,2.0},{3.0,4.0}}, {1.0, 2.0, 3.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Rock2dtrTable) #endif } @@ -672,12 +662,10 @@ BOOST_AUTO_TEST_CASE(ColumnSchema) Opm::ColumnSchema val1("test1", Opm::Table::INCREASING, Opm::Table::DEFAULT_LINEAR); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); - Opm::ColumnSchema val3("test2", Opm::Table::DECREASING, 1.0); - val2 = PackUnpack(val3); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val3 == std::get<0>(val2)); + DO_CHECKS(ColumnSchema) + val1 = Opm::ColumnSchema("test2", Opm::Table::DECREASING, 1.0); + val2 = PackUnpack(val1); + DO_CHECKS(ColumnSchema) #endif } @@ -687,8 +675,7 @@ BOOST_AUTO_TEST_CASE(TableSchema) #if HAVE_MPI Opm::TableSchema val1 = getTableSchema(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(TableSchema) #endif } @@ -698,8 +685,7 @@ BOOST_AUTO_TEST_CASE(TableColumn) #if HAVE_MPI Opm::TableColumn val1 = getTableColumn(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(TableColumn) #endif } @@ -709,8 +695,7 @@ BOOST_AUTO_TEST_CASE(SimpleTable) #if HAVE_MPI Opm::SimpleTable val1 = getSimpleTable(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(SimpleTable) #endif } @@ -725,8 +710,7 @@ BOOST_AUTO_TEST_CASE(TableContainer) val1.addTable(0, std::make_shared(tab1)); val1.addTable(1, std::make_shared(tab1)); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(TableContainer) #endif } @@ -736,8 +720,7 @@ BOOST_AUTO_TEST_CASE(EquilRecord) #if HAVE_MPI Opm::EquilRecord val1 = getEquilRecord(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(EquilRecord) #endif } @@ -747,8 +730,7 @@ BOOST_AUTO_TEST_CASE(Equil) #if HAVE_MPI Opm::Equil val1({getEquilRecord(), getEquilRecord()}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Equil) #endif } @@ -758,8 +740,7 @@ BOOST_AUTO_TEST_CASE(FoamData) #if HAVE_MPI Opm::FoamData val1 = getFoamData(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(FoamData) #endif } @@ -769,8 +750,7 @@ BOOST_AUTO_TEST_CASE(FoamConfig) #if HAVE_MPI Opm::FoamConfig val1({getFoamData(), getFoamData()}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(FoamConfig) #endif } @@ -782,8 +762,7 @@ BOOST_AUTO_TEST_CASE(InitConfig) Opm::FoamConfig({getFoamData(), getFoamData()}), true, true, true, 20, "test1"); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(InitConfig) #endif } @@ -793,8 +772,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfig) #if HAVE_MPI 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)); + DO_CHECKS(SimulationConfig) #endif } @@ -804,8 +782,7 @@ BOOST_AUTO_TEST_CASE(BCConfig) #if HAVE_MPI Opm::BCConfig val1({{10,11,12,13,14,15,Opm::BCType::RATE, Opm::FaceDir::XPlus, Opm::BCComponent::GAS, 100}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(BCConfig) #endif } @@ -815,8 +792,7 @@ BOOST_AUTO_TEST_CASE(RestartSchedule) #if HAVE_MPI Opm::RestartSchedule val1(1, 2, 3); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(RestartSchedule) #endif } @@ -827,8 +803,7 @@ BOOST_AUTO_TEST_CASE(TimeMap) #if HAVE_MPI Opm::TimeMap val1 = getTimeMap(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(TimeMap) #endif } @@ -842,8 +817,7 @@ BOOST_AUTO_TEST_CASE(RestartConfig) "test2", true, "test3", false); Opm::RestartConfig val1(io, getTimeMap(), 1, true, rsched, rkw, {false, true}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(RestartConfig) #endif } @@ -854,8 +828,7 @@ BOOST_AUTO_TEST_CASE(IOConfig) Opm::IOConfig val1(true, false, true, false, false, true, "test1", true, "test2", true, "test3", false); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(IOConfig) #endif } @@ -865,8 +838,7 @@ BOOST_AUTO_TEST_CASE(Phases) #if HAVE_MPI Opm::Phases val1(true, true, true, false, true, false, true, false); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Phases) #endif } @@ -876,8 +848,7 @@ BOOST_AUTO_TEST_CASE(Tabdims) #if HAVE_MPI Opm::Tabdims val1(1,2,3,4,5,6); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Tabdims) #endif } @@ -887,8 +858,7 @@ BOOST_AUTO_TEST_CASE(EndpointScaling) #if HAVE_MPI Opm::EndpointScaling val1(std::bitset<4>(13)); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(EndpointScaling) #endif } @@ -898,8 +868,7 @@ BOOST_AUTO_TEST_CASE(Welldims) #if HAVE_MPI Opm::Welldims val1(1,2,3,4); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Welldims) #endif } @@ -909,8 +878,7 @@ BOOST_AUTO_TEST_CASE(WellSegmentDims) #if HAVE_MPI Opm::WellSegmentDims val1(1,2,3); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellSegmentDims) #endif } @@ -920,8 +888,7 @@ BOOST_AUTO_TEST_CASE(UDQParams) #if HAVE_MPI Opm::UDQParams val1(true, 1, 2.0, 3.0, 4.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQParams) #endif } @@ -931,8 +898,7 @@ BOOST_AUTO_TEST_CASE(EclHysterConfig) #if HAVE_MPI Opm::EclHysterConfig val1(true, 1, 2); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(EclHysterConfig) #endif } @@ -942,8 +908,7 @@ BOOST_AUTO_TEST_CASE(Actdims) #if HAVE_MPI Opm::Actdims val1(1,2,3,4); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Actdims) #endif } @@ -962,8 +927,7 @@ BOOST_AUTO_TEST_CASE(Runspec) Opm::SatFuncControls(5.0e-7)); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Runspec) #endif } @@ -973,8 +937,7 @@ BOOST_AUTO_TEST_CASE(PvtgTable) #if HAVE_MPI Opm::PvtgTable val1 = getPvtgTable(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PvtgTable) #endif } @@ -984,8 +947,7 @@ BOOST_AUTO_TEST_CASE(PvtoTable) #if HAVE_MPI Opm::PvtoTable val1 = getPvtoTable(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PvtoTable) #endif } @@ -996,8 +958,7 @@ BOOST_AUTO_TEST_CASE(JFunc) Opm::JFunc val1(Opm::JFunc::Flag::BOTH, 1.0, 2.0, 3.0, 4.0, Opm::JFunc::Direction::XY); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(JFunc) #endif } @@ -1007,8 +968,7 @@ BOOST_AUTO_TEST_CASE(PVTWRecord) #if HAVE_MPI Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PVTWRecord) #endif } @@ -1018,8 +978,7 @@ BOOST_AUTO_TEST_CASE(PvtwTable) #if HAVE_MPI Opm::PvtwTable val1({Opm::PVTWRecord{1.0, 2.0, 3.0, 4.0, 5.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PvtwTable) #endif } @@ -1029,8 +988,7 @@ BOOST_AUTO_TEST_CASE(PVCDORecord) #if HAVE_MPI Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PVTWRecord) #endif } @@ -1040,8 +998,7 @@ BOOST_AUTO_TEST_CASE(PvcdoTable) #if HAVE_MPI Opm::PvcdoTable val1({Opm::PVCDORecord{1.0, 2.0, 3.0, 4.0, 5.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PvcdoTable) #endif } @@ -1051,8 +1008,7 @@ BOOST_AUTO_TEST_CASE(DENSITYRecord) #if HAVE_MPI Opm::DENSITYRecord val1{1.0, 2.0, 3.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(DENSITYRecord) #endif } @@ -1062,8 +1018,7 @@ BOOST_AUTO_TEST_CASE(DensityTable) #if HAVE_MPI Opm::DensityTable val1({Opm::DENSITYRecord{1.0, 2.0, 3.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(DensityTable) #endif } @@ -1073,8 +1028,7 @@ BOOST_AUTO_TEST_CASE(VISCREFRecord) #if HAVE_MPI Opm::VISCREFRecord val1{1.0, 2.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(VISCREFRecord) #endif } @@ -1084,8 +1038,7 @@ BOOST_AUTO_TEST_CASE(ViscrefTable) #if HAVE_MPI Opm::ViscrefTable val1({Opm::VISCREFRecord{1.0, 2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(ViscrefTable) #endif } @@ -1095,8 +1048,7 @@ BOOST_AUTO_TEST_CASE(WATDENTRecord) #if HAVE_MPI Opm::WATDENTRecord val1{1.0, 2.0, 3.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WATDENTRecord) #endif } @@ -1106,8 +1058,7 @@ BOOST_AUTO_TEST_CASE(WatdentTable) #if HAVE_MPI Opm::WatdentTable val1({Opm::WATDENTRecord{1.0, 2.0, 3.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WatdentTable) #endif } @@ -1117,8 +1068,7 @@ BOOST_AUTO_TEST_CASE(PlymwinjTable) #if HAVE_MPI Opm::PlymwinjTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PlymwinjTable) #endif } @@ -1128,8 +1078,7 @@ BOOST_AUTO_TEST_CASE(SkprpolyTable) #if HAVE_MPI Opm::SkprpolyTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}, 3.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(SkprpolyTable) #endif } @@ -1139,8 +1088,7 @@ BOOST_AUTO_TEST_CASE(SkprwatTable) #if HAVE_MPI Opm::SkprwatTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(SkprwatTable) #endif } @@ -1150,8 +1098,7 @@ BOOST_AUTO_TEST_CASE(Regdims) #if HAVE_MPI Opm::Regdims val1(1,2,3,4,5); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Regdims) #endif } @@ -1161,8 +1108,7 @@ BOOST_AUTO_TEST_CASE(Eqldims) #if HAVE_MPI Opm::Eqldims val1(1,2,3,4,5); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Eqldims) #endif } @@ -1172,8 +1118,7 @@ BOOST_AUTO_TEST_CASE(Aqudims) #if HAVE_MPI Opm::Aqudims val1(1,2,3,4,5,6,7,8); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Aqudims) #endif } @@ -1183,8 +1128,7 @@ BOOST_AUTO_TEST_CASE(ROCKRecord) #if HAVE_MPI Opm::ROCKRecord val1{1.0,2.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(ROCKRecord) #endif } @@ -1194,8 +1138,7 @@ BOOST_AUTO_TEST_CASE(RockTable) #if HAVE_MPI Opm::RockTable val1({Opm::ROCKRecord{1.0,2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(RockTable) #endif } @@ -1232,8 +1175,7 @@ BOOST_AUTO_TEST_CASE(TableManager) jfunc, 1.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(TableManager) #endif } @@ -1244,8 +1186,7 @@ BOOST_AUTO_TEST_CASE(TabulatedOneDFunction) Opm::Tabulated1DFunction val1(2, std::vector{1.0, 2.0}, std::vector{3.0, 4.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Tabulated1DFunction) #endif } @@ -1258,8 +1199,7 @@ BOOST_AUTO_TEST_CASE(IntervalTabulatedTwoDFunction) std::vector> samples{{1.0, 2.0}, {3.0, 4.0}}; Opm::IntervalTabulated2DFunction val1(xPos, yPos, samples, true, true); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(IntervalTabulated2DFunction) #endif } @@ -1275,8 +1215,7 @@ BOOST_AUTO_TEST_CASE(UniformXTabulatedTwoDFunction) using FFuncType = Opm::UniformXTabulated2DFunction; FFuncType val1(xPos, yPos, samples, FFuncType::Vertical); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UniformXTabulated2DFunction) #endif } @@ -1288,8 +1227,7 @@ BOOST_AUTO_TEST_CASE(SolventPvt) std::vector{3.0, 4.0}); Opm::SolventPvt val1({1.0, 2.0}, {func}, {func}, {func}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(SolventPvt) #endif } @@ -1301,8 +1239,7 @@ BOOST_AUTO_TEST_CASE(DryGasPvt) std::vector{3.0, 4.0}); Opm::DryGasPvt val1({1.0, 2.0}, {func}, {func}, {func}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(DryGasPvt) #endif } @@ -1316,8 +1253,7 @@ BOOST_AUTO_TEST_CASE(GasPvtThermal) Opm::GasPvtThermal val1(pvt, {func}, {1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}, {func}, true, true, false); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GasPvtThermal) #endif } @@ -1337,8 +1273,7 @@ BOOST_AUTO_TEST_CASE(WetGasPvt) {func2}, {func}, {func2}, {func2}, {func}, {func}, {func}, 5.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WetGasPvt) #endif } @@ -1349,8 +1284,7 @@ BOOST_AUTO_TEST_CASE(ConstantCompressibilityOilPvt) Opm::ConstantCompressibilityOilPvt val1({1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}, {7.0, 8.0}, {9.0, 10.0}, {11.0, 12.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(ConstantCompressibilityOilPvt) #endif } @@ -1362,8 +1296,7 @@ BOOST_AUTO_TEST_CASE(DeadOilPvt) std::vector{3.0, 4.0}); Opm::DeadOilPvt val1({1.0, 2.0}, {func}, {func}, {func}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(DeadOilPvt) #endif } @@ -1383,8 +1316,7 @@ BOOST_AUTO_TEST_CASE(LiveOilPvt) {func2}, {func2}, {func2}, {func}, {func}, {func}, {func}, {func}, 5.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(LiveOilPvt) #endif } @@ -1399,8 +1331,7 @@ BOOST_AUTO_TEST_CASE(OilPvtThermal) {7.0, 8.0}, {9.0, 10.0}, {11.0, 12.0}, {func}, true, true, false); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(OilPvtThermal) #endif } @@ -1411,8 +1342,7 @@ BOOST_AUTO_TEST_CASE(ConstantCompressibilityWaterPvt) Opm::ConstantCompressibilityWaterPvt val1({1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}, {7.0, 8.0}, {9.0, 10.0}, {11.0, 12.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(ConstantCompressibilityWaterPvt) #endif } @@ -1428,8 +1358,7 @@ BOOST_AUTO_TEST_CASE(WaterPvtThermal) {13.0, 14.0}, {15.0, 16.0}, {17.0, 18.0}, {func}, {func}, true, true, false); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WaterPvtThermal) #endif } @@ -1442,14 +1371,12 @@ BOOST_AUTO_TEST_CASE(OilVaporizationProperties) {1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}, {false, true}, {7.0, 8.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(OilVaporizationProperties) val1 = Opm::OilVaporizationProperties(VapType::DRDT, {1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}, {false, true}, {7.0, 8.0}); val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(OilVaporizationProperties) #endif } @@ -1459,8 +1386,7 @@ BOOST_AUTO_TEST_CASE(Events) #ifdef HAVE_MPI Opm::Events val1(Opm::DynamicVector({1,2,3,4,5})); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Events) #endif } @@ -1470,8 +1396,7 @@ BOOST_AUTO_TEST_CASE(MLimits) #ifdef HAVE_MPI Opm::MLimits val1{1,2,3,4,5,6,7,8,9,10,11,12}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(MLimits) #endif } @@ -1482,8 +1407,7 @@ BOOST_AUTO_TEST_CASE(MessageLimits) std::vector limits{Opm::MLimits{1,2,3,4,5,6,7,8,9,10,11,12}}; Opm::MessageLimits val1(Opm::DynamicState(limits,2)); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(MessageLimits) #endif } @@ -1493,8 +1417,7 @@ BOOST_AUTO_TEST_CASE(VFPInjTable) #ifdef HAVE_MPI Opm::VFPInjTable val1 = getVFPInjTable(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(VFPInjTable) #endif } @@ -1504,8 +1427,7 @@ BOOST_AUTO_TEST_CASE(VFPProdTable) #ifdef HAVE_MPI Opm::VFPProdTable val1 = getVFPProdTable(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(VFPProdTable) #endif } @@ -1516,8 +1438,7 @@ BOOST_AUTO_TEST_CASE(WTESTWell) Opm::WellTestConfig::WTESTWell val1{"test", Opm::WellTestConfig::ECONOMIC, 1.0, 2, 3.0, 4}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellTestConfig::WTESTWell) #endif } @@ -1529,8 +1450,7 @@ BOOST_AUTO_TEST_CASE(WellTestConfig) 1.0, 2, 3.0, 4}; Opm::WellTestConfig val1({tw, tw, tw}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellTestConfig) #endif } @@ -1540,8 +1460,7 @@ BOOST_AUTO_TEST_CASE(WellPolymerProperties) #ifdef HAVE_MPI Opm::WellPolymerProperties val1{1.0, 2.0, 3, 4, 5}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellPolymerProperties) #endif } @@ -1551,8 +1470,7 @@ BOOST_AUTO_TEST_CASE(WellFoamProperties) #ifdef HAVE_MPI Opm::WellFoamProperties val1{1.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellFoamProperties) #endif } @@ -1562,8 +1480,7 @@ BOOST_AUTO_TEST_CASE(WellTracerProperties) #ifdef HAVE_MPI Opm::WellTracerProperties val1({{"test", 1.0}, {"test2", 2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellTracerProperties) #endif } @@ -1573,12 +1490,10 @@ BOOST_AUTO_TEST_CASE(UDAValue) #ifdef HAVE_MPI Opm::UDAValue val1("test"); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDAValue) val1 = Opm::UDAValue(1.0); - auto val22 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val22) == std::get<2>(val22)); - BOOST_CHECK(val1 == std::get<0>(val22)); + val2 = PackUnpack(val1); + DO_CHECKS(UDAValue) #endif } @@ -1593,8 +1508,7 @@ BOOST_AUTO_TEST_CASE(Connection) 12, 13.0, 14.0, true, 15, 16, 17.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Connection) #endif } @@ -1615,8 +1529,7 @@ BOOST_AUTO_TEST_CASE(WellInjectionProperties) Opm::Well::InjectorType::OIL, Opm::Well::InjectorCMode::BHP); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Well::WellInjectionProperties) #endif } @@ -1632,8 +1545,7 @@ BOOST_AUTO_TEST_CASE(WellEconProductionLimits) Opm::WellEconProductionLimits::EconWorkover::WELL, 7.0, 8.0, 9.0, 10.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellEconProductionLimits) #endif } @@ -1643,8 +1555,7 @@ BOOST_AUTO_TEST_CASE(WellGuideRate) #ifdef HAVE_MPI Opm::Well::WellGuideRate val1{true, 1.0, Opm::Well::GuideRateTarget::COMB, 2.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Well::WellGuideRate) #endif } @@ -1660,8 +1571,7 @@ BOOST_AUTO_TEST_CASE(WellConnections) 15, 16, 17.0); Opm::WellConnections val1(1, 2, 3, {conn, conn}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellConnections) #endif } @@ -1685,8 +1595,7 @@ BOOST_AUTO_TEST_CASE(WellProductionProperties) Opm::Well::ProducerCMode::CRAT, Opm::Well::ProducerCMode::BHP, 11); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Well::WellProductionProperties) #endif } @@ -1697,8 +1606,7 @@ BOOST_AUTO_TEST_CASE(SpiralICD) Opm::SpiralICD val1(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8, 9.0, Opm::SpiralICD::Status::OPEN, 10.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(SpiralICD) #endif } @@ -1708,8 +1616,7 @@ BOOST_AUTO_TEST_CASE(Valve) #ifdef HAVE_MPI Opm::Valve val1(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, Opm::Valve::Status::OPEN); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Valve) #endif } @@ -1722,8 +1629,7 @@ BOOST_AUTO_TEST_CASE(Segment) std::make_shared(), std::make_shared()); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Segment) #endif } @@ -1733,8 +1639,7 @@ BOOST_AUTO_TEST_CASE(Dimension) #ifdef HAVE_MPI Opm::Dimension val1("test", 1.0, 2.0); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Dimension) #endif } @@ -1744,8 +1649,7 @@ BOOST_AUTO_TEST_CASE(UnitSystem) #ifdef HAVE_MPI Opm::UnitSystem val1(Opm::UnitSystem::UnitType::UNIT_TYPE_METRIC); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UnitSystem) #endif } @@ -1764,8 +1668,7 @@ BOOST_AUTO_TEST_CASE(WellSegments) {seg, seg}, {{1,2},{3,4}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellSegments) #endif } @@ -1775,8 +1678,7 @@ BOOST_AUTO_TEST_CASE(Well) #ifdef HAVE_MPI Opm::Well val1 = getFullWell(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Well) #endif } @@ -1793,8 +1695,7 @@ BOOST_AUTO_TEST_CASE(GroupInjectionProperties) "test1", "test2", 5}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Group::GroupInjectionProperties) #endif } @@ -1812,8 +1713,7 @@ BOOST_AUTO_TEST_CASE(GroupProductionProperties) 6.0, 7}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Group::GroupProductionProperties) #endif } @@ -1831,8 +1731,7 @@ BOOST_AUTO_TEST_CASE(Group) Opm::Group::GroupProductionProperties()); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Group) #endif } @@ -1842,8 +1741,7 @@ BOOST_AUTO_TEST_CASE(WList) #ifdef HAVE_MPI Opm::WList val1({"test1", "test2", "test3"}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WList) #endif } @@ -1855,8 +1753,7 @@ BOOST_AUTO_TEST_CASE(WListManager) std::map data{{"test", wl}, {"test2", wl}}; Opm::WListManager val1(data); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WListManager) #endif } @@ -1866,8 +1763,7 @@ BOOST_AUTO_TEST_CASE(UDQFunction) #ifdef HAVE_MPI Opm::UDQFunction val1("test", Opm::UDQTokenType::binary_op_add); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQFunction) #endif } @@ -1879,8 +1775,7 @@ BOOST_AUTO_TEST_CASE(UDQFunctionTable) std::make_shared()}}; Opm::UDQFunctionTable val1(Opm::UDQParams(true, 1, 2.0, 3.0, 4.0), map); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQFunctionTable) #endif } @@ -1897,8 +1792,7 @@ BOOST_AUTO_TEST_CASE(UDQASTNode) Opm::UDQTokenType::error, "test", 1.0, {"test3"}, n1, n1); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQASTNode) #endif } @@ -1912,8 +1806,7 @@ BOOST_AUTO_TEST_CASE(UDQDefine) Opm::UDQDefine val1("test", std::make_shared(n1), Opm::UDQVarType::NONE, "test2"); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQDefine) #endif } @@ -1925,8 +1818,7 @@ BOOST_AUTO_TEST_CASE(UDQAssign) {Opm::UDQAssign::AssignRecord{{"test1"}, 1.0}, Opm::UDQAssign::AssignRecord{{"test2"}, 2.0}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQAssign) #endif } @@ -1936,8 +1828,7 @@ BOOST_AUTO_TEST_CASE(UDQIndex) #ifdef HAVE_MPI Opm::UDQIndex val1(1, 2, Opm::UDQAction::ASSIGN, Opm::UDQVarType::WELL_VAR); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQIndex) #endif } @@ -1947,8 +1838,7 @@ BOOST_AUTO_TEST_CASE(UDQConfig) #ifdef HAVE_MPI Opm::UDQConfig val1 = getUDQConfig(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQConfig) #endif } @@ -1959,8 +1849,7 @@ BOOST_AUTO_TEST_CASE(UDQActiveInputRecord) Opm::UDQActive::InputRecord val1(1, "test1", "test2", Opm::UDAControl::WCONPROD_ORAT); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQActive::InputRecord) #endif } @@ -1971,8 +1860,7 @@ BOOST_AUTO_TEST_CASE(UDQActiveRecord) Opm::UDQActive::Record val1("test1", 1, 2, "test2", Opm::UDAControl::WCONPROD_ORAT); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQActive::Record) #endif } @@ -1986,8 +1874,7 @@ BOOST_AUTO_TEST_CASE(UDQActive) Opm::UDAControl::WCONPROD_ORAT)}, {{"test1", 1}}, {{"test2", 2}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(UDQActive) #endif } @@ -1997,8 +1884,7 @@ BOOST_AUTO_TEST_CASE(GuideRateModel) #ifdef HAVE_MPI Opm::GuideRateModel val1 = getGuideRateModel(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GuideRateModel) #endif } @@ -2008,8 +1894,7 @@ BOOST_AUTO_TEST_CASE(GuideRateConfigGroup) #ifdef HAVE_MPI Opm::GuideRateConfig::GroupTarget val1 = getGuideRateConfigGroup(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GuideRateConfig::GroupTarget) #endif } @@ -2019,8 +1904,7 @@ BOOST_AUTO_TEST_CASE(GuideRateConfigWell) #ifdef HAVE_MPI Opm::GuideRateConfig::WellTarget val1 = getGuideRateConfigWell(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GuideRateConfig::WellTarget) #endif } @@ -2033,8 +1917,7 @@ BOOST_AUTO_TEST_CASE(GuideRateConfig) {{"test1", getGuideRateConfigWell()}}, {{"test2", getGuideRateConfigGroup()}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GuideRateConfig) #endif } @@ -2048,8 +1931,7 @@ BOOST_AUTO_TEST_CASE(GConSaleGroup) Opm::GConSale::MaxProcedure::PLUG, 4.0, Opm::UnitSystem()}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GConSale::GCONSALEGroup) #endif } @@ -2064,8 +1946,7 @@ BOOST_AUTO_TEST_CASE(GConSale) 4.0, Opm::UnitSystem()}; Opm::GConSale val1({{"test1", group}, {"test2", group}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GConSale) #endif } @@ -2078,8 +1959,7 @@ BOOST_AUTO_TEST_CASE(GConSumpGroup) "test", 3.0, Opm::UnitSystem()}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GConSump::GCONSUMPGroup) #endif } @@ -2093,8 +1973,7 @@ BOOST_AUTO_TEST_CASE(GConSump) 3.0, Opm::UnitSystem()}; Opm::GConSump val1({{"test1", group}, {"test2", group}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(GConSump) #endif } @@ -2110,8 +1989,7 @@ BOOST_AUTO_TEST_CASE(RFTConfig) {{"test1", {{{Opm::RFTConfig::RFT::TIMESTEP, 3}}, 4}}}, {{"test2", {{{Opm::RFTConfig::PLT::REPT, 5}}, 6}}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(RFTConfig) #endif } @@ -2127,8 +2005,7 @@ BOOST_AUTO_TEST_CASE(DeckItem) {Opm::Dimension("Metric", 10.0, 11.0)}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(DeckItem) #endif } @@ -2138,8 +2015,7 @@ BOOST_AUTO_TEST_CASE(DeckRecord) #ifdef HAVE_MPI Opm::DeckRecord val1 = getDeckRecord(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(DeckRecord) #endif } @@ -2149,8 +2025,7 @@ BOOST_AUTO_TEST_CASE(Location) #ifdef HAVE_MPI Opm::Location val1{"test", 1}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Location) #endif } @@ -2161,8 +2036,7 @@ BOOST_AUTO_TEST_CASE(DeckKeyword) Opm::DeckKeyword val1("test", {"test",1}, {getDeckRecord(), getDeckRecord()}, true, false); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(DeckKeyword) #endif } @@ -2176,8 +2050,7 @@ BOOST_AUTO_TEST_CASE(Deck) Opm::UnitSystem(), unitSys.get(), "test2", "test3", 2); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Deck) #endif } @@ -2187,8 +2060,7 @@ BOOST_AUTO_TEST_CASE(Tuning) #ifdef HAVE_MPI Opm::Tuning val1 = getTuning(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Tuning) #endif } @@ -2199,8 +2071,7 @@ BOOST_AUTO_TEST_CASE(ASTNode) Opm::Action::ASTNode child(number, FuncType::field, "test3", {"test2"}, 2.0, {}); Opm::Action::ASTNode val1(number, FuncType::field, "test1", {"test2"}, 1.0, {child}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Action::ASTNode) #endif } @@ -2213,8 +2084,7 @@ BOOST_AUTO_TEST_CASE(AST) "test1", {"test2"}, 1.0, {})); Opm::Action::AST val1(node); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Action::AST) #endif } @@ -2226,8 +2096,7 @@ BOOST_AUTO_TEST_CASE(Quantity) val1.quantity = "test1"; val1.args = {"test2", "test3"}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Action::Quantity) #endif } @@ -2237,8 +2106,7 @@ BOOST_AUTO_TEST_CASE(Condition) #ifdef HAVE_MPI Opm::Action::Condition val1 = getCondition(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Action::Condition) #endif } @@ -2248,8 +2116,7 @@ BOOST_AUTO_TEST_CASE(ActionX) #ifdef HAVE_MPI Opm::Action::ActionX val1 = getActionX(); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Action::ActionX) #endif } @@ -2259,8 +2126,7 @@ BOOST_AUTO_TEST_CASE(Actions) #ifdef HAVE_MPI Opm::Action::Actions val1({getActionX()}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Action::Actions) #endif } @@ -2370,8 +2236,7 @@ BOOST_AUTO_TEST_CASE(Schedule) {{"test", events}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Schedule) #endif } @@ -2380,8 +2245,7 @@ BOOST_AUTO_TEST_CASE(BrineDensityTable) #ifdef HAVE_MPI Opm::BrineDensityTable val1({1.0, 2.0, 3.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(BrineDensityTable) #endif } @@ -2396,8 +2260,7 @@ BOOST_AUTO_TEST_CASE(SummaryNode) .isUserDefined(true); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(SummaryNode) #endif } @@ -2414,8 +2277,7 @@ BOOST_AUTO_TEST_CASE(SummaryConfig) Opm::SummaryConfig val1({node}, {"test1", "test2"}, {"test3", "test4"}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(SummaryConfig) #endif } @@ -2425,8 +2287,7 @@ BOOST_AUTO_TEST_CASE(PvtwsaltTable) #ifdef HAVE_MPI Opm::PvtwsaltTable val1(1.0, 2.0, {3.0, 4.0, 5.0}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(PvtwsaltTable) #endif } @@ -2436,8 +2297,7 @@ BOOST_AUTO_TEST_CASE(WellBrineProperties) #ifdef HAVE_MPI Opm::WellBrineProperties val1{1.0}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(WellBrineProperties) #endif } @@ -2447,8 +2307,7 @@ BOOST_AUTO_TEST_CASE(MULTREGTRecord) #ifdef HAVE_MPI Opm::MULTREGTRecord val1{1, 2, 3.0, 4, Opm::MULTREGT::ALL, "test"}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(MULTREGTRecord) #endif } @@ -2467,8 +2326,7 @@ BOOST_AUTO_TEST_CASE(MULTREGTScanner) "test4"); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(MULTREGTScanner) #endif } @@ -2487,8 +2345,7 @@ BOOST_AUTO_TEST_CASE(EclipseConfig) Opm::EclipseConfig val1{init, restart}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(EclipseConfig) #endif } @@ -2511,8 +2368,7 @@ BOOST_AUTO_TEST_CASE(TransMult) {{Opm::FaceDir::ZPlus, "test1"}}, scanner); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(TransMult) #endif } @@ -2522,8 +2378,7 @@ BOOST_AUTO_TEST_CASE(FaultFace) #ifdef HAVE_MPI Opm::FaultFace val1({1,2,3,4,5,6}, Opm::FaceDir::YPlus); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(FaultFace) #endif } @@ -2533,8 +2388,7 @@ BOOST_AUTO_TEST_CASE(Fault) #ifdef HAVE_MPI Opm::Fault val1("test", 1.0, {{{1,2,3,4,5,6}, Opm::FaceDir::YPlus}}); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(Fault) #endif } @@ -2547,8 +2401,7 @@ BOOST_AUTO_TEST_CASE(FaultCollection) faults.insert({"test2", fault}); Opm::FaultCollection val1(faults); auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(FaultCollection) #endif } @@ -2561,8 +2414,7 @@ BOOST_AUTO_TEST_CASE(EclEpsScalingPointsInfo) 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21}; auto val2 = PackUnpack(val1); - BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); - BOOST_CHECK(val1 == std::get<0>(val2)); + DO_CHECKS(EclEpsScalingPointsInfo) #endif }