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

Merge pull request #5770 from vkip/thpres_rst_rstout

Browse Source 
Write correct THRESHPR values also from restart
This commit is contained in:
Atgeirr Flø Rasmussen 2024-12-02 10:32:52 +01:00 committed by GitHub
commit e936a224a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/simulators/flow/FlowThresholdPressure.hpp
View File

@ -88,6 +88,7 @@ public:
if (this->enableThresholdPressure_ && !this->thpresDefault_.empty() && !this->restart_) {
this->computeDefaultThresholdPressures_();
this->applyExplicitThresholdPressures_();
simulator_.vanguard().gridView().comm().max(&this->thpres_[0], this->thpres_.size());
}
}

19
opm/simulators/flow/GenericThresholdPressure_impl.hpp
View File

@ -226,24 +226,7 @@ getRestartVector() const
if (!enableThresholdPressure_)
return {};
std::vector<Scalar> result(numEquilRegions_ * numEquilRegions_, 0.0);
const auto& simConfig = eclState_.getSimulationConfig();
const auto& thpres = simConfig.getThresholdPressure();
std::size_t idx = 0;
for (unsigned j = 1; j <= numEquilRegions_; ++j) {
for (unsigned i = 1; i <= numEquilRegions_; ++i, ++idx) {
if (thpres.hasRegionBarrier(i, j)) {
if (thpres.hasThresholdPressure(i, j)) {
result[idx] = thpres.getThresholdPressure(i, j);
} else {
result[idx] = this->thpresDefault_[idx];
}
}
}
}
return result;
return this->thpres_;
}
template<class Grid, class GridView, class ElementMapper, class Scalar>