From 2a3adf759114448cc250404178f8fb924badb68a Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Wed, 28 Jan 2015 21:55:35 +0100 Subject: [PATCH] Constified the compute reduction functions. These should and have to be used with a const object. --- opm/core/linalg/ParallelIstlInformation.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/opm/core/linalg/ParallelIstlInformation.hpp b/opm/core/linalg/ParallelIstlInformation.hpp index 9c60de9fc..db43f421e 100644 --- a/opm/core/linalg/ParallelIstlInformation.hpp +++ b/opm/core/linalg/ParallelIstlInformation.hpp @@ -142,7 +142,7 @@ public: communicator.free(); } template - void updateOwnerMask(const T& container) + void updateOwnerMask(const T& container) const { if( ! indexSet_ ) { @@ -180,7 +180,7 @@ public: /// \param value The initial value or a tuple of them. template void computeReduction(const Container& container, BinaryOperator binaryOperator, - T& value) + T& value) const { computeReduction(container, binaryOperator, value, is_tuple()); } @@ -190,7 +190,7 @@ private: /// This is a helper function to prepare for calling computeTupleReduction. template void computeReduction(const Container& container, BinaryOperator binaryOperator, - T& value, std::integral_constant) + T& value, std::integral_constant) const { computeTupleReduction(container, binaryOperator, value); } @@ -199,7 +199,7 @@ private: /// This is a helper function to prepare for calling computeTupleReduction. template void computeReduction(const Container& container, BinaryOperator binaryOperator, - T& value, std::integral_constant) + T& value, std::integral_constant) const { std::tuple containers=std::tuple(container); auto values=std::make_tuple(value); @@ -211,7 +211,7 @@ private: template void computeTupleReduction(const std::tuple& containers, std::tuple& operators, - std::tuple& values) + std::tuple& values) const { static_assert(std::tuple_size >::value== std::tuple_size >::value, @@ -243,14 +243,14 @@ private: typename std::enable_if::type computeGlobalReduction(const std::tuple&, std::tuple&, - std::tuple&) + std::tuple&) const {} /// \brief TMP for computing the the global reduction after receiving the local ones. template typename std::enable_if::type computeGlobalReduction(const std::tuple& receivedValues, std::tuple& operators, - std::tuple& values) + std::tuple& values) const { auto& val=std::get(values); val = std::get(operators).localOperator()(val, std::get(receivedValues)); @@ -263,14 +263,14 @@ private: typename std::enable_if::type computeLocalReduction(const std::tuple&, std::tuple&, - std::tuple&) + std::tuple&) const {} /// \brief TMP for computing the the local reduction on the DOF that the process owns. template typename std::enable_if::type computeLocalReduction(const std::tuple& containers, std::tuple& operators, - std::tuple& values) + std::tuple& values) const { const auto& container = std::get(containers); if( container.size() )