-
Notifications
You must be signed in to change notification settings - Fork 114
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
changed: only keep keywords in sched_deck if there are actions #4234
Conversation
jenkins build this please |
5c383e6
to
184885a
Compare
jenkins build this please |
184885a
to
1fa2021
Compare
jenkins build this opm-simulators=5635 please |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't looked at the details here yet, I'll do that later, but I just want to point out that in a restarted simulation run (rst != nullptr
) it is possible, though unlikely, that all of the ACTIONX
data has been entered prior to the restart step. If we're going with this approach then you might want to add something like
if (!keepKeywords) {
keepKeywords = !rst->actions.empty();
}
to the if (rst)
branch. This includes RstState::actions
as one more source of information on whether to keep the input keywords.
1fa2021
to
8a77f5b
Compare
done. |
jenkins build this opm-simulators=5635 please |
1 similar comment
jenkins build this opm-simulators=5635 please |
I have no overview here, so my question might make no sense. How does this behave with MULT* in the schedule? We do have tests for this (opm-tests/mult/MULT2D_SCHD?.DATA), but even there the changes are still at the start of the simulation. |
It would not affect it. The normal way the schedule operate is that we
Then we can throw away the keywords as everything has been stored in those classes. The exception for this is if there is an action. It will then, once an action triggers, replay the deck keywords starting with the step the action happened. Thus we only need these keywords IF there are actions that need the replaying when triggered. |
Does the API change here mean that this must be merged together with the companion PR (i.e., OPM/opm-simulators#5635)? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me and should be merged. I'll defer merging, however, until I know if the downstream PR must be merged alongside this PR.
There is an api change, but as there is a default value corresponding to old behavior it should in theory build separate of the downstream. I did not test that however. |
I saw the new default value, but I'm always uneasy when adding new defaulted parameters in the middle of the parameter list.
Okay, I'll run a build check now to see. |
jenkins build this please |
That experiment failed so the two PRs must be merged in concert. Very well, I'll have a look at the other PR as well. |
yeah, i can't resolve that one as it passed values for parameters after the added parameter. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've reviewed the downstream PR and everything looks good. I'm open to discussing what the default value of keepKeywords
should be at the simulator level, but that's a separate issue to having the feature. I'll merge this and its downstream companion PR into the master branch now.
This becomes very significant with large schedules. This is probably too naive but I want to check fallout.