Commit Graph

297 Commits

Author SHA1 Message Date
Magne Sjaastad
38bfa9ef1f
#9588 Accumulate N cells for AABB tree 2022-12-19 15:24:53 +01:00
Magne Sjaastad
a423ecf95f
Several OpenMP improvements
Several optimizations based on profiling of 20M grid model. These fixes will improve the largest performance issues, but there are still more operations that can be refactored.

* OpenMP: Use in fault geometry generator
* OpenMP: Use when computing statistics for result values
* OpenMP: Use multithreading on fault detection
* Add RiaOpenMPTools
* VizFwk: Use openMP for texture generation
2022-12-19 13:49:03 +01:00
Magne Sjaastad
e4c0b45b15 Improve the help for a calculation
Add help text and plus AND example


Improve help pages for calculator
2022-12-14 08:57:08 +01:00
Magne Sjaastad
bfae28b4b4 Avoid crash when exit from python is called when UI is running 2022-12-14 08:57:08 +01:00
Magne Sjaastad
5ec32f8613
Update text for curve names and plot titles when source data changes
* Update titles after dropping vectors into plot
* Do not replace _Name variables
* Make sure signals are wired when opening a project file
* Add auto name field and set default on
* Remove includes from header files
2022-12-09 08:46:36 +01:00
Jørgen Herje
278828b08f
Add reference well to well log extraction curve eclipse case (#9516) 2022-11-30 23:13:39 +01:00
Kristian Bendiksen
7065d5eaf4 #7839 Python: fix crash when stopping process 2022-11-28 14:14:44 +01:00
Magne Sjaastad
dfa1bc2cd0
Some fixes for new gcc/clang
Minor fixes for newer gcc/clang. These issues were seen when using ubuntu-latest (Ubuntu 22.04) on Github Actions.
2022-11-25 08:59:10 +01:00
Magne Sjaastad
82968ca1a9
Support linking of 2D intersection views
* Major refactor from RimGridView to Rim3dView
* Move view linker/controller functions to Rim3dView
* Add bitmask to define the content of a 3D view
* Link views based on matching content
* Enable bit mask operators at global scope
* Make it possible to use 2d intersection views as comparison views
* Fix crash when a view used as comparison view is deleted
* Move unlinking to Rim3dView

* Add options to snapshot only 3D views/plots as part of regression testing
* WBS plot: Improve default name, hide axis for some tracks
2022-11-24 10:46:54 +01:00
Magne Sjaastad
a74b168e03
Improve property linking
* Allow linking of property filters across cases with same IJK size
* Recalculate when grid is replaced
Find dependencies between calculations and order them accordingly
2022-11-22 10:22:17 +01:00
Jon Jenssen
10d5246644 Remove obsolete fault reactivation assessment feature 2022-11-18 16:13:26 +01:00
Magne Sjaastad
6a859e0860
Fix update issues related to fracture calculations
* Make sure property filter is updated when completion type is cleared
* Clear geometry cache in views to make sure geometry is recreated
* Calculate required input parameters to completion type calculations
* Recompute values when depth changes
2022-11-18 12:50:04 +01:00
Magne Sjaastad
46b364d0b0
RFT file improvements
* Guard null pointer access
* Delay open of RFT files until data is requested
When opening ensemble summary cases, the opening of RFT files can take some time. Avoid this by delaying the file open operation.

* Fix infinite update loop for RFT plots
* Avoid moving the tracker line when clicking in the plot
2022-11-11 10:07:27 +01:00
Magne Sjaastad
95813f510e
Summary Plot adjustments
* #9435 Do not auto update curve appearance during source stepping
* Update toolbar after vector is dropped into empty plot
* Use summary vector text in RiaSummaryDefines
* Fix missing update of curve color when curve is highlighted
2022-11-08 08:18:31 +01:00
Magne Sjaastad
a577545212 Allow well target list to consume available space 2022-10-31 18:52:45 +01:00
Magne Sjaastad
bbd0c5c67e
#4890 Window tiling 2022-10-31 13:26:26 +01:00
Magne Sjaastad
a33f651bcc
Depth Track Plots: Optionally show a line in all tracks
* #9378 Depth Track Plots: Optionally show a line in all tracks
* Use RiaDefines::Orientation
2022-10-24 16:24:51 +02:00
Magne Sjaastad
760bfaeec2 #9369 Curve Probing: Show data from other curves in tooltip text
Optionally show data from other curves in tooltip text when hoovering over a curve point
2022-10-18 07:22:56 +02:00
Magne Sjaastad
e7a486c802
Improve curve naming for plot and use in RFT segment plots
* Improve plot naming for depth track plots
* Move template text replace to string tools
* More data available for object template text
* Set plot visible and define default object name template text
2022-10-12 12:41:08 +02:00
Magne Sjaastad
5e184df670
Improve curve naming
* Add curve name template and handling of string variables
* Mark autoName as obsolete field
* Use key-value map to populate variable values
* Add curve naming methods Auto, Custom and Template
2022-10-11 14:02:46 +02:00
Magne Sjaastad
3f9f337e64 #9347 Well Log Plot : Add possibility to show depth axis in all tracks 2022-10-10 15:58:05 +02:00
Magne Sjaastad
89d7dd4561 Show branch ID range in addition to branch index 2022-10-06 10:32:44 +02:00
Magne Sjaastad
4a673b7cd5
Avoid crash when adding a grid case multiple times 2022-10-04 18:43:36 +02:00
Kristian Bendiksen
d0e9c454d3 #9325 Thermal Fracture: rename injectivity decline to injectivity factor. 2022-10-03 13:19:19 +02:00
Kristian Bendiksen
3dad3c65cb Thermal Fracture: Improve handling of result names and units. 2022-10-03 08:33:55 +02:00
Kristian Bendiksen
c2b5ab8d2c
#9307 Python: avoid assigning same port number to multiple grpc sessions
* Python: avoid assigning same port number to multiple grpc sessions
* Add retry count when checking for port number file
* Use grpc to find and use port number
* Add test used to start several instances of resinsight at the same time
Testing up to 50 instances works well

* Python: allow launch_port == 0 to assign port by GRPC in Instance.launch().
Also allow longer wait before failing the port number file reading:
it can take some time to launch when launching lots of instances at
the same time.
2022-09-26 14:19:21 +02:00
jonjenssen
17a391cdba Fix crash if only plot window is open and you change i.e. the font size in preferences 2022-09-15 17:54:26 +02:00
Magne Sjaastad
c734a22bd6
Improve user interface for axis linking
Several adjustments to UI as discussed with Håkon and Alireza.

* add link/unlink command to right-click menu of axis
* select curve in project tree when clicking on legend item
* make sure internal legend is always visible when toggling plot
* fix issue when using sub plot as data source for axis range
2022-09-09 16:06:56 +02:00
Magne Sjaastad
f3a3e04e1f
Fix missing update of export well name 2022-09-08 16:14:05 +02:00
Magne Sjaastad
945f1b1902
Use field auto values for summary plots
Use auto value concept in summary plot configuration. Default behavior is unchanged, but it is now possible to unlink a field to specify a custom value for this field.

Other changes:
* Add missing requirement for Svg in test application
* Use calculator icon and rename panel text
Use icon and relevant text to make it clear that the content in Calculator Data can be used for Grid Property Calculator and nothing else.
* Add example with scoped enum and auto value
* Use enum value starting av 10 to make sure enum values (not option item index) are working as expected
2022-09-05 14:12:49 +02:00
Jon Jenssen
8c835b5568 Fix tile windows command, and make sure logger is reconnected to 3d view if it is closed and reopened 2022-08-23 21:31:16 -07:00
Magne Sjaastad
000605bd99 Regression Test: Add timeout to command object processing
When Octave scripts fails, the application ends up in a deadlock. Add timing to be able to process next regression tests.
2022-08-23 05:06:52 -07:00
Magne Sjaastad
4cd38d7daf
Simplify access to RimMainPlotCollection
* Add current() to RimMainPlotCollection to avoid include of RimProject
* Remove "segment" prefix
* Reload data when RftCase changes
2022-08-19 14:30:25 +02:00
Magne Sjaastad
c8f642d83a
Add rename case to summary and grid cases (#9204)
* #9203 Summary Case : Add rename to right-click menu
* Janitor: Move ID and description to private fields
* Eclipse Case: Add rename to right-click menu
* Rename feature
2022-08-18 07:12:23 +02:00
Magne Sjaastad
1f2e9babe6
RFT: Support device and annulus branches (#9168)
* Add unit test used to read data from WSEGLINK
* Add segment branch type
* Add detection of device branches
* Add data source stepping on branch type
* parse wseglink data
* add RFT case as child of RimFileSummaryCase
2022-08-16 12:40:25 +02:00
Magne Sjaastad
016216bdb9
Show well completion annotations in horizontal plots (#9193) 2022-08-15 14:55:17 +00:00
Jon Jenssen
013b735a0d Add default dock window layouts and support hiding dock widgets before running tests. 2022-08-11 12:13:25 +02:00
jonjenssen
a3c561b7e5
Get rid of "ghost" windows on startup. (#9171)
* Get rid of "ghost" windows on startup.
Removes hide all docking windows feature for now, to be replaced by a new implementation. Will probably break some tests due to this.
2022-08-09 16:40:50 +02:00
Kristian Bendiksen
a87e05035d #9102 Thermal Fracture: handle field units. 2022-08-05 13:45:31 +02:00
Magne Sjaastad
f102a8b249
Improve annotations to work in both vertical and horizontal plots (#9154)
* Move enums to RiaPlotDefines.h
* Add support for formation names shading in horizontal plots
* Refactor line property code
* modernize code
2022-08-05 13:14:58 +02:00
jonjenssen
82f6dc74c1
Only create and show plot window if we import a summary file. (#9155)
* Only create and show plot window if we import a summary file. If window is already there, no change.
2022-08-04 07:14:12 +02:00
Magne Sjaastad
76edb49e89 #9126 Improve plot and curve handling for ensembles
Add append plots and append curves to context menu of ensembles
Make sure we create an unique color when adding multiple ensembles
2022-07-08 17:54:37 +02:00
jonjenssen
d5269abc6e
New dockingsystem (#9116)
* Use Qt Advanced Docking as forked submodule
* Use new docking system in code
2022-07-07 12:03:02 +02:00
jonjenssen
6105813d28
Allow using scale values less than 1.0 (#9108)
* Change view scale into list of predefined double values in both toolbar and property editor. Add values less than 1.0
2022-07-04 15:48:52 +02:00
Magne Sjaastad
3d53c9de1e Do not create curve for empty history vector 2022-06-29 12:42:22 +02:00
Magne Sjaastad
aeab09eceb Minor restructure of summary preferences 2022-06-28 14:06:32 +02:00
Magne Sjaastad
e5cf5f4cf3 Improve history curve color and symbols 2022-06-27 19:25:27 +02:00
Magne Sjaastad
55966ef6e8 RFT : Fix several update issues 2022-06-27 19:25:27 +02:00
Magne Sjaastad
b706192ea3
Performance updates (#9082)
* Avoid creation of curve legend widgets during construction of a multi plot
* Make sure default z-value is correct to avoid expensive Qwt updates
* Avoid duplicate plot updates
* Do not create internal Qwt legend by default
* RFT import: Avoid expensive method throwing exception if no data is found
2022-06-24 16:16:46 +02:00
Magne Sjaastad
5078f4072f
Minor adjustments (#9070)
* Add system commands to test toolbar
* #9069 Summary Plot: Update only Y axis values during source stepping
* Reduce default brightness for ensemble summary curves
* Add a separate flag to control linking of time axis
* Make sure interactive zoom in plot is handled
* Move message dock window to right dock panel
2022-06-21 15:33:00 +02:00
Magne Sjaastad
d854a3d3e7
Merge pull request #9063 from OPM/more-rft-fixes-01
More RFT fixes
2022-06-17 17:24:58 +02:00
Magne Sjaastad
ccbda23b96
Merge pull request #9048 from OPM/9047-performance-avoid-update-project
- Avoid update of project when creating new objects
- Added icon resource cache
- Avoid use of descendantsIncludingThisOfType()
2022-06-13 13:54:55 +02:00
Kristian Bendiksen
5ea621d36f #9033 Grid Property Calculator: fix incorrect filtering when reloading projects
Fixes #9033.
2022-06-10 13:55:51 +02:00
Magne Sjaastad
d36bf11c62
Several performance fixes (#9026)
* #9023 Performance: Use count instead of for loop

* #9023  Analyzer: Cache vector names for categories

* #9023 Performance : Use cached ensemble analyzer

* #9023 Performance : Add min/max values to ensemble statistics

* #9023 Performance : Improve statistics calculator

* #9023 Performance : Use high performance toInt()

* #9023 Performance : Build summary addresses in parallell
2022-06-07 21:09:36 +02:00
Magne Sjaastad
95e9ef8bf1 Rename to RiaFieldHandleTools 2022-06-03 08:00:55 +02:00
Magne Sjaastad
2b8bab3bd8 #9011 Disable input controls controlled by automation
Disable fields controlled by automation and append label text with (overridden)
2022-06-03 08:00:55 +02:00
Magne Sjaastad
5e53f5687d Improve auto name for curves and plots
- use vector name as plot title if a vector and the associated history vector is present
- use short vector name as fallback for curve name
- use Plot N as fallback name for sub plot
2022-06-03 08:00:55 +02:00
jonjenssen
fd7821a10b
Add preferences setting for maximum search depth in script folders. Clean up context menu a bit. (#9012) 2022-06-02 06:53:05 +02:00
Magne Sjaastad
c7cf6d19f8 #8995 Drag drop summary vector : Optionally include history vector 2022-06-01 12:25:36 +02:00
jonjenssen
9f4d242a5d
Plot Template updates (#9002)
* Ensemble plot templates now have .erpt extension and new icon
* Default plot templates are given a checkmark overlay on the icon
* Context menu has been cleaned up a bit
* Old default template is really just the last used template. Rename it.
* Add max. recursive depth setting in preferences for plot template searches
* Only create plots based on correct template type when importing ensembles or single cases
* Support creating new plot from template explorer
* Update last used template when creating a new plot from a template
2022-06-01 10:45:44 +02:00
Magne Sjaastad
c74701b687 Rename several child() and children() functions 2022-05-31 15:05:07 +02:00
Magne Sjaastad
17f169e513 RegressionTests: Add missing show() to mainwindow 2022-05-29 13:25:53 +02:00
Magne Sjaastad
f0ce04597d
Merge pull request #8985 from OPM/8926-remove-useoptionsonly
AppFwk : Remove obsolete useOptionsOnly
2022-05-29 13:01:27 +02:00
Magne Sjaastad
a48ad22d0a Preferences: Avoid calling update on top level RimProject on close 2022-05-27 07:53:51 +02:00
Magne Sjaastad
3545d16fbb Use set to get unique plots for update 2022-05-26 20:43:25 +02:00
jonjenssen
8e3289a432
Default summaryplot improvements (#8950)
* Add summary default plot type selection in preferences
* Create plots as set in preferences when loading summary cases. Allow selecting default plot templates from templates explorer tree
* Do not create plot if data vector setting is empty
2022-05-25 11:01:45 +02:00
Magne Sjaastad
f91fe41f1d
Several minor issues (#8948)
* #8947 Plot Template : Split export dialog into file path and name
* #8946  Update multi plot title when curve is appended by copy/paste
* #8946 Separate axis object name and axis title text
* If multi plot auto name is empty, use plot title "Plot N"
* QwtPlotWidget: Double click activates Zoom All
* More testing on valid main window before use
* Return false if event is not handeled
* Improve fallback plot name
* Tree View Editor: Early exit if selected object is unchanged
Resetting selection causes flickering
* Summary Plot : Select curve object in project tree when clicking on curve
2022-05-24 15:24:38 +02:00
Magne Sjaastad
01e670a3d8
Add copy/paste of Summary Multi Plot (#8942)
* Guard use of back() on empty vector
* Add "Show Data Sources" to ensemble realizations
* Update summary plot as summary curve collection is not visible in tree view
* Set selection manager root in RiaApplication
* Always close both main windows if present
* Add copy/paste of summary multi plot
* Add test for RiuMainWindow::instance() before use
* Remove duplicated code
* Multiple Tree Views : Use getTreeViewWithItem() to find correct tree view
* Minor UI adjustments
2022-05-23 14:25:53 +02:00
Magne Sjaastad
26f1387bc6 Improve plot manager behavior
Create plots for vectors with no grouping identifier
Do not invalidate GUI on selection changed
Use same name as in project tree
2022-05-22 21:49:34 +02:00
Magne Sjaastad
ccfc0e25bc #7778 Check for valid pointer to main window before use 2022-05-22 11:35:40 +02:00
Kristian Bendiksen
c3dfd9ed26 Summary tools: fix crash in when destructing RimStimPlanModel 2022-05-20 14:51:26 +02:00
Kristian Bendiksen
9678b80feb #7778 MainWindow: fix crash when reopening grid case 2022-05-20 14:51:01 +02:00
Magne Sjaastad
402f738abd Regression Test: Make sure all text is redirected to standard out
Call RiaApplication::initialize() to recreate project and preferences. Do not call virtual method initialize(), as RiaGuiApplication::initialize() creates a new logger causing console text to disappear.
2022-05-19 13:58:01 +02:00
Magne Sjaastad
fa8ad53981 Regression Test : Add memory usage to regression test logging 2022-05-19 12:48:54 +02:00
jonjenssen
828e8ec440
Show templates as separate project explorer tab. (#8902)
Add templates as separate project explorer tab.
Add support for renaming and editing templates
2022-05-11 19:46:17 +02:00
Magne Sjaastad
f52acd9a64 #8893 Rename quantity name -> vector name 2022-05-10 08:17:41 +02:00
Kristian Bendiksen
b761bb42af Grid Calculator: Fix view updates when calculation is changed or removed. 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
4304bbbc48 Grid Calculator: refactor summary curve calculator and add grid calculator. 2022-05-09 15:36:27 +02:00
magnesj
64c4adf5f0 Fixes by clang-tidy 2022-05-06 06:39:08 +02:00
Magne Sjaastad
cc397efe3e Performance : Simplify use of update schedulers
Extract code to RiaScheduler
Add PlotCollectionScheduler
2022-05-05 14:15:45 +02:00
Magne Sjaastad
8daf25ffb3 Performance : Cache result of some string manipulation functions
These functions get called quite often, and popped up based on profiling.
2022-05-05 14:15:45 +02:00
jonjenssen
296ddbde42
Merge pull request #8882 from OPM/append_curves
Summary Multiplot: Source Stepping append curves with performance fixes
2022-05-04 13:11:04 +02:00
jonjenssen
3de8010c2b
Source stepping and toolbar updates (#8866)
* Move layout options to separate toolbar
* Enable stepping on quantities, remove special history curve stepping for now
* Allow stepping ensembles and cases
* Add step next/prev and add new sub plot
2022-05-03 11:30:09 +02:00
Magne Sjaastad
46173af8c3
Merge pull request #8865 from OPM/8863-summary-issues 2022-05-03 08:51:26 +02:00
Magne Sjaastad
853b4a26d5 #8822 Summary Axis: Add tick mark count to y-axis 2022-04-22 23:14:48 +02:00
Magne Sjaastad
b6f7dd931e Add option to export to pdf without asking user 2022-04-22 23:14:48 +02:00
Magne Sjaastad
1840a95810 Preferences: Move colorCurvesByPhase and hide Qt Charts settings 2022-04-22 08:08:06 +02:00
Magne Sjaastad
caaca138c0
Curve Colors : Add support for color assignment based on summary phase (oil, gas or water) 2022-04-20 14:29:40 +02:00
Magne Sjaastad
93614ef272
Merge pull request #8791 from OPM/8790-rename-to-group
Rename summary references to "Group"
2022-04-07 21:06:40 +02:00
jonjenssen
3590c52cdc
Deprecate single summary plots and plot collections. (#8777)
* Deprecate single summary plots and plot collections. Replace functionality using summary multi plots. Clean up some code. Fix crash when trying to normalize an empty curve
2022-04-06 17:39:07 +02:00
Magne Sjaastad
6417daf167 #8773 Source Stepping : Realization cases are missing in some cases 2022-04-06 10:05:43 +02:00
jonjenssen
22d6e3f853
Merge pull request #8765 from OPM/summarymultiplot_performance2
Summary Multiplot performance improvements and fixes
2022-04-01 19:23:27 +02:00
Magne Sjaastad
15f17234c8 #8747 MultiPlot : Duplicate and append plots for selected objects 2022-03-31 14:04:33 +02:00
jonjenssen
ebba37a623
Merge pull request #8754 from OPM/multiplot_improvements
Summary Multiplot: add new plot from a single curve in an ensemble plot and improve general plot performance
2022-03-31 12:34:07 +02:00
Jon Jenssen
2eb1713866 Fix mouse wheel not working in 3D view if a plot window is created.
Fix issue with multiplot sometimes being shown incorrectly when switching between fullscreen plots
2022-03-30 16:19:16 +02:00
Magne Sjaastad
9c987855f2 Merge remote-tracking branch 'origin/patch_2021.10.3' into dev 2022-03-28 09:06:38 +02:00
Magne Sjaastad
7c4e81f59f Adaption of #8356 Summary Data : Add support for use of summary summary data from Python 2022-03-28 08:46:10 +02:00
Magne Sjaastad
c48451a532 Summary Import : Support cases with one file per time step (#8493) 2022-03-28 08:46:10 +02:00
Magne Sjaastad
cf4d2c9ad2 Janitor : Support import of stand alone ESMRY files
All import of summary data was previously started from a SMSPEC file. As the ESMRY file is completely independent, it is useful to import these files directly.
2022-03-28 08:46:10 +02:00
jonjenssen
8c27a0f656 Support pausing before running abaqus script to allow input file modifications.
Add option in preferences to enable/disable pause.
2022-03-28 08:46:10 +02:00