Commit Graph

1608 Commits

Author SHA1 Message Date
jonjenssen
54e901b79b Set default depth filter type to "between" 2023-05-08 07:38:11 +02:00
Kristian Bendiksen
c8b402651d Add "Decline Curves" functionality.
Adapted from formulas here:
https://petrowiki.spe.org/Production_forecasting_decline_curve_analysis
2023-05-05 15:30:48 +02:00
Jørgen Herje
342f191288
Add filtering/exclude of rows in SummaryTable (#10193)
- Add selector for excluding rows in table
- Row selection is based on category, vector, threshold
- Move data containers to utils class
- TreeSelectionEditor: Add context menu to invert selection
- Improved naming of menu items
- Guard plotDefinition before connect signal/slots

---------

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-05-02 11:18:45 +02:00
Magne Sjaastad
bb0ae9e381
Add optional download of binaries in build
* #10202 Download and use binaries as part of a build
2023-05-01 18:44:05 +02:00
Magne Sjaastad
3bca1507b2 Fix launch of unit tests 2023-04-28 15:20:02 +02:00
Jørgen Herje
6205418dde Fix warning for conversion from std::vector to QStringList 2023-04-28 15:09:31 +02:00
Jørgen Herje
862e67755a
Add Python support for import of property files for .roff and .grdecl (#10183)
- Add RimcEclipseCase
- Add tests for import case properties (.roff and .grdecl)
- Make rips handle list of strings as input in Pyton API
2023-04-27 10:53:33 +02:00
Magne Sjaastad
f3faf4642a Avoid out of bounds value access in vector 2023-04-27 10:24:13 +02:00
jonjenssen
f4cf143401
Import SEG-Y files by converting to VDS (#10175)
* Add seg-y import GUI
2023-04-27 01:32:59 +02:00
Jon Jenssen
c86ce05f9a Add fullscreen button/shortcut to 3d window 2023-04-26 17:05:05 +02:00
Magne Sjaastad
0907f57de9
Use target_include_directory
* Fwk: Avoid use of include_directories
* Remove target_include_directories from Commands
* Refactor cmake includes
- Avoid using include_directories, and use target_include_directories.
- Use add_subdirectory directly from main cmakefile, do not use in ApplicationLibCode.
2023-04-25 13:14:26 +02:00
Kristian Bendiksen
26f13012b4 #10128 Reveal Summary: add ensemble import. 2023-04-25 09:42:18 +02:00
jonjenssen
d8def3d986
OpenVDS should always be used (#10166)
* OpenVDS should always be used, remove optional defines
2023-04-24 18:23:31 +02:00
Kristian Bendiksen
9949e84420 #10129 StimPlan Summary Ensemble: Simplify paths 2023-04-24 14:37:22 +02:00
Jørgen Herje
d7b2da35b0
Fix bug selected well log file for source well (#10159)
Did not use selected well log file in dialog for source well when generating depth adjusted las file - chose first las file available for source well.
2023-04-24 13:31:19 +02:00
Kristian Bendiksen
350db4d6a9 #10130 Reveal summary import: convert to Eclipse units. 2023-04-24 13:02:57 +02:00
Magne Sjaastad
f8c1eebe01 Use AABB tree to speed up fault distance calculation 2023-04-24 12:40:25 +02:00
Magne Sjaastad
10adcbc082 Disable warnings on MSVC when including HDF5 2023-04-24 12:40:25 +02:00
magnesj
88ef79c1a1 Fixes by clang-tidy 2023-04-23 08:10:28 +02:00
jonjenssen
13dd472a0d Workaround to make sure seismic data item gets selected after importing seismic data. 2023-04-22 00:39:47 +02:00
jonjenssen
dea931cb25 Hide seismic section folder in views if no seismic data is loaded 2023-04-21 20:19:34 +02:00
jonjenssen
0e7cf49b17
OpenVDS seismic access (#10145)
Add OpenVDS support for reading seismic data from VDS files
2023-04-21 16:38:04 +02:00
Jørgen Herje
25e78e9792
Fix incorrect detection of first and last timestep in vectorData (#10143)
- Incorrect sorting was due to incorrect detection of first and last timestep for vector data.
- First/last timestep is for value above 0.0 and not threshold.
2023-04-21 13:48:57 +02:00
Jørgen Herje
0d8aee8995
GRDECL: Import multiple grid files from dialog (#10142)
Add import of N .GRDECL grid files - as done for roff-files
2023-04-21 10:34:29 +02:00
Jørgen Herje
93ab49cf02 Add RiuMenuBarBuildTools for creating default/common menus and actions
- Create tools for building default menus and actions across main windows
- Make menus as equal as possible with default creation,
2023-04-20 16:04:59 +02:00
Kristian Bendiksen
ff209ad7c2
Refactor ensemble import dialog
* #9773 Refactor ensemble import dialog.
* #9773 Add support for ensemble import of StimPlan/Reveal summary data.
* #9773 Add method for finding min and max time steps.
* #9773 Add option for resampling to hour intervals.
* #9773 Add option for resampling to minute intervals.
* #9773 Ensemble statistics: determine sub-sampling period dynamically.
* Use RiaWeightedMeanCalculator for curve resampling.
* Add HOUR and MINUTE to date time app enum.
* #9773 Generate better ensembles for StimPlan summaries.
* #9773 Fix parameters.txt lookup for StimPlan summaries
* Refactor: Improve interface of RicImportSummaryCasesFreature::createSummaryCasesFromFiles

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-04-20 10:16:43 +02:00
Jørgen Herje
67264da0a8
Roff: support import of N grid files and 1 grid file with N property files
* Add utility to check is roff file contains grid data

* Import of multiple grid files or 1 grid file with N property files

* Fix build errors for using RifRoffFileTools from Commands
- Move template implementation to cpp-file
- Add roffcpp to link libraries in CMake for Commands

* Improve/fix import of single grid file with N property files

* Fix missing add of roff case Id
2023-04-19 15:52:57 +02:00
Magne Sjaastad
643ccd67b8
Improve ensemble curve colors
* Use unique_ptr
* Improve default assignment of curve appearance
* Improve display of color tags in tree view items
* Select curve or ensemble instead of plot
* Only change curves connected to a Rim-object

* Improve color management for ensemble curves
Use a base color for statistics curves and set realization curves transparent
Make sure new curves are assigned a unique color
Harmonize how dropped addresses are handled

* Update all tags always
The update of tags for a subset of tree nodes is currently broken. Always update all tags.

* Add const
2023-04-19 15:36:06 +02:00
Kristian Bendiksen
d11f51fcae Refactor: extract Allan diagram computation. 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
9b78826f03 Refactor: extract cell volume computation. 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
6a37c5a5d0 Refactor: extract oil volume computation. 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
07eb1e9f4e Refactor: extract I/J/K index computation. 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
89dca9eec9 Refactor: extract mobile pore volume computation. 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
be12016128 Refactor: extract fault distance computation 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
5a64e90103 Refactor: extract Soil computation. 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
cc0691f48c Use correct OpenMP directive for INDEX_I/J/K results. 2023-04-19 15:00:56 +02:00
Kristian Bendiksen
eb88cca7e8 #9858 Compute distance to closest fault for each cell (FAULTDIST). 2023-04-19 15:00:56 +02:00
Magne Sjaastad
d4f11e0f8f
WBS-plot: Add optional support for maximum curve interval for UCS parameter curve (#10118)
* WBS-plot: Add optional support for maximum curve interval for UCS parameter curve
* GeoMech: Guard out-of-bound access to Pore pressure data
2023-04-19 07:16:13 +02:00
Magne Sjaastad
b7f8d0e0f1
Increase warning level
* Set warning level to /W3 for MSVC to catch more warnings
* remove several excluded checks for clang
* removed several unused variables
* Hide warnings qwt
* add missing parentheses in logical expressions
* Remove double check on same logical expression
2023-04-17 15:57:39 +02:00
Jørgen Herje
0f0cc4c5a8 Implement doRenderWindowContent
Note: Not tested!
2023-04-17 14:50:53 +02:00
Jørgen Herje
cfca0ac665 Guard -1 for timeStepIndex
- Guard -1 from getTimeStepIndex
- Guard indexes < 0 in general usage
2023-04-17 14:50:53 +02:00
Jørgen Herje
c7b915c141
Replace RifRoffReader code to utilize roffcpp::reader (#10098)
- Replace current content if RifRoffReader to utilize roffcpp
- Remove unit tests not applicable for function (some previous tests now belongs to roffcpp)
2023-04-17 09:45:14 +02:00
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
Magne Sjaastad
706c8a5266
Use clang-tidy-15
Update clang-tidy.yml to use clang-tidy-15 to be able to support c++20

Do not use OpenMP, as omp.h is not found during parsing

Remove modernize-use-nullptr, as this does not work with <=> (spaceship operator)
https://reviews.llvm.org/D95714
2023-03-21 10:02:03 +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
Magne Sjaastad
37abe17582 Fix multiple defined symbols for unity build 2023-03-20 12:02:23 +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
2d54b45231 Janitor: Remove unused includes. 2023-03-20 08:58:42 +01:00
Magne Sjaastad
26c8883761 Prepare release 2023.03.0 2023-03-16 06:44:32 +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
jonjenssen
a926421825 Disable horz. scrollbar for legends 2023-03-14 23:12:06 +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
40c329f3ac Fix selection of multiple pressure/depth sources in plot
Use spaceship operator to fix issue for multiple pressure/depth curves

It was not possible to show two pressure/drop curves at the same time. This was caused by inconsistent implementation of operator< and operator==. Implement operator <=> to simplify the code.
2023-03-13 16:09:01 +01:00
jonjenssen
c8ebca6041 Less spacing between legend items 2023-03-13 14:49:11 +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
4389b15e37 Reduce space around legend texts for better visuals. 2023-03-11 14:16:25 +01:00
jonjenssen
ad94dd9d97 Add user scaling values to view combobox 2023-03-10 19:43:37 +01:00
jonjenssen
e70cc85db6 Add a few more tiny scales. Allow user to input doubles in preferences. 2023-03-10 19:43:37 +01:00
jonjenssen
4f9cbe8e97 Guard nullptr 2023-03-10 14:07:51 +01:00
Magne Sjaastad
74fa621332
File - Import: Add "Import Pressure Depth Data"
* #9944 Add "Import Pressure Depth Data"  to import menu
Remove obsolete *InMenuFeatures and set all actions in menu to enabled when the signal aboutToShow() is triggered. This is useful for menus where no selection/context is available.
* Use RiaApplication::enableDevelopmentFeatures() to control visibility
2023-03-10 13:20:39 +01:00
Magne Sjaastad
07a4c13dd4 #9913 Fix import of RFT pressure/depth 2023-03-10 13:20:08 +01:00
jonjenssen
4953b6abad Update default eclipse layout 2023-03-09 18:11:45 +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
jonjenssen
1d00b38638 Add missing depth columns in show plot data if multiple curves 2023-03-08 18:18:03 +01:00
jonjenssen
ae977975c8 Make sure NaN values are in Y data, too, to keep good plot performance. 2023-03-08 17:37:19 +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