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

Merge pull request #809 from blattms/fix-mask-to-min

Browse Source 
Fix mask to min (completes PR PR #805)
This commit is contained in:
Atgeirr Flø Rasmussen 2015-05-27 17:45:40 +02:00
commit e5e6a191f5
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/linalg/ParallelIstlInformation.hpp
View File

@ -481,7 +481,7 @@ private:
// for integral types. // for integral types.
if( std::is_integral<Result>::value ) if( std::is_integral<Result>::value )
{ {
return -std::numeric_limits<Result>::min(); return std::numeric_limits<Result>::min();
} }
else else
{ {

36
tests/test_parallelistlinformation.cpp
View File

@ -38,23 +38,24 @@
#include <functional> #include <functional>
#ifdef HAVE_DUNE_ISTL #ifdef HAVE_DUNE_ISTL
void runSumMaxMinTest(const int offset) template<typename T>
void runSumMaxMinTest(const T offset)
{ {
const int N=100; const int N=100;
int start, end, istart, iend; int start, end, istart, iend;
std::tie(start,istart,iend,end) = computeRegions(N); std::tie(start,istart,iend,end) = computeRegions(N);
Opm::ParallelISTLInformation comm(MPI_COMM_WORLD); Opm::ParallelISTLInformation comm(MPI_COMM_WORLD);
auto mat = create1DLaplacian(*comm.indexSet(), N, start, end, istart, iend); auto mat = create1DLaplacian(*comm.indexSet(), N, start, end, istart, iend);
std::vector<int> x(end-start); std::vector<T> x(end-start);
assert(comm.indexSet()->size()==x.size()); assert(comm.indexSet()->size()==x.size());
for(auto i=comm.indexSet()->begin(), iend=comm.indexSet()->end(); i!=iend; ++i) for(auto i=comm.indexSet()->begin(), iend=comm.indexSet()->end(); i!=iend; ++i)
x[i->local()]=i->global()+offset; x[i->local()]=i->global()+offset;
auto containers = std::make_tuple(x, x, x, x); auto containers = std::make_tuple(x, x, x, x);
auto operators = std::make_tuple(Opm::Reduction::makeGlobalSumFunctor<int>(), auto operators = std::make_tuple(Opm::Reduction::makeGlobalSumFunctor<T>(),
Opm::Reduction::makeGlobalMaxFunctor<int>(), Opm::Reduction::makeGlobalMaxFunctor<T>(),
Opm::Reduction::makeGlobalMinFunctor<int>(), Opm::Reduction::makeGlobalMinFunctor<T>(),
Opm::Reduction::makeInnerProductFunctor<int>()); Opm::Reduction::makeInnerProductFunctor<T>());
auto values = std::make_tuple(0,0,100000, 0); auto values = std::tuple<T,T,T,T>(0,0,100000, 0);
auto oldvalues = values; auto oldvalues = values;
start = offset; start = offset;
end = start+N; end = start+N;
@ -65,12 +66,25 @@ void runSumMaxMinTest(const int offset)
BOOST_CHECK(std::get<3>(values)==((end-1)*end*(2*end-1)-(start-1)*start*(2*start-1))/6+std::get<3>(oldvalues)); BOOST_CHECK(std::get<3>(values)==((end-1)*end*(2*end-1)-(start-1)*start*(2*start-1))/6+std::get<3>(oldvalues));
} }
BOOST_AUTO_TEST_CASE(tupleReductionTest) BOOST_AUTO_TEST_CASE(tupleReductionTestInt)
{ {
runSumMaxMinTest(0); runSumMaxMinTest<int>(0);
runSumMaxMinTest(20); runSumMaxMinTest<int>(20);
runSumMaxMinTest(-20); runSumMaxMinTest<int>(-20);
} }
BOOST_AUTO_TEST_CASE(tupleReductionTestUnsignedInt)
{
runSumMaxMinTest<std::size_t>(0);
runSumMaxMinTest<std::size_t>(20);
}
BOOST_AUTO_TEST_CASE(tupleReductionTestFloat)
{
runSumMaxMinTest<float>(0);
runSumMaxMinTest<float>(20);
runSumMaxMinTest<float>(-20);
}
BOOST_AUTO_TEST_CASE(singleContainerReductionTest) BOOST_AUTO_TEST_CASE(singleContainerReductionTest)
{ {
int N=100; int N=100;