OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove ambiguous functions increment and getCoordinate from unnamed namespace in favor to those from namespace UgGridHelpers

Browse Source
This commit is contained in:
Markus Blatt 2014-02-25 15:45:50 +01:00
parent d307df71e7
commit f356d86701
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
View File

@ -25,6 +25,7 @@
#include <opm/core/utility/NonuniformTableLinear.hpp> #include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp> #include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/grid/GridHelpers.hpp>
#include <opm/parser/eclipse/Utility/EndscaleWrapper.hpp> #include <opm/parser/eclipse/Utility/EndscaleWrapper.hpp>
#include <opm/parser/eclipse/Utility/ScalecrsWrapper.hpp> #include <opm/parser/eclipse/Utility/ScalecrsWrapper.hpp>
@ -470,36 +471,6 @@ namespace Opm
return cell_to_func_.empty() ? satfuncset_[0] : satfuncset_[cell_to_func_[cell]]; return cell_to_func_.empty() ? satfuncset_[0] : satfuncset_[cell_to_func_[cell]];
} }
namespace
{
template<class T>
const T* increment(T* cc, int i, int dim)
{
return cc+(i*dim);
}
template<class T>
T increment(const T& t, int i, int)
{
return t+i;
}
template<class T>
double getCoordinate(T* cc, int i)
{
return cc[i];
}
template<class T>
double getCoordinate(T t, int i)
{
return (*t)[i];
}
}
// Initialize saturation scaling parameter // Initialize saturation scaling parameter
template <class SatFuncSet> template <class SatFuncSet>
@ -1002,7 +973,9 @@ namespace
if (table[itab][jtab][0] != -1.0) { if (table[itab][jtab][0] != -1.0) {
std::vector<double>& depth = table[0][jtab]; std::vector<double>& depth = table[0][jtab];
std::vector<double>& val = table[itab][jtab]; std::vector<double>& val = table[itab][jtab];
double zc = getCoordinate(increment(begin_cell_centroid, cell, dimensions), double zc = UgGridHelpers
::getCoordinate(UgGridHelpers::increment(begin_cell_centroid, cell,
dimensions),
dimensions-1); dimensions-1);
if (zc >= depth.front() && zc <= depth.back()) { //don't want extrap outside depth interval if (zc >= depth.front() && zc <= depth.back()) { //don't want extrap outside depth interval
scaleparam[cell] = linearInterpolation(depth, val, zc); scaleparam[cell] = linearInterpolation(depth, val, zc);