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

ok, now we got it. euclidianNormSquared.

Browse Source
This commit is contained in:
Robert Kloefkorn
2014-10-07 14:14:31 +02:00
parent ba316dd651
commit 80431e273f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/simulator/PIDTimeStepControl.cpp
View File

@@ -57,12 +57,12 @@ namespace Opm
}
// compute || u^n - u^n+1 ||
const double stateOld = euclideanNormSquared( p0_.begin(), p0_.end() ) +
euclideanNormSquared( sat0_.begin(), sat0_.end() );
const double stateOld = euclidianNormSquared( p0_.begin(), p0_.end() ) +
euclidianNormSquared( sat0_.begin(), sat0_.end() );
// compute || u^n+1 ||
const double stateNew = euclideanNormSquared( state.pressure().begin(), state.pressure().end() ) +
euclideanNormSquared( state.saturation().begin(), state.saturation().end() );
const double stateNew = euclidianNormSquared( state.pressure().begin(), state.pressure().end() ) +
euclidianNormSquared( state.saturation().begin(), state.saturation().end() );
// shift errors
for( int i=0; i<2; ++i )

2
opm/core/simulator/PIDTimeStepControl.hpp
View File

@@ -57,7 +57,7 @@ namespace Opm
protected:
// return inner product for given container, here std::vector
template <class Iterator>
double euclideanNormSquared( Iterator it, const Iterator end ) const
double euclidianNormSquared( Iterator it, const Iterator end ) const
{
double product = 0.0 ;
for( ; it != end; ++it )