Commit Graph

1021 Commits

Author SHA1 Message Date
Magne Sjaastad
6f6dc80bc6
Added more clang-tidy checks
Improved GitHub Action to run clang-format as part of clang-tidy

* Simplify clang-tidy workflow
* Added modernize-use-using, modernize-redundant-void-arg, readability-static-accessed-through-instance
* Add nolint for libecl typedefs
2023-04-14 14:07:45 +02:00
Jørgen Herje
457dc9080f
Refactor classes in RigWellResultPoint.h
* Move RigWellResultFrame implementation into separate file
Update/correct includes accordingly

* First step of moving attributes from public to private
- Move public members to private and create interface
- Single public member remains due to strong dependency on usage of reference and reference to its object public members

* Second step of moving attributes from public to privatee
- Remove usage of reference directly to attributes. Interface with copy and set.
- Moving attributes in RigWellResultFrame and RigWellResultBranch

* Move class RigWellResultBranch into separate file
2023-04-14 11:00:45 +02:00
jonjenssen
dc4d4022d2
Sync seismic section with well path changes. (#10090)
* Sync seismic section with well path changes.
* Make sure we pick seismic textures/coordinates that fits the z steps of the seismic data.
2023-04-14 10:49:05 +02:00
Jørgen Herje
7427e7b6e9 Fix tracer selection issues 2023-04-14 08:32:17 +02:00
jonjenssen
2e955f2875
Seismic support improvments (#10086)
Adds support for creating seismic sections from well paths and existing intersections.
Adds more stability and user improvements
2023-04-13 13:18:34 +02:00
Magne Sjaastad
952e766c2f
Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +02:00
Magne Sjaastad
310b54ef93 Remove test code related to producer/injector table plots
This code caused legend config to be reset to 1 number of levels.
2023-04-11 10:16:43 +02:00
jonjenssen
fdef535284 Add missing include to fix build on ubuntu 22 2023-04-06 17:14:30 +02:00
Magne Sjaastad
e8f6d4819f Make sure file paths are resolved before initAfterRead() is called 2023-04-03 16:08:40 +02:00
Magne Sjaastad
b2e8cc1663
Add optional max distance between curve points in WBS plots 2023-03-31 16:27:14 +02:00
Jørgen Herje
c40b400346
Improve filtering by 3D view for Producer/Injector Connectivity Table (#10027)
- Calculate by visible cells: Calculate flow diag by use of visible cells in 3D view (already existing functionality).
- Filter producers: select producer wells based on visibility in 3D view. Synch connected injectors - even if they are not visible in 3D view.
- Filter injectors: select injector wells based on visibility in 3D view. Synch connected producers - even if they are not visible in 3D view.
2023-03-31 10:04:17 +02:00
jonjenssen
1299af401b
Add seismic result info in 3D view (#10032)
Add seismic result info in 3D view and selection in tree
2023-03-29 14:08:45 +02:00
Magne Sjaastad
173a66a409
Fix type conversion error
Weird conversion error seen for Unity build on MSVC. Single file compile works fine.
2023-03-24 18:32:16 +01:00
Magne Sjaastad
ab0b958884 Well Targets: Add scaling factor for well targets 2023-03-24 15:37:30 +01:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010)
Add basic seismic section support to eclipse and geomech views.
2023-03-24 15:36:10 +01:00
magnesj
71a418dc78 Fixes by clang-tidy 2023-03-24 09:03:29 +01:00
Magne Sjaastad
b21c7028c2 #10002 Do not replace '.' with the current project path
When starting resinsight from a working folder, the project file paths can be relative to this folder (current working folder). If files are referenced relative to current working folder, the file references can start with either '..' or '.'  Make sure that these paths are left unchanged.
2023-03-23 15:45:45 +01:00
Magne Sjaastad
6529b1760d #10003 Use auto-value features only for RimSummaryPlot 2023-03-23 15:45:30 +01:00
Jørgen Herje
36e01523cb
Summary table (#9997)
Summary Table for showing summary vectors in table format
- Resampling on date resolution
- Active for group, region and well
- Right click menu option from Summary case tree
2023-03-23 14:10:30 +01:00
github-actions[bot]
d9ba01b927
Fixes by clang-tidy 2023-03-23 07:11:24 +01:00
Jørgen Herje
4f73995947 Use use CoboBoxDown/Up svg icons 2023-03-22 15:52:54 +01:00
Jørgen Herje
a42a17bf10 Add icon and hide children in tree for Well Connectivity Table 2023-03-22 15:52:54 +01:00
Jørgen Herje
0fcbba6795 Add icon for WellAllocationOverTimePlot 2023-03-22 15:13:19 +01:00
Magne Sjaastad
911f260d0f Improve robustness of well flow calculator 2023-03-21 18:48:55 +01:00
Jørgen Herje
535811cc4f
Producer/Injector Connectivity Table (#9928)
- Crated new RimMatrixPlotWidget to show table data
- Create RimWellConnectivityTable for showing Producer/Injector connectivity table data
- Rename RimWellAllocationOverTimeCollection to RigWellAllocationOverTime for well allocation over time data storage
- Created heatmap color palette
- Move utils from RimWellAllocationOverTimePlot to RiaQDateTimeTools
- Create RimFlowDiagnosticsTools for producer/injector well utility functions


---------

Co-authored-by: jorgenherje <jorgenherje@users.noreply.github.com>
2023-03-21 08:32:38 +01:00
Kristian Bendiksen
b541acdcb1 #9773 Import data from Reveal and StimPlan as summary case. 2023-03-20 08:58:42 +01:00
Kristian Bendiksen
245d483036
Summary observed data
* #9966 Summary calculations: add support for imported vectors.
* #9966 Summary Calculation: add support for imported and observed data.
* Summary Address: avoid extra level in tree for imported data.
* #9966 Update observed data when calculation is updated.
2023-03-15 13:39:57 +01:00
Magne Sjaastad
26416c8937 Make sure old project files loads as before 2023-03-15 10:53:08 +01:00
Magne Sjaastad
27959b9d13 Reintroduce RimGridSummaryCase to be able to read existing project files 2023-03-15 06:49:14 +01:00
Magne Sjaastad
09c04cbcd0
Improve RFT reader performance
* #9963 Rft reader: Search for DATA file when required
WSEGLINK is used to establish the branch topology for MSW wells. Search and read WSEGLINK data when segment data is requested by the user. This can be a time consuming operation.
Avoid doing this search for standard RFT plots.

* Make sure that single summary curves are displayed correctly
* Make sure single summary curves are visible in the plot
2023-03-14 13:14:40 +01:00
Magne Sjaastad
064c0adb8c #9956 Summary Plot: Fix update of operations on multiple ensembles
When multiple ensemble curve sets are toggled on/off, it is required to do a full RimSummaryPlot::loadDataAndUpdate() that will call RimEnsembleCurveSet::updateCurves() on all ensembles in the plot. This can be a heavy operation, but will happen only once.
2023-03-13 19:33:36 +01:00
Magne Sjaastad
9b4a3f663e
Release adjustments
* Add CON*RAT track for tubing branch
* Set long summary vector name as default, and allow both in curve name
* Use line shift if multiple quantities are present on axis title
Insert line shift if multiple quantities are present, otherwise insert space between individual vector names and the unit text.
* Move Groups between Field and Wells
* Bump version
2023-03-13 19:01:31 +01:00
Magne Sjaastad
eb5a0cf936 Add reload and delete of pressure/depth data 2023-03-13 16:09:20 +01:00
Magne Sjaastad
ab44f9fa17 Add open in text editor feature 2023-03-13 16:09:20 +01:00
Magne Sjaastad
836822c2b9
Adjustments for release
* Show segment plots in Well Log Plot collection
* Improve menu text for operations related to segment plots
* Show reservoir rates for annulus and device
* Make sure curve objects are visible in the Project Tree
* When importing the first summary case, expand case in project tree
* Bump version
2023-03-13 08:10:33 +01:00
jonjenssen
087968e7f7 Ui update 2023-03-11 14:16:25 +01:00
jonjenssen
3772fbac79 Turn off statistics curve legends by default and add option to turn them on, 2023-03-11 14:16:25 +01:00
jonjenssen
4f9cbe8e97 Guard nullptr 2023-03-10 14:07:51 +01:00
Magne Sjaastad
f5171310bf
Add option for word wrap in label and checkbox
* Add support for word wrap in checkbox label
* QLabelEditor: Add word wrap and support for wide label
Add support for one label widget spanning the area usually consumed by a label widget and an editor widget.
* Use word wrap in summary calculation dialog
2023-03-09 12:46:55 +01:00
Magne Sjaastad
527743a845
Adjustments for release
* Make sure text for multiple wells in same grid cell is displayed correctly
* Improve selection of result in Advanced Snapshot Export
* Restore the main window that was on top when project was saved
* Trim string to make sure '/' is exported with no space in front
* #9872 RFT-plot: Make colors stable for curves in RFT plots
* Set version to RC_02
2023-03-09 08:54:28 +01:00
Magne Sjaastad
e2e239fd07
Several RFT plot adjustments
* #9923 Call loadDataAndUpdate() after visibility of curves is updated
This will ensure that all zoom ranges are recalculated based on visible curves.

* #9923 Put new segment plots in RFT Plot collection
* #9923 Add "Create Rft Sement Plot" to RFT plot collection
* #9923 Make sure the main window is displayed when required
Make sure the main window is opened and views updated when a grid model is opened from a summary case.

* #9923 Make sure fieldChanged is triggered when required
Exclude field having the target state. If these fields are included, the one and only call to setValueWithFieldChanged() can contain a field with the target state value. When setting a value to a field with the same value, nothing happens and the UI will get an inconsistent state (some curves toggled off are still visible in a plot).
2023-03-08 07:35:27 +01:00
Magne Sjaastad
51331facac
Improve how wells are connected during import
When importing new wells, consider all wells when connecting multi segment wells
Make sure that import of individual well paths will give the same ordering as importing all wells in a single operation.
2023-03-07 12:51:14 +01:00
Magne Sjaastad
fc7bde8d35 #9879 Add icon for calculated summary vectors 2023-03-07 07:48:12 +01:00
Magne Sjaastad
70c1a2c064 Guard null pointer access 2023-03-06 15:57:20 +01:00
Magne Sjaastad
c248c9fb57
RFT segment plot adjustments (#9912)
* Delete RFT plot when associated case is deleted
* Rename
* Hide track/curves with no data
2023-03-06 14:34:22 +01:00
Magne Sjaastad
8f786fed5d #9914 Fix import of single case already present in ensemble 2023-03-06 10:45:49 +01:00
Magne Sjaastad
9bc3659584
Remove special summary case connected to a grid model
* Remove use of RimGridSummaryCase
* Remove unused summary plot filter text
* Delete unused files
2023-03-03 15:28:34 +01:00
Magne Sjaastad
d47d4060cc
Add valve visualization to MSW wells
* Refactor geo generator
* Add valve visualization to segments that are connected to a valve
2023-03-02 13:06:38 +01:00
Magne Sjaastad
d2f435c00a
Improved simulation well visualization
* Move members to private in RigWellResultPoint
* Create simulation well path geometry using well topology
* Add separate MSW well pipe centerline computations
* Review comments

---------

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2023-02-28 16:06:37 +01:00
Jon Jenssen
9b12885c23 Enable filter when picking is done. 2023-02-28 14:43:06 +01:00
Magne Sjaastad
ee0a969d07 Add missing include 2023-02-27 13:36:41 +01:00
Kristian Bendiksen
42c4e4a0c4
Summary calculation data sources fixes
* File Summary Case: set up multiple readers correctly for multithreaded configuration.
* Summary Data Sources: fix sorting of vectors.
2023-02-27 11:17:45 +01:00
Magne Sjaastad
f8c5cf389f
clang-format: Set column width to 140
* Set column width to 140
* Use c++20
* Remove redundant virtual
2023-02-26 10:48:40 +01:00
Magne Sjaastad
8768e186d8
#9671 summary calculations for summary items
* Summary Calculation: use shorter name in title
* Sort summary addresses to group calculated results last.
* Summary Calculation: add option to distribute calculation to other items.
* Add support for summary calculation for RimGridSummaryCase.
* Use short name for calculations in plot titles.
* Update ensembles in Data Sources when calculation is added.
* Summary Calculation: allow drag-and-drop of ensembles
* Summary Plot: fix axis range aggregation for calculated ensemble addresses.

---------

Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2023-02-26 08:08:06 +01:00
Kristian Bendiksen
69a668df50 Simplify RifSummaryReaderInterface timeSteps. 2023-02-24 10:03:16 +01:00
Jørgen Herje
5c5e460025
Realization in Ensemble RFT-plot hover info + refactoring of point tracker functionality
* Add realization number to mouse over text for Ensemble RFT

* Refactor Curve Info Text Provider functionality

- Refactor provider implementation, to separate RiuWellLogTrack from the point tracker and text provider.
- Move creating of point tracker outside of RiuWellLogTrack.
- Makes it possible to override/write new CurveInfoTextProvider implementation when needed.

* Add guards for nullptr
2023-02-23 15:08:22 +01:00
Jørgen Herje
0601de4c18 Prevent update of show statistics selection in source stepping
- Refactor code into two functions
- Do not update selection when performing source stepping
2023-02-23 07:40:27 +01:00
Jørgen Herje
a6ee41aaee Fix grouping of properties for date tickmarks 2023-02-20 16:04:57 +01:00
Jørgen Herje
dfb942cc97
Add custom tickmark configuration for Summary Plot (#9867)
- Added custom tickmark configuration in time axis properties for `Time Mode = Date` 
- Refactor code to separate handling of time axis properties and regular axis properties in RimSummaryPlot
- Add method for setting major ticks by use of list for RiuPlotWidget interface.
2023-02-20 14:45:16 +01:00
Magne Sjaastad
f0e78f32e8
Minor issues related to release
* Add shortcut for Plot Editor, and modify how command features are triggered
Use Ctrl-E to launch the Plot Editor.

* Add optional use of NOECHO and ECHO keywords in GRDECL files
* Add ECHO keywords to sector model export
* Add Help button to Preferences
2023-02-20 08:18:08 +01:00
Magne Sjaastad
345095185e #9859 PLT plot: Fix missing LAS data for regression test 2023-02-17 12:52:06 +01:00
Magne Sjaastad
ac9b9b2699
Fix regression test issues
* Fix eternal loop causing the application to hang
* Revert changes related to file well path introduced in 70bb22
* Use some iterations to find representative cells for computation of cell sizes
2023-02-16 20:05:12 +01:00
Magne Sjaastad
20439e1da9
Export Completion: Fix missing segments and connections for LGR grids
* Compute characteristic cell size based on active cells
* Compute cell face normal based on a suitable active cells
Using all cells as basis for face normal is fragile. Some models have highly distorted/twisted cells, but all active cells should be geometrically more stable.
2023-02-15 15:25:38 +01:00
Magne Sjaastad
70bb221162
Janitor issues
* Remove obsolete code
* Fix path modification of a relative folder
Replace start token '.' with file path to the project file to make sure that the path './wells/a-1h.dev' can be imported correctly.
* Add more logging when keywords are missing from import
2023-02-15 07:56:17 +01:00
Jørgen Herje
2e6268ff0a
Improve Grid Statistics Plot UI (#9831)
- Set default frequency enum to relative frequency [%]
- Set current view selected in filter by 3D view visibility by default
- Add labels for statistics data
- Add UI to change number of bins in histogram
- Add control of font size of axis values and axis titles
2023-02-13 09:59:29 +01:00
Magne Sjaastad
b3a56a9353
Add support for radial grids
* Update radial grid operations in submodule
* Optionally display cell center and cell corners when clicking on cell
* Add support for import of radial grids
* Modify node coordinates to match host cell
2023-02-10 12:39:13 +01:00
Jon Jenssen
62a455e35b Make sure we refresh tree when adding a curve. Add new curve to summary plot context menu, too. 2023-02-07 17:52:56 +01:00
Jon Jenssen
f5ee8d269a Rearrange order of source stepping options 2023-02-07 17:46:08 +01:00
Magne Sjaastad
9ae00177bf
Well measurement improvements
* Update 3D view and plot when measurement data is added
* #8625 Make visibility of measurement follow well path visibility
2023-02-07 17:44:47 +01:00
Magne Sjaastad
8028444018
GitHub Actions: Add apt mirror to make package download more robust
- Download of Ubuntu packages from Azure is unstable. Add mirror sites to improve reliability.
- Improve use of clang-format and include source code changes
2023-02-07 07:22:57 +01:00
Jørgen Herje
b1e94adffd Change to point to point for Accumulated Flow Volume Percentage 2023-02-06 14:00:05 +01:00
Magne Sjaastad
cc21e2f3b4 #9147 Fix wrong curve name for summary group curves 2023-02-02 13:42:44 +01:00
Magne Sjaastad
ec611a9a3a #9780: Compare axis unit text case insensitive 2023-02-02 07:25:43 +01:00
Magne Sjaastad
b9f6662126 #9771: Guard nullpointer access 2023-02-01 13:44:06 +01:00
jonjenssen
33e908dd94
Avoid progress window staying behind on Linux when loading summary data (#9774)
Adjust progress info usage in summary file loading
2023-02-01 08:46:22 +01:00
Magne Sjaastad
82b538719e Remove unused variable 2023-01-30 16:33:12 +01:00
Magne Sjaastad
234719aea3
Improve RftPlt data source objects (#9769)
Move AppEnum init to RifDataSourceForRftPlt
Simplify constructors for RifDataSourceForRftPlt
Rename enum names in RifDataSourceForRftPlt::SourceType
Add missing pressureDepthData in RimDataSourceForRftPlt
2023-01-30 11:12:26 +01:00
Bård Skaflestad
6eebd01bd4 Look Up Time Step Object Exactly Once
Using .contains() followed by .at() with the same argument will
perform the same map lookup twice.
2023-01-27 11:52:06 +01:00
Magne Sjaastad
62ce2b18e0
RFT improvements
* Avoid accessing nullptr
* remove unused function
* Allow RFT data from single summary case to be used in RFT plots
* #9736 Support horizontal plotting of LAS curves
2023-01-27 10:29:11 +01:00
Jørgen Herje
e3a347ccaa Invert default isCurveHighlightSupported flag for RimPlot
- Make default flag = false, thus highlighting must be activated
- To prevent unwanted logic for new RimPlot objects
- Activate highlighting for RimSummaryPlot, RimVfpPlot and RimCorrelationMatrixPlot
2023-01-27 07:14:40 +01:00
Jørgen Herje
8aff5b4694
Well Allocation over time adjustements (#9738)
- Add font size settings
- Move legend to right side of plot
- Set default selected time steps to time step count = 10
- When excluding time steps, duplicates rates from next valid time step onto excluded time steps
- Allow time step selection "Show all time steps" or "Time step count" for subset of time steps
- Allow excluding on the active set, i.e. all or subset, of time steps
2023-01-26 10:56:42 +01:00
Jon Jenssen
42a9fef2d3 Fix geomech reload issues 2023-01-25 16:12:10 +01:00
jonjenssen
b28832eccd
Support loading only last geomech frame (#9727)
Support option for loading only the last frame for each geomech timestep. Turn it default on for old projects.
2023-01-24 18:30:30 +01:00
Jørgen Herje
632107e77c
Move Reference Well functionality to WellLogExtractionCurve
* Remove reference well feature from plot objects
* Move Reference Well functionality to WellLogExtractionCurve
* Reset reference well selection if new selected well path equals ref
2023-01-23 15:07:48 +01:00
Jørgen Herje
50b1820b60
Create depth adjusted LAS files
* Add support for creating depth adjustment LAS files
* Add RiaDefine for LAS file depth property names
* Remove incorrect check in K-index Calculator

Co-authored-by: jorgenherje <jorgenherje@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-01-23 12:46:54 +01:00
Magne Sjaastad
ab165b0d72
Fix issues related to well bore stability plots
* Check if data is present
* Move plot update to geomech case
* Return empty vector if no data is present
2023-01-23 12:38:55 +01:00
jonjenssen
56dd33e762 Improve range filter slider gui 2023-01-20 17:16:33 +01:00
Kristian Bendiksen
53a80cd86a Fracture: show perforation length field in fracture for azimuth + user-defined perf length. 2023-01-20 13:31:51 +01:00
Kristian Bendiksen
eedda3fa40 Recompute completion type results when input values change. 2023-01-20 13:31:51 +01:00
Kristian Bendiksen
1eac9f8a1f #9620 Pressure/depth data: add user interface. 2023-01-19 09:00:05 +01:00
Magne Sjaastad
abc9e82ff5 System: Enable and use c++20
Enable c++20 in top level cmake. Keep c++17 for GrpcInterface, as the protoc tool does not work with c++20.
Several code adjustments to fix compiler issues.
2023-01-19 08:33:02 +01:00
jonjenssen
85f1b004cb
Geomech frames support (#9678)
Support for showing frames in geomech data.
2023-01-18 14:42:33 +01:00
Jørgen Herje
95202ad36a
Well allocation over time plot (#9655)
- Plot for showing well allocation over time. 
- Select time range
- Option to exclude time steps in selected range
- Possible value types: Flow rate, flow rate percentage, flow volume, accumulated flow volume, accumulated flow volume percentage
- Group small contributors into group "Others"
2023-01-18 09:18:00 +01:00
jonjenssen
14d4022ada
Add toolbar toggle button for showing displacements (#9677)
* Add toolbar toggle button for showing displacements
2023-01-13 20:21:55 +01:00
Magne Sjaastad
a2e73d7cee Move prepareForDelete() to Rim3dView 2023-01-11 12:30:06 +01:00
Magne Sjaastad
8e161a5c89
Stabilization fixes related to regression testing
* Added fmtlib to LicenseInformation.txt
* Add license info for roffcpp
* Regression Tests: Guard use of invalid bounding box
* Regression Test: Check if file is present before opening
2023-01-10 11:45:37 +01:00
Kristian Bendiksen
6b631b3d5a #9591 Janitor: remove unused parameter in RiuPlotWigdet::createPlotCurve. 2023-01-09 15:39:42 +01:00
Magne Sjaastad
fe181ed60e Guard use of pointers 2023-01-06 13:30:56 +01:00
Magne Sjaastad
752363a4b8 #9624 Add alphabetical and by value sorting 2023-01-05 12:14:49 +01:00
Jon Jenssen
10960ea2fa Add safeguard 2023-01-02 16:51:27 +01:00