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

Fixed loop index and added parameter check.

Browse Source
This commit is contained in:
osae 2012-12-07 14:34:06 +01:00
parent d5edb42b31
commit 7510ded183
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
opm/core/fluid/SatFuncSimple.cpp
View File

@ -46,6 +46,9 @@ namespace Opm
const std::vector<double>& krw = swof_table[table_num][1]; const std::vector<double>& krw = swof_table[table_num][1];
const std::vector<double>& krow = swof_table[table_num][2]; const std::vector<double>& krow = swof_table[table_num][2];
const std::vector<double>& pcow = swof_table[table_num][3]; const std::vector<double>& pcow = swof_table[table_num][3];
if (krw.front() != 0.0 || krow.back() != 0.0) {
THROW("Error SWOF data - non-zero krw(swco) and/or krow(1-sor)");
}
buildUniformMonotoneTable(sw, krw, samples, krw_); buildUniformMonotoneTable(sw, krw, samples, krw_);
buildUniformMonotoneTable(sw, krow, samples, krow_); buildUniformMonotoneTable(sw, krow, samples, krow_);
buildUniformMonotoneTable(sw, pcow, samples, pcow_); buildUniformMonotoneTable(sw, pcow, samples, pcow_);
@ -68,10 +71,10 @@ namespace Opm
break; break;
} }
} }
for (unsigned int i=sw.size()-2; i>=0; --i) { for (unsigned int i=sw.size()-1; i>=1; --i) {
if (krow[i]> 0.0) { if (krow[i-1]> 0.0) {
sowcr_ = 1.0 - sw[i+1]; sowcr_ = 1.0 - sw[i];
krwr_ = krw[i+1]; krwr_ = krw[i];
break; break;
} }
} }
@ -268,6 +271,9 @@ namespace Opm
const std::vector<double>& krw = swof_table[table_num][1]; const std::vector<double>& krw = swof_table[table_num][1];
const std::vector<double>& krow = swof_table[table_num][2]; const std::vector<double>& krow = swof_table[table_num][2];
const std::vector<double>& pcow = swof_table[table_num][3]; const std::vector<double>& pcow = swof_table[table_num][3];
if (krw.front() != 0.0 || krow.back() != 0.0) {
THROW("Error SWOF data - non-zero krw(swco) and/or krow(1-sor)");
}
krw_ = NonuniformTableLinear<double>(sw, krw); krw_ = NonuniformTableLinear<double>(sw, krw);
krow_ = NonuniformTableLinear<double>(sw, krow); krow_ = NonuniformTableLinear<double>(sw, krow);
pcow_ = NonuniformTableLinear<double>(sw, pcow); pcow_ = NonuniformTableLinear<double>(sw, pcow);
@ -290,10 +296,10 @@ namespace Opm
break; break;
} }
} }
for (unsigned int i=sw.size()-2; i>=0; --i) { for (unsigned int i=sw.size()-1; i>=1; --i) {
if (krow[i]> 0.0) { if (krow[i-1]> 0.0) {
sowcr_ = 1.0 - sw[i+1]; sowcr_ = 1.0 - sw[i];
krwr_ = krw[i+1]; krwr_ = krw[i];
break; break;
} }
} }