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

Make sure Action result is checked before wells are considered

Browse Source
This commit is contained in:
Joakim Hove 2020-05-05 19:03:22 +02:00
parent 352cc5797b
commit c073ad2d8b
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/opm/output/eclipse/AggregateActionxData.cpp
View File

@ -42,8 +42,9 @@
#include <algorithm>
#include <cstddef>
#include <cstring>
#include <string>
#include <optional>
#include <iostream>
#include <string>
// #####################################################################
// Class Opm::RestartIO::Helpers
@ -480,13 +481,12 @@ const std::map<cmp_enum, int> cmpToIndex = {
Opm::Action::Result
act_res(const Opm::Schedule& sched, const Opm::SummaryState& smry, const std::size_t sim_step, std::vector<Opm::Action::ActionX>::const_iterator act_x) {
Opm::Action::Result ar(false);
Opm::Action::Context context(smry);
auto sim_time = sched.simTime(sim_step);
if (act_x->ready(sim_time)) {
ar = act_x->eval(sim_time, context);
}
return {ar};
Opm::Action::Context context(smry);
return act_x->eval(sim_time, context);
} else
return Opm::Action::Result(false);
}
template <class SACNArray>
@ -574,23 +574,25 @@ const std::map<cmp_enum, int> cmpToIndex = {
//Treat well, group and field left hand side conditions
if (it_lhsq != lhsQuantityToIndex.end()) {
std::string wn = "";
//Well variable
if (it_lhsq->first == "W") {
//find the well that violates action if relevant
for (const auto& well : wells)
{
if (ar.has_well(well.name())) {
//set well name
wn = well.name();
break;
if (ar) {
std::optional<std::string> wn;
for (const auto& well : wells)
{
if (ar.has_well(well.name())) {
//set well name
wn = well.name();
break;
}
}
}
if ((it_lhsq->first == "W") && (st.has_well_var(wn, z_data.lhs.quantity)) ) {
sAcn[ind + 4] = st.get_well_var(wn, z_data.lhs.quantity);
sAcn[ind + 6] = st.get_well_var(wn, z_data.lhs.quantity);
sAcn[ind + 8] = st.get_well_var(wn, z_data.lhs.quantity);
if (wn.has_value() && st.has_well_var(*wn, z_data.lhs.quantity)) {
sAcn[ind + 4] = st.get_well_var(*wn, z_data.lhs.quantity);
sAcn[ind + 6] = st.get_well_var(*wn, z_data.lhs.quantity);
sAcn[ind + 8] = st.get_well_var(*wn, z_data.lhs.quantity);
}
}
}
//group variable