Make available current Production/Injection Group Control parameters for use in Restart#2459
Conversation
1fbfb92 to
6a65933
Compare
|
jenkins build this please |
Right, the PR also depends on OPM/opm-common#1408 and cannot be tested in isolation. |
|
jenkins build this opm-common=1592 please |
bska
left a comment
There was a problem hiding this comment.
This looks good to me. Just a couple of comments concerning unused parameters and local variables.
ebos/eclwellmanager.hh
Outdated
| return wellDat; | ||
| } | ||
|
|
||
| Opm::data::Group groupData(const int reportStepIdx, Opm::Schedule& sched) const { |
There was a problem hiding this comment.
The parameters here are unused. I suggest writing the declaration as
Opm::data::Group groupData(const int /* reportStepIdx */, const Opm::Schedule& /* sched */) const {In other words, without naming the parameters. Doing so will avoid warnings about unused parameters.
There was a problem hiding this comment.
Thank you for the comment, I agree and this change has now been done and pr has been updated.
There was a problem hiding this comment.
Thank you for the comment, I agree and this change has now been done and pr has been updated.
Thank you very much. Did you want to address my other comment too, or do you consider this PR done now?
ebos/eclwriter.hh
Outdated
| bool enableDoublePrecisionOutput = EWOMS_GET_PARAM(TypeTag, bool, EclOutputDoublePrecision); | ||
| const Opm::data::Solution& cellData = collectToIORank_.isParallel() ? collectToIORank_.globalCellData() : localCellData; | ||
| const Opm::data::Wells& wellData = collectToIORank_.isParallel() ? collectToIORank_.globalWellData() : localWellData; | ||
| const Opm::data::Group& groupData = collectToIORank_.isParallel() ? collectToIORank_.globalGroupData() : localGroupData; |
There was a problem hiding this comment.
I don't think this groupData object is actually used, since the relevant quantities have already been calculated in evalSummaryState() and put into the summaryState() object. The restart writer can retrieve the values from there.
There was a problem hiding this comment.
I agree and I have removed this object from the code - thank you for the correction!
There was a problem hiding this comment.
I agree and I have removed this object from the code
Thanks a lot! I'll launch a data-update now. I expect we'll be able to merge this later today.
|
jenkins build this opm-common=1592 update_data please |
Reason: OPM/opm-common#1592 OPM/opm-simulators#2459 opm-common = 1aa28ed927a5a912d2819dbe24550ff8b7a458d1 opm-grid = 1d0697f99f3738b3c01707aa8b1dd85da448cc8b opm-material = 16fcd186c70f170c80431c97e802eabcc548feae opm-models = 214100686144f801c4ff56c016bf71195c789c25 opm-simulators = 29bd764db12a707a4917b879ca041ea9f0cd91a6
|
Green from upstream test run. I'll merge this into master now. Thanks a lot. |
This PR has changes that make parameters: currentProductionGroupControl and currentInjectionGroupControl available for writing Eclipse compatible restart files and for use as Summary file data. The content of the restart files will be changed as a consequence of using this information, to be included in a separate PR in opm-common.
I would like to get this pull request merged soon since it is required to use together with other PRs for further work / improvment of the eclipse compatible restart files.