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

Fixed SaturationPropsFromDeck::initEPSKey for new parser and non-UG

Browse Source 
There the cell_centroids where still treated like double*. This patch
uses the UgGridHelpers instead.
This commit is contained in:
Markus Blatt 2014-03-13 15:41:59 +01:00
parent eeb0039683
commit a6fb099fbb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1180,14 +1180,15 @@ namespace Opm
else else
newParserDeck.getENKRVD().write(std::cout); newParserDeck.getENKRVD().write(std::cout);
*/ */
const double* cc = begin_cell_centroid;
const int dim = dimensions; const int dim = dimensions;
for (int cell = 0; cell < number_of_cells; ++cell) { for (int cell = 0; cell < number_of_cells; ++cell) {
int jtab = cell_to_func_.empty() ? 0 : cell_to_func_[cell]; int jtab = cell_to_func_.empty() ? 0 : cell_to_func_[cell];
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 = cc[dim*cell+dim-1]; double zc = UgGridHelpers
::getCoordinate(UgGridHelpers::increment(begin_cell_centroid, cell, dim),
dim-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);
} }