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

PAvgCalculatorCollection: accept presssure updates in invalid cell

Browse Source
This commit is contained in:
Joakim Hove
2020-12-01 10:27:44 +01:00
parent a242b3abfa
commit 1ac1582f12
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp
+1 -7
View File
@@ -55,15 +55,9 @@ const std::vector<std::size_t>& PAvgCalculatorCollection::index_list() const {
}
void PAvgCalculatorCollection::add_pressure(std::size_t index, double pressure) {
std::size_t count = 0;
for (auto& [_, calculator] : this->calculators) {
(void)_;
if (calculator.add_pressure(index, pressure))
count += 1;
}
if (count == 0) {
auto msg = fmt::format("Tried to update pressure in invalid cell: {}" , index);
throw std::logic_error(msg);
calculator.add_pressure(index, pressure);
}
}
tests/parser/PAvgTests.cpp
+1 -1
View File
@@ -314,7 +314,7 @@ END
}
}
BOOST_CHECK_THROW( calculators.add_pressure(100000000, 1), std::exception );
BOOST_CHECK_NO_THROW( calculators.add_pressure(100000000, 1) );
for (std::size_t k = 0; k < 3; k++) {
calculators.add_pressure(grid.getGlobalIndex(0,0,k), 1);
calculators.add_pressure(grid.getGlobalIndex(1,0,k), 2.0);