OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: earlier boosts only accepts boost::mpl::list for BOOST_AUTO_TEST_TEMPLATE

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-11-10 10:12:13 +01:00
parent 5bc38dab24
commit f1fc44563a
13 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/material/test_2dtables.cpp
View File

@ -29,6 +29,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE 2DTables
#include <boost/test/unit_test.hpp>
@ -284,7 +286,7 @@ struct Test
}
};
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(UniformTabulatedFunction1, Scalar, Types)
{

5
tests/material/test_blackoilfluidstate.cpp
View File

@ -28,6 +28,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE BlackOilFluidState
#include <boost/test/unit_test.hpp>
@ -37,7 +39,8 @@
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
#include <opm/material/checkFluidSystem.hpp>
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(ApiConformance, Scalar, Types)
{
using FluidSystem = Opm::BlackOilFluidSystem<Scalar>;

4
tests/material/test_co2brinepvt.cpp
View File

@ -29,6 +29,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE Co2BrinePvt
#include <boost/test/unit_test.hpp>
@ -239,7 +241,7 @@ void ensurePvtApiBrineOil(const BrinePvt& brinePvt)
}
}
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(Oil, Scalar, Types)
{

4
tests/material/test_components.cpp
View File

@ -27,6 +27,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE Components
#include <boost/test/unit_test.hpp>
#include <boost/test/tools/floating_point_comparison.hpp>
@ -97,7 +99,7 @@ bool close_at_tolerance(Scalar n1, Scalar n2, Scalar tolerance)
return comp(n1, n2);
}
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(All, Scalar, Types)
{

4
tests/material/test_eclblackoilfluidsystem.cpp
View File

@ -33,6 +33,8 @@
#error "The test for the black oil fluid system classes requires ecl input support in opm-common"
#endif
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE EclBlackOilFluidSystem
#include <boost/test/unit_test.hpp>
@ -611,7 +613,7 @@ static constexpr const char* deckString1 =
" 860.04 1033.0 0.853 /\n"
"\n";
using Types = std::tuple<double,Opm::DenseAd::Evaluation<double,2>>;
using Types = boost::mpl::list<double,Opm::DenseAd::Evaluation<double,2>>;
BOOST_AUTO_TEST_CASE_TEMPLATE(BlackOil, Evaluation, Types)
{

5
tests/material/test_eclblackoilpvt.cpp
View File

@ -33,6 +33,8 @@
#error "The test for the black oil PVT classes requires eclipse input support in opm-common"
#endif
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE EclBlackOilPvt
#include <boost/test/unit_test.hpp>
@ -246,7 +248,8 @@ struct Fixture {
BOOST_FIXTURE_TEST_SUITE(Generic, Fixture)
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(ApiConformance, Scalar, Types)
{
Opm::GasPvtMultiplexer<Scalar> gasPvt;

4
tests/material/test_eclmateriallawmanager.cpp
View File

@ -34,6 +34,8 @@
#error "The test for EclMaterialLawManager requires eclipse input support in opm-common"
#endif
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE EclMaterialLawManager
#include <boost/test/unit_test.hpp>
@ -611,7 +613,7 @@ struct Fixture {
using MaterialLaw = typename MaterialLawManager::MaterialLaw;
};
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(Fam1Fam2Hysteresis, Scalar, Types)
{
using MaterialLaw = typename Fixture<Scalar>::MaterialLaw;

4
tests/material/test_fluidmatrixinteractions.cpp
View File

@ -29,6 +29,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE FluidMatrixInteractions
#include <boost/test/unit_test.hpp>
@ -254,7 +256,7 @@ void testThreePhaseApi()
}
}
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(ApiConformance, Scalar, Types)
{

6
tests/material/test_fluidsystems.cpp
View File

@ -28,6 +28,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE FluidSystems
#include <boost/test/unit_test.hpp>
@ -164,7 +166,7 @@ void ensureBlackoilApi()
}
}
using EvalTypes = std::tuple<float,double,Opm::DenseAd::Evaluation<float,3>,Opm::DenseAd::Evaluation<double,3>>;
using EvalTypes = boost::mpl::list<float,double,Opm::DenseAd::Evaluation<float,3>,Opm::DenseAd::Evaluation<double,3>>;
BOOST_AUTO_TEST_CASE_TEMPLATE(SimpleModularFluidState, Eval, EvalTypes)
{
@ -247,7 +249,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(SaturationOverlayFluidState, Eval, EvalTypes)
checkFluidState<Eval>(fs);
}
using ScalarTypes = std::tuple<float,double>;
using ScalarTypes = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(BlackoilFluidSystem, Scalar, ScalarTypes)
{

4
tests/material/test_h2brinepvt.cpp
View File

@ -29,6 +29,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE H2BrinePvt
#include <boost/test/unit_test.hpp>
@ -241,7 +243,7 @@ void ensurePvtApiBrineOil(const BrinePvt& brinePvt)
}
}
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(Oil, Scalar, Types)
{

4
tests/material/test_immiscibleflash.cpp
View File

@ -35,6 +35,8 @@
#define BOOST_TEST_MODULE ImmiscibleFlash
#include <boost/test/unit_test.hpp>
#include <boost/mpl/list.hpp>
#include <opm/material/densead/Evaluation.hpp>
#include <opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
@ -153,7 +155,7 @@ void completeReferenceFluidState(FluidState& fs,
}
}
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
template<class Scalar>
struct Fixture {

4
tests/material/test_ncpflash.cpp
View File

@ -35,6 +35,8 @@
#define BOOST_TEST_MODULE NcpFlash
#include <boost/test/unit_test.hpp>
#include <boost/mpl/list.hpp>
#include <opm/material/constraintsolvers/NcpFlash.hpp>
#include <opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
@ -219,7 +221,7 @@ struct Fixture {
MaterialLawParams matParams;
};
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(SinglePhaseGas, Scalar, Types)
{

4
tests/material/test_tabulation.cpp
View File

@ -29,6 +29,8 @@
*/
#include "config.h"
#include <boost/mpl/list.hpp>
#define BOOST_TEST_MODULE Tabulation
#include <boost/test/unit_test.hpp>
@ -38,7 +40,7 @@
#include <iostream>
#include <tuple>
using Types = std::tuple<float,double>;
using Types = boost::mpl::list<float,double>;
BOOST_AUTO_TEST_CASE_TEMPLATE(H2O, Scalar, Types)
{