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

ENDNUM: changed default value and jtab-logic

Browse Source 
Default value changed from 'no scaling' to 'use table 1'.
Range of jtab changed to [-1,#tables-1].
This commit is contained in:
osae
2014-05-05 10:18:19 +02:00
parent 61a52eee2e
commit 7280ce2517
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1214,13 +1214,13 @@ namespace Opm
endnum = newParserDeck->getKeyword("ENDNUM")->getIntData();
}
for (int cell = 0; cell < number_of_cells; ++cell) {
int jtab = endnum.empty() ? 0 : endnum[cell];
if (jtab > 0 && param_col[jtab-1][0] >= 0.0) {
int jtab = endnum.empty() ? 0 : endnum[cell] - 1;
if (jtab >= 0 && param_col[jtab][0] >= 0.0) {
double zc = UgGridHelpers
::getCoordinate(UgGridHelpers::increment(begin_cell_centroid, cell, dim),
dim-1);
if (zc >= depth_col[jtab-1].front() && zc <= depth_col[jtab-1].back()) { //don't want extrap outside depth interval
scaleparam[cell] = linearInterpolation(depth_col[jtab-1], param_col[jtab-1], zc);
if (zc >= depth_col[jtab].front() && zc <= depth_col[jtab].back()) { //don't want extrap outside depth interval
scaleparam[cell] = linearInterpolation(depth_col[jtab], param_col[jtab], zc);
}
}
}