From ef813c94cc395bed37600c7aef089c6893dc4da6 Mon Sep 17 00:00:00 2001 From: Robert Kloefkorn Date: Tue, 7 Oct 2014 09:52:22 +0200 Subject: [PATCH] inner_product --> innerProduct. Avoid confusion with std version. --- opm/core/simulator/PIDTimeStepControl.cpp | 8 ++++---- opm/core/simulator/PIDTimeStepControl.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opm/core/simulator/PIDTimeStepControl.cpp b/opm/core/simulator/PIDTimeStepControl.cpp index 65664d1b..f23338ff 100644 --- a/opm/core/simulator/PIDTimeStepControl.cpp +++ b/opm/core/simulator/PIDTimeStepControl.cpp @@ -57,12 +57,12 @@ namespace Opm } // compute || u^n - u^n+1 || - const double stateOld = inner_product( p0_.begin(), p0_.end() ) + - inner_product( sat0_.begin(), sat0_.end() ); + const double stateOld = innerProduct( p0_.begin(), p0_.end() ) + + innerProduct( sat0_.begin(), sat0_.end() ); // compute || u^n+1 || - const double stateNew = inner_product( state.pressure().begin(), state.pressure().end() ) + - inner_product( state.saturation().begin(), state.saturation().end() ); + const double stateNew = innerProduct( state.pressure().begin(), state.pressure().end() ) + + innerProduct( state.saturation().begin(), state.saturation().end() ); // shift errors for( int i=0; i<2; ++i ) diff --git a/opm/core/simulator/PIDTimeStepControl.hpp b/opm/core/simulator/PIDTimeStepControl.hpp index d756947f..90994cad 100644 --- a/opm/core/simulator/PIDTimeStepControl.hpp +++ b/opm/core/simulator/PIDTimeStepControl.hpp @@ -57,7 +57,7 @@ namespace Opm protected: // return inner product for given container, here std::vector template - double inner_product( Iterator it, const Iterator end ) const + double innerProduct( Iterator it, const Iterator end ) const { double product = 0.0 ; for( ; it != end; ++it )