Skip to content

Changes in opm-common for current Production/Injection Group Control parameters#1592

Merged
bska merged 7 commits intoOPM:masterfrom
jalvestad:opm_data_Groups
Mar 19, 2020
Merged

Changes in opm-common for current Production/Injection Group Control parameters#1592
bska merged 7 commits intoOPM:masterfrom
jalvestad:opm_data_Groups

Conversation

@jalvestad
Copy link
Contributor

@jalvestad jalvestad commented Mar 16, 2020 •
edited by joakim-hove
Loading

This pullrequest includes changes in opm-common needed to hold the current Production and Injection Group control parameters for use in output to summary file and for use in output of Eclipse Compatible restart file. The changes to write the control status to the summary file is also included.

This pull request is needed for OPM/opm-simulators#2459 to be able to build.

The pull request is ready for review and merge from my side.

@joakim-hove
Copy link
Member

joakim-hove commented Mar 16, 2020

jenkins build this please

joakim-hove
joakim-hove reviewed Mar 16, 2020
View reviewed changes
src/opm/output/eclipse/Summary.cpp Outdated
return { sum, rate_unit< phase >() };
}

template < bool isGroup = true, bool Producer = true, bool waterInjector = false, bool gasInjector = false>
Copy link
Member

@joakim-hove joakim-hove Mar 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the default initialization used/needed?

Copy link
Contributor Author

@jalvestad jalvestad Mar 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, I do not think the default is needed - I will remove it.

@bska
Copy link
Member

bska commented Mar 16, 2020

jenkins build this opm-simulators=2459 please

joakim-hove
joakim-hove approved these changes Mar 17, 2020
View reviewed changes
Copy link
Member

@joakim-hove joakim-hove left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't fully understand the interaction between this and other PR's, so I will leave this open - but feel free to merge it when ready.

@bska
Copy link
Member

bska commented Mar 18, 2020

jenkins build this opm-simulators=2459 please

@bska
Copy link
Member

bska commented Mar 18, 2020

Thanks a lot for the update. Commit a4d3ec3 in particular was necessary to get this to run without timeouts on the CI system. Now the only remaining thing to do is to update the reference data to include new summary vectors in the expected results for model1/BASE_MODEL_1.DATA, model1/FAULTS_MODEL_1.DATA, and model1/MSW_MODEL_1.DATA. Doing so will fix the comparison failures below.

I will however defer the data update until #1599 and its associate update OPM/opm-tests#266 have been merged into master.

Keywords found in second case, but missing in first case: 

  > 'GMCTP:FIELD_N'
  > 'GMCTP:FIELD_S'
  > 'GMCTP:INJ_N'
  > 'GMCTP:INJ_S'
  > 'GMCTP:PROD_N'
  > 'GMCTP:PROD_S'

@jenkins4opm jenkins4opm mentioned this pull request Mar 19, 2020
Merged
jenkins4opm pushed a commit to jenkins4opm/opm-tests that referenced this pull request Mar 19, 2020
update reference data for msw_model_1 base_model_1 faults_model_1
7b78672 
Reason: OPM/opm-common#1592
        OPM/opm-simulators#2459

opm-common     = 1aa28ed927a5a912d2819dbe24550ff8b7a458d1
opm-grid       = 1d0697f99f3738b3c01707aa8b1dd85da448cc8b
opm-material   = 16fcd186c70f170c80431c97e802eabcc548feae
opm-models     = 214100686144f801c4ff56c016bf71195c789c25
opm-simulators = 29bd764db12a707a4917b879ca041ea9f0cd91a6
@bska
Copy link
Member

bska commented Mar 19, 2020

jenkins build this opm-simulators=2459 opm-tests=267 please

@bska
Copy link
Member

bska commented Mar 19, 2020

jenkins build this opm-simulators=2459 opm-tests=267 please

Success! Thanks a lot for your patience. I am going to merge this and the downstream PRs now.

@bska bska merged commit 4b85366 into OPM:master Mar 19, 2020
@bska bska mentioned this pull request Mar 20, 2020
Merged
@jalvestad jalvestad deleted the opm_data_Groups branch April 7, 2020 07:54
@bska bska mentioned this pull request Apr 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@joakim-hove joakim-hove joakim-hove approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jalvestad @joakim-hove @bska @akva2