mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-11-21 16:57:25 -06:00
Removed outdated version checks
This commit is contained in:
parent
8fbfd473ab
commit
627c7d50ac
@ -22,12 +22,6 @@
|
|||||||
|
|
||||||
#define BOOST_TEST_MODULE OPM_test_cusparseSolver
|
#define BOOST_TEST_MODULE OPM_test_cusparseSolver
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <boost/version.hpp>
|
|
||||||
|
|
||||||
#include <dune/common/version.hh>
|
|
||||||
|
|
||||||
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \
|
|
||||||
BOOST_VERSION / 100 % 1000 > 48
|
|
||||||
|
|
||||||
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
|
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
|
||||||
#include <opm/simulators/linalg/bda/WellContributions.hpp>
|
#include <opm/simulators/linalg/bda/WellContributions.hpp>
|
||||||
@ -175,14 +169,3 @@ BOOST_AUTO_TEST_CASE(TestCusparseSolver)
|
|||||||
BOOST_WARN_MESSAGE(true, "Problem with initializing a device. skipping test");
|
BOOST_WARN_MESSAGE(true, "Problem with initializing a device. skipping test");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// Do nothing if we do not have at least Dune 2.6.
|
|
||||||
BOOST_AUTO_TEST_CASE(DummyTest)
|
|
||||||
{
|
|
||||||
BOOST_REQUIRE(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
@ -21,12 +21,6 @@
|
|||||||
|
|
||||||
#define BOOST_TEST_MODULE OPM_test_FlexibleSolver
|
#define BOOST_TEST_MODULE OPM_test_FlexibleSolver
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <boost/version.hpp>
|
|
||||||
|
|
||||||
#include <dune/common/version.hh>
|
|
||||||
|
|
||||||
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \
|
|
||||||
BOOST_VERSION / 100 % 1000 > 48
|
|
||||||
|
|
||||||
#include <opm/simulators/linalg/FlexibleSolver.hpp>
|
#include <opm/simulators/linalg/FlexibleSolver.hpp>
|
||||||
#include <opm/simulators/linalg/getQuasiImpesWeights.hpp>
|
#include <opm/simulators/linalg/getQuasiImpesWeights.hpp>
|
||||||
@ -124,13 +118,3 @@ BOOST_AUTO_TEST_CASE(TestFlexibleSolver)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// Do nothing if we do not have at least Dune 2.6.
|
|
||||||
BOOST_AUTO_TEST_CASE(DummyTest)
|
|
||||||
{
|
|
||||||
BOOST_REQUIRE(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
@ -22,12 +22,6 @@
|
|||||||
|
|
||||||
#define BOOST_TEST_MODULE OPM_test_openclSolver
|
#define BOOST_TEST_MODULE OPM_test_openclSolver
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <boost/version.hpp>
|
|
||||||
|
|
||||||
#include <dune/common/version.hh>
|
|
||||||
|
|
||||||
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \
|
|
||||||
BOOST_VERSION / 100 % 1000 > 48
|
|
||||||
|
|
||||||
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
|
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
|
||||||
#include <opm/simulators/linalg/bda/WellContributions.hpp>
|
#include <opm/simulators/linalg/bda/WellContributions.hpp>
|
||||||
@ -206,14 +200,3 @@ BOOST_AUTO_TEST_CASE(TestOpenclSolver)
|
|||||||
BOOST_WARN_MESSAGE(true, "Problem with initializing Platform. skipping test");
|
BOOST_WARN_MESSAGE(true, "Problem with initializing Platform. skipping test");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// Do nothing if we do not have at least Dune 2.6.
|
|
||||||
BOOST_AUTO_TEST_CASE(DummyTest)
|
|
||||||
{
|
|
||||||
BOOST_REQUIRE(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
@ -21,12 +21,6 @@
|
|||||||
|
|
||||||
#define BOOST_TEST_MODULE OPM_test_PreconditionerFactory
|
#define BOOST_TEST_MODULE OPM_test_PreconditionerFactory
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <boost/version.hpp>
|
|
||||||
|
|
||||||
#include <dune/common/version.hh>
|
|
||||||
|
|
||||||
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \
|
|
||||||
BOOST_VERSION / 100 % 1000 > 48
|
|
||||||
|
|
||||||
#include <opm/simulators/linalg/matrixblock.hh>
|
#include <opm/simulators/linalg/matrixblock.hh>
|
||||||
#include <opm/simulators/linalg/ilufirstelement.hh>
|
#include <opm/simulators/linalg/ilufirstelement.hh>
|
||||||
@ -370,15 +364,3 @@ BOOST_AUTO_TEST_CASE(TestWithRepeatingOperator)
|
|||||||
// Test with 3x3 block solvers.
|
// Test with 3x3 block solvers.
|
||||||
test3rep(prm);
|
test3rep(prm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// Do nothing if we do not have at least Dune 2.6.
|
|
||||||
BOOST_AUTO_TEST_CASE(DummyTest)
|
|
||||||
{
|
|
||||||
BOOST_REQUIRE(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
Loading…
Reference in New Issue
Block a user