Skip to content
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.

Sign up for GitHub

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

Summary connections and completions #12152

Merged
merged 24 commits into from
Feb 13, 2025
Merged

Summary connections and completions #12152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cb6a387
Rename to WELL_CONNECTION
magnesj Feb 9, 2025
1b9db33
Update keywords
magnesj Feb 9, 2025
0e28fa6
Use block icon for connections
magnesj Feb 9, 2025
de3449f
Add category check for region number
magnesj Feb 9, 2025
6c07748
Throw exception if category string is invalid
magnesj Feb 10, 2025
0929c6c
Fix missing space in svg causing the icon not to be displayed
magnesj Feb 9, 2025
4ca2fde
Added support for well completions
magnesj Feb 11, 2025
f28e398
Make it possible to step connections
magnesj Feb 11, 2025
6008168
Fixes by clang-format
magnesj Feb 11, 2025
f024666
minor adjustments
magnesj Feb 11, 2025
a975743
Merge remote-tracking branch 'origin/clang-format-patches-u9jtn2s' in…
magnesj Feb 11, 2025
77147cc
Remove obsolete connections
magnesj Feb 11, 2025
b687509
Add definition of completion vectors
magnesj Feb 11, 2025
8c00275
Use WELL_CONNECTION for CPRL
magnesj Feb 11, 2025
fb2769e
Convert "WGPRL__2:MY-WELL1-A5" to "WGPRL:MY-WELL1-A5:2"
magnesj Feb 11, 2025
5ace02d
Remove obsolete handling of __ in well vector names
magnesj Feb 12, 2025
d243bd0
Update tests
magnesj Feb 12, 2025
42e3ef2
Fix typo
magnesj Feb 12, 2025
c2fb12b
Show corresponding icon for items in summary tree view
magnesj Feb 12, 2025
ebaf132
Cleanup
magnesj Feb 12, 2025
6213e7e
Reordering of UI
magnesj Feb 12, 2025
57f7817
Use well-completion icon
magnesj Feb 12, 2025
46dfe37
Icon for well completion
magnesj Feb 12, 2025
9a2c986
More tests
magnesj Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ApplicationExeCode/Resources/ResInsight.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,5 +321,6 @@
<file>components/images/unknown.svg</file>
<file>components/images/well.svg</file>
<file>components/images/well-completion.svg</file>
<file>components/images/well-completion-01.svg</file>
</qresource>
</RCC>
10 changes: 10 additions & 0 deletions ApplicationExeCode/Resources/components/images/well-completion-01.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ApplicationExeCode/Resources/components/images/well-completion.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions ApplicationLibCode/Application/Resources/keyword-description/keywords_6x.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,11 +1032,11 @@
"description": "Total Mole Fraction (Component 2) (Matrix 4)"
},
"CFGAS": {
"category": "SUMMARY_WELL_COMPLETION",
"category": "SUMMARY_WELL_CONNECTION",
"description": "Gas Flow Rate"
},
"CPDIAM": {
"category": "SUMMARY_WELL_COMPLETION",
"category": "SUMMARY_WELL_CONNECTION",
"description": "Perforation Diameter"
},
"FDG": {
Expand Down Expand Up @@ -1116,15 +1116,15 @@
"description": "Liquid Injection Total"
},
"INFLOW0": {
"category": "SUMMARY_WELL_COMPLETION",
"category": "SUMMARY_WELL_CONNECTION",
"description": "Inflow Rate (Component 0)"
},
"INFLOW1": {
"category": "SUMMARY_WELL_COMPLETION",
"category": "SUMMARY_WELL_CONNECTION",
"description": "Inflow Rate (Component 1)"
},
"INFLOW2": {
"category": "SUMMARY_WELL_COMPLETION",
"category": "SUMMARY_WELL_CONNECTION",
"description": "Inflow Rate (Component 2)"
},
"MEMORYTS": {
Expand All @@ -1136,7 +1136,7 @@
"description": "Number of Tracer Linear Iterations at the Current Time-Step"
},
"MSDEPTH": {
"category": "SUMMARY_WELL_COMPLETION",
"category": "SUMMARY_WELL_CONNECTION",
"description": "Depth of Well Completion"
},
"MSUMCHOP": {
Expand Down
Loading
Loading