Commit Graph

1663 Commits

Author SHA1 Message Date
Magne Sjaastad
308c697feb Add missing disableIO to proxy fields 2023-06-03 15:01:06 +02:00
Magne Sjaastad
9a159cc02d Performance: Property filter on a time step difference case is slow #10339 2023-06-02 16:34:21 +02:00
Magne Sjaastad
709457f7c2
About text: Add Python version
#10224 About text: Add Python version
2023-06-02 14:04:23 +02:00
Kristian Bendiksen
ca4d05dec9 Regression Analysis: Add logarithmic, exponential and logistic regression. 2023-06-02 11:32:23 +02:00
Magne Sjaastad
d702b7a5d4
Use dark title bar for dark theme on Windows 2023-06-02 10:47:10 +02:00
Kristian Bendiksen
851cb69f8b #10331 Roff property import: Add support for BYTE data type
Fixes #10331.
2023-06-02 10:31:36 +02:00
Magne Sjaastad
f091a6237f
Support multiple RFT observation files
Add support for date on format yyyy-MM-dd
Support observations in multiple files
2023-06-02 09:32:47 +02:00
Magne Sjaastad
fc51bf84a5 Make sure one case is loaded when both SMSPEC and ESMRY is present in same folder 2023-06-02 07:52:35 +02:00
Magne Sjaastad
24ccbf395d
Adjust dark theme
- Disable custom CSS for advanced docking system
- copy and adjust stylesheet into default/dark qss
- Use #999999 for fill color in svg images
2023-06-02 07:28:45 +02:00
Kristian Bendiksen
06d107c4e6 #10320 Ensemble Summary Import: wrong realization name when importing single realization 2023-06-01 08:49:26 +02:00
Magne Sjaastad
0e25f364f8 Fix build issues MSVC 17.6.2 2023-05-31 12:49:01 +02:00
Kristian Bendiksen
e1784bb37a #10322 Fix crash when creating tornado Plot crash on ensemble with single realization
Fixes #10322.
2023-05-30 15:58:48 +02:00
Kristian Bendiksen
9745b48643 Reveal Summary Data: Fix incorrect auto curve name.
RiuSummaryQuantityNameInfoProvider does not provide long names for Reveal
summary vectors. Use the vector name instead of the long name for these
cases.
2023-05-30 15:58:27 +02:00
Kristian Bendiksen
9719390130 Janitor: remove unecessary disabling of auto formatting 2023-05-30 15:58:27 +02:00
Magne Sjaastad
bd1fbcf45a
VFP-plot: Wrong X-axis label for Gas Injection Rate
* Use text "Gas/Liquid Flow Rate" 
* Use Sm3/day as unit for Flow rate
2023-05-30 15:57:29 +02:00
Magne Sjaastad
a9f412b1f6
Maintenance fixes
* Remove light mode from theme selection
The light mode is not working well, and was intended to be used when exporting to pdf from dark mode.

* Allow direct edit of summary case name
The name for a summary case can be automatically created. If the user starts to edit the name manually, set the name option to Custom. Make the descriptionField available as not read-only, then it is possible to edit the name directly in the project tree using F2 or double-click.

* Allow drag of ensembles
* Add support for drag/drop of well segments
* Add support for well segment number stepping in toolbar
2023-05-30 15:56:19 +02:00
Jørgen Herje
5975fe6765
Rename RimWellLogDiffCurve to RimWellLogCalculatedCurve and additional improvements
* Rename from DiffCurve to CalculatedCurve and add operators selection
* Add option to select depth source for resampling in CalculatedCurve

- Select source for depth values for resampling
- Depths from first curve, second curve or union of these
- Added unit tests for function creating union depth values and calculate value with selected operator.

* Guard divide by zero

* Adjust algorithm for union of depths

- Prevent duplicated depth values (no need for enter/exist of k-layer when resampling)
- Add threshold for depth distance
- Update unit tests
2023-05-27 10:30:03 +02:00
Kristian Bendiksen
a3efc16615 StimPlan Model: Provide default value for facies 2023-05-26 12:32:43 +02:00
Magne Sjaastad
cca852ef1f
Adjustments related to user course
* #10285 Grid Cross Plot: Fix group highlighting
* #9329 Make Show plot data more robust
* Do not show the curve color tag for grid cross plot curves
* #10310 Add tab to show plot data for well log curves
2023-05-26 11:47:26 +02:00
Magne Sjaastad
b7420ebc70
Use rock type colors when "Facies" is imported 2023-05-26 11:26:22 +02:00
jonjenssen
f17c02ce86
Add step support to range text format (#10311)
* Add step support to range text format
* Add step support to integer selection filter
2023-05-26 08:59:13 +02:00
jonjenssen
1063d7f3d3
Add support for K filter to polyline intersections (#10302)
* Add support for K filter to polyline intersections
2023-05-25 08:14:43 +02:00
Jørgen Herje
fe5c24ef5d
Fix bug and refactor createResampledValuesAndDepts in RigWellLogCurveData (#10301)
- Fix bug for resampling, prevent index increment.
- Refactor functions into static functions.
- Fix issue in interpolateSegment not using correct indices for depthType != resamplingDepthType
- Add unit tests
2023-05-24 15:07:43 +02:00
Magne Sjaastad
473f1bebcd #10281 Make sure missing data is marked with NULL
If an ensemble do not have data for some realizations, Show Plot Data reported wrong data when resampling was activated. Display of data for No Resampling was correct.
2023-05-24 15:01:59 +02:00
Magne Sjaastad
fc8235aeca #10035 Make sure segment summary is present in plot editor 2023-05-23 19:45:45 +02:00
Magne Sjaastad
2776012bce #7134 Create modelled well path from well path
From an existing well path, find some coordinates along the geometry and create a new modelled well path based on these coordinates.
2023-05-23 12:13:53 +02:00
Kristian Bendiksen
94f7bd3c1a
10214 ensemble appearance
* Regression Analysis: Use only positive values for Power Fit regression.

* Add visible tag short cut for changning curve color.
* #10214 Ensemble Curve Set: Fix color mode text.
* #10214 Ensemble: Switch P10 and P90 symbols to point towards mean.
* Cache hit rects for tree item tags.
* #10214 Ensemble curve set: allow reordering with tree view tag
* #10214 Keep curve legend text when ensemble curves are hidden
2023-05-23 08:10:35 +02:00
magnesj
329a199863 Fixes by clang-tidy 2023-05-23 02:07:04 +00:00
Magne Sjaastad
40080a99de
9978 Improve UI for long drop-down lists, use tree selection more
* Improve tree selection editor
- always call defineEditorAttributes
- use heightHint in editor attributes 
- use tree selection editor as default editor for std::vector

* Use tree selection editor instead of list selection editor
List selection editor must be used when editing std::vector<cvf::vec3d> and similar. Replace other use of list selection editor with tree selection editor.

* Set checked state based on text string for integer only models
For models with only integer values, use text string to define the items to be selected. The full list will always be visible, and the checked state will be updated when editing the filter text.

Example: "1, 5-7" will set items 1, 5, 6, 7 checked and all other items unchecked

* Minor fixes
- Set placeholder text after content is added (to ensure correct data type)
- Fix check of integers. `canConvert<int>()`returns true for both QString and int. Thus convert to string and then check for int conversion.

* Activate filtering when unchecking all items in list with only integers
- Reactivate filtering when uncheck of all items for a list with only integer values (to keep consistency between filter and list)
- Update function name for clarity

---------

Co-authored-by: Jørgen Herje <jorgen.herje@ceetronsolutions.com>
2023-05-22 15:44:37 +02:00
Jørgen Herje
2247dced58 Update naming and imports
- Correct naming
- Update includes
2023-05-22 15:42:24 +02:00
Magne Sjaastad
ee724633b5
Category legend improvements
* Show text after value in category legend
* Use integer slider for category results
* Do not allow min larger than max and max lower than min
2023-05-22 15:41:48 +02:00
Jørgen Herje
b83fe73395
Displacement curves fault faces (#10243) 2023-05-22 11:37:57 +02:00
Kristian Bendiksen
eb0f2207b5 #10268 Regression Analysis: Improve text generation code. 2023-05-19 20:00:12 +02:00
Kristian Bendiksen
dc3530ac0b Regression Analysis: Report R-squared (confidence of determination). 2023-05-19 20:00:12 +02:00
Kristian Bendiksen
6a56149d84 #10268 Regression Analysis: add copyable expression text 2023-05-19 20:00:12 +02:00
Kristian Bendiksen
b965153ab0 #10268 Fix show plot data names for decline and regression curves 2023-05-19 20:00:12 +02:00
Kristian Bendiksen
a3090c5ead #10268 Regression Analysis: improve default look of curve 2023-05-19 20:00:12 +02:00
Magne Sjaastad
f4dd1d363d
Add prefix to cmake options
Add missing RESINSIGHT_ prefix to cmake options
GHA: Fix warnings
2023-05-19 15:03:04 +02:00
Magne Sjaastad
451254bc84 #10273 Set default value for "Immport Advanced MSW Data" to true 2023-05-16 13:12:57 +02:00
Kristian Bendiksen
6b333c1dd9 #10209 Plot: fix html axis title
Qwt uses Qt::mightBeRichText to determine if the axis title is rich text or not.
Qt::mightBeRichText is a simple heuristic which checks whether there is something
that looks like a tag before the first line break. See:
https://doc.qt.io/qt-6/qt-sub-qtgui.html#mightBeRichText

Fixed bug by using html br tag to have at least some html before breaking the line.

Fixes #10209.
2023-05-16 11:22:12 +02:00
Kristian Bendiksen
c23cdee17d #7206 Add regression analysis. 2023-05-16 09:42:18 +02:00
jonjenssen
26275f7924
Fix polygon cell filter crash for geomech case with mulitple parts (#10267)
* Fix polygon cell filter crash for geomech case with mulitple parts
2023-05-16 02:05:59 +02:00
jonjenssen
7451adb85b Enable intersection depth filter for geomech cases, too 2023-05-16 01:21:27 +02:00
Magne Sjaastad
54f0a832de
Janitor: Remove unused includes 2023-05-15 15:43:01 +02:00
jonjenssen
bab0a83856 Disable depth filter for GeoMech cases. 2023-05-15 14:48:49 +02:00
Magne Sjaastad
0c90f67dcc
Change API for PdmObjectHandle and PdmFieldHandle
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
2023-05-12 21:41:34 +02:00
Magne Sjaastad
37e29a0f68 Display all data if multiple fractures crosses a cell
- add the operator<=> for QString
- add operator<=> to fracture report item
2023-05-12 16:23:01 +02:00
Magne Sjaastad
2b0906c2ab Regression Test: Fix wrong flow diagnostics result
Fix regression introduced in 5ee764af48
2023-05-12 16:22:44 +02:00
jonjenssen
1d43e1a948
Specify part id for well extraction from geomech data (#10240)
* Specify part id for well extraction from geomech data
* Make sure we clear curve data if there isn't any valid input data
2023-05-12 08:13:56 +02:00
Magne Sjaastad
5ee764af48
Refactor result definition 2023-05-11 08:37:58 +02:00
Kristian Bendiksen
02ec71955b StimPlan Model: Improve logging for facies value/name mismatch. 2023-05-10 15:22:55 +02:00
Magne Sjaastad
3208abad19 Show category text in legend
Create empty string for standard legends. Show category text if present.
2023-05-09 15:07:52 +02:00
Magne Sjaastad
f70d2c4949
Add result type and create and use custom legend if possible
* Update submodule
* Use postfix functions and add custom color legend

* Add type to RigEclipseResultAddress
Read types from ROFF and create default legend based on type or custom created legend.

* Use caseId to connect legend configuration to result in a case
2023-05-09 11:41:56 +02:00
jonjenssen
8c91f1b1ac Fix typo in field name 2023-05-08 19:07:23 +02:00
jonjenssen
00e533ab10 Skip bounding box check when drawing seismic outline, as it could go far above reservoir 2023-05-08 17:30:24 +02:00
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