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

addressing review comments from PR 1622

Browse Source
This commit is contained in:
Kai Bao 2018-11-14 12:32:11 +01:00
parent afcdbcf202
commit 5a5c1bfcd3
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/autodiff/StandardWell_impl.hpp
View File

@ -1110,7 +1110,6 @@ namespace Opm
rates[ Gas ] = well_state.wellRates()[index_of_well_ * number_of_phases_ + pu.phase_pos[ Gas ] ]; rates[ Gas ] = well_state.wellRates()[index_of_well_ * number_of_phases_ + pu.phase_pos[ Gas ] ];
} }
// TODO: we should have some guard here to avoid some NAN or INF ratios
const double bhp = well_state.bhp()[index_of_well_]; const double bhp = well_state.bhp()[index_of_well_];
well_state.thp()[index_of_well_] = calculateThpFromBhp(rates, bhp); well_state.thp()[index_of_well_] = calculateThpFromBhp(rates, bhp);

2
opm/autodiff/VFPHelpers.hpp
View File

@ -550,7 +550,7 @@ template <typename T>
const T* getTable(const std::map<int, T*> tables, int table_id) { const T* getTable(const std::map<int, T*> tables, int table_id) {
auto entry = tables.find(table_id); auto entry = tables.find(table_id);
if (entry == tables.end()) { if (entry == tables.end()) {
OPM_THROW(std::invalid_argument, "Nonexistent table " << table_id << " referenced."); OPM_THROW(std::invalid_argument, "Nonexistent VFP table " << table_id << " referenced.");
} }
else { else {
return entry->second; return entry->second;

8
opm/autodiff/WellInterface_impl.hpp
View File

@ -996,10 +996,6 @@ namespace Opm
} else { } else {
if (vfp_properties_->getProd()->getTable(table_id)) { if (vfp_properties_->getProd()->getTable(table_id)) {
return true; return true;
} else {
OPM_THROW(std::runtime_error, "VFPPROD table " << std::to_string(table_id) << " is specfied,"
<< " for well " << name() << ", while we could not access it during simulation");
return false;
} }
} }
@ -1010,10 +1006,6 @@ namespace Opm
} else { } else {
if (vfp_properties_->getInj()->getTable(table_id)) { if (vfp_properties_->getInj()->getTable(table_id)) {
return true; return true;
} else {
OPM_THROW(std::runtime_error, "VFPINJ table " << std::to_string(table_id) << " is specfied,"
<< " for well " << name() << ", while we could not access it during simulation");
return false;
} }
} }
} }