OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-30 13:03:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid signed/unsigned warning.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2014-04-15 13:40:50 +02:00 committed by Andreas Lauser
parent 65e435e139
commit 91dedb0eea
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/simulator/initStateEquil.hpp
View File

@ -525,7 +525,8 @@ namespace Opm
for (size_t i = 0; i < rec.size(); ++i) {
const int cell = *(eqlmap.cells(i).begin());
if (rec[i].live_oil_table_index > 0) {
if (newParserDeck->hasKeyword("RSVD") && rec[i].live_oil_table_index <= newParserDeck->getKeyword("RSVD")->size()) {
const int tab_size = newParserDeck->getKeyword("RSVD")->size();
if (newParserDeck->hasKeyword("RSVD") && rec[i].live_oil_table_index <= tab_size) {
Opm::SimpleTable rsvd(newParserDeck->getKeyword("RSVD"),std::vector<std::string>{"vd", "rs"},rec[i].live_oil_table_index-1);
std::vector<double> vd(rsvd.getColumn("vd"));
std::vector<double> rs(rsvd.getColumn("rs"));
@ -555,7 +556,8 @@ namespace Opm
for (size_t i = 0; i < rec.size(); ++i) {
const int cell = *(eqlmap.cells(i).begin());
if (rec[i].wet_gas_table_index > 0) {
if (newParserDeck->hasKeyword("RVVD") && rec[i].wet_gas_table_index <= newParserDeck->getKeyword("RVVD")->size()) {
const int tab_size = newParserDeck->getKeyword("RVVD")->size();
if (newParserDeck->hasKeyword("RVVD") && rec[i].wet_gas_table_index <= tab_size) {
Opm::SimpleTable rvvd(newParserDeck->getKeyword("RVVD"),std::vector<std::string>{"vd", "rv"},rec[i].wet_gas_table_index-1);
std::vector<double> vd(rvvd.getColumn("vd"));
std::vector<double> rv(rvvd.getColumn("rv"));