OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-22 00:52:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5892 from lisajulia/feature/pyAction-insert-kw-WELPI-WPIMULT-alternative

Browse Source 
Feature/py action insert kw welpi wpimult alternative
This commit is contained in:
Bård Skaflestad 2025-01-20 13:14:00 +01:00 committed by GitHub
commit 2f75635d21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
opm/simulators/flow/ActionHandler.cpp
View File

@ -137,18 +137,12 @@ namespace {
template <typename Scalar, class WellModel>
std::unordered_map<std::string, Scalar>
fetchWellPI(const int reportStep,
const Opm::Schedule& schedule,
const WellModel& wellModel,
const Opm::Action::ActionX& action,
const Opm::Action::Result::MatchingEntities& matches,
fetchWellPI(const WellModel& wellModel,
const std::vector<std::string>& wellpi_wells,
const Opm::Parallel::Communication comm)
{
auto wellpi = std::unordered_map<std::string, Scalar> {};
const auto wellpi_wells = action.wellpi_wells
(schedule.wellMatcher(reportStep), matches);
if (wellpi_wells.empty()) {
return wellpi;
}
@ -207,8 +201,13 @@ applyActions(const int reportStep,
bool commit_wellstate = false;
for (const auto& pyaction : actions.pending_python(actionState_)) {
// The std::unordered_map<std::string, Scalar> wellpi contains the well production indices from the last
// timestep. This map is needed for the keyword WELPI. For a PyAction, we do not know which wells are
// affected by the PyAction, thus we get the production indices for all wells.
const std::vector<std::string> wellpi_wells = schedule_[reportStep].well_order().names();
const auto wellpi = fetchWellPI<Scalar>(this->wellModel_, wellpi_wells, this->comm_);
auto sim_update = schedule_.runPyAction(reportStep, *pyaction, actionState_,
ecl_state_, summaryState_);
ecl_state_, summaryState_, wellpi);
if (const auto pyRes = this->actionState_.python_result(pyaction->name());
!pyRes.has_value() || !*pyRes)
@ -237,9 +236,11 @@ applyActions(const int reportStep,
logActiveAction(action->name(), matches.wells(), ts);
const auto wellpi = fetchWellPI<Scalar>
(reportStep, this->schedule_, this->wellModel_,
*action, matches, this->comm_);
// The std::unordered_map<std::string, Scalar> wellpi contains the well production indices from the last
// timestep. This map is needed for the keyword WELPI. For an ActionX, we know which wells are affected by
// the ActionX, thus fetch the well production indices only for the affected wells.
const std::vector<std::string> wellpi_wells = action->wellpi_wells(schedule_.wellMatcher(reportStep), matches);
const auto wellpi = fetchWellPI<Scalar>(this->wellModel_, wellpi_wells, this->comm_);
const auto sim_update = this->schedule_
.applyAction(reportStep, *action, matches, wellpi);

42
pyactionActionXComparisons.cmake
View File

@ -125,6 +125,26 @@ add_test_compareSeparateECLFiles(CASENAME pyaction_wefac_insert_kw
REL_TOL ${rel_tol}
IGNORE_EXTRA_KW BOTH)
add_test_compareSeparateECLFiles(CASENAME pyaction_welpi_insert_kw
DIR1 pyaction
FILENAME1 PYACTION_WELPI_INSERT_KW
DIR2 actionx
FILENAME2 ACTIONX_WELPI
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
IGNORE_EXTRA_KW BOTH)
add_test_compareSeparateECLFiles(CASENAME pyaction_wpimult_insert_kw
DIR1 pyaction
FILENAME1 PYACTION_WPIMULT_INSERT_KW
DIR2 actionx
FILENAME2 ACTIONX_WPIMULT
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
IGNORE_EXTRA_KW BOTH)
add_test_compareSeparateECLFiles(CASENAME pyaction_wsegvalv_insert_kw
DIR1 pyaction
FILENAME1 PYACTION_WSEGVALV_INSERT_KW
@ -253,6 +273,28 @@ if(MPI_FOUND)
IGNORE_EXTRA_KW BOTH
MPI_PROCS 4)
add_test_compareSeparateECLFiles(CASENAME pyaction_welpi_insert_kw_4_procs
DIR1 pyaction
FILENAME1 PYACTION_WELPI_INSERT_KW
DIR2 actionx
FILENAME2 ACTIONX_WELPI
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
IGNORE_EXTRA_KW BOTH,
MPI_PROCS 4)
add_test_compareSeparateECLFiles(CASENAME pyaction_wpimult_insert_kw_4_procs
DIR1 pyaction
FILENAME1 PYACTION_WPIMULT_INSERT_KW
DIR2 actionx
FILENAME2 ACTIONX_WPIMULT
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
IGNORE_EXTRA_KW BOTH
MPI_PROCS 4)
add_test_compareSeparateECLFiles(CASENAME pyaction_wsegvalv_insert_kw_4_procs
DIR1 pyaction
FILENAME1 PYACTION_WSEGVALV_INSERT_KW