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

inner_product --> innerProduct. Avoid confusion with std version.

Browse Source
This commit is contained in:
Robert Kloefkorn committed 2014-10-07 09:52:22 +02:00
1 parent b250383ae0
commit ef813c94cc
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/core/simulator/PIDTimeStepControl.cpp
+4 -4
View File
@@ -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 )