Commit Graph

705 Commits

Author SHA1 Message Date
Magne Sjaastad
a6fe630e5f Temporary LGR: Make sure the view is updated based on new LGRs
A missing update caused the regression test TestCase_Create_Lgr_For_Completions  to fail due to missing visibility of temporary LGRs.
2024-06-07 11:10:13 +02:00
Magne Sjaastad
41d5e498d7 Simplify PdmDocument class and move fileName to private
Remove resolveReferencesRecursively() and initAfterReadRecursively() from PdmDocument::readFile(). These functions will be called in RiaApplication::loadProject after the file paths modifications are done. This will ensure that file paths can be used in initAfterRead() functions.
2024-06-05 14:35:01 +02:00
magnesj
4f5a0d8bdf Fixes by clang-tidy 2024-05-30 07:16:44 +02:00
Magne Sjaastad
1d57b9032b
Custom vfp plot (#11450)
* AppFwk: When clearing a tree selection, make sure all values are cleared
* Fix deprecated implicit lambda
* Add support for using the closest value in addition to exact match
* Add table data source object and add plot with multiple data sources
Delete the temporary RimVfpDeck class
Add RimVfpTable to represent a table in a data source
Add plot able to show data from multiple tables

* AppFwk: Make it possible to call resolveReferences multiple times
Use case: Vfp tables are stored in files. Multiple tables can be present in one file. Pdm table objects are created after resolve references is done as part of parsing file. When the Pdm object are created, resolveReferences can be called once more.

* Call resolveReferencesRecursively() after RimVfpTable objects are created
2024-05-29 12:55:45 +02:00
Magne Sjaastad
c7fbb5374c #11437 Propagate detected date format to line based parsing
Add try/catch to avoid crash
Remove flag to avoid eternal loop
2024-05-28 12:54:40 +02:00
Kristian Bendiksen
d1d3ee129f Refactor: Extract parser options from RicPasteAsciiDataToSummaryPlotFeatureUi 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
74ba0c8b8c Refactor: Rename method name. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
c1aba471f2 Refactor: rename WellLogFileChannel to WellLogChannel. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
577ef1e154 Add support for well paths from OSDU. 2024-05-24 15:19:43 +02:00
Kristian Bendiksen
13ec3b7f62 Rename SSIHUB to Osdu. 2024-05-24 15:19:43 +02:00
Magne Sjaastad
ff9b13163a Add RimVfpTableData used to represent connection to file and data
Extract data management from RimVfpPlot. Use pointer from RimVfpPlot to RimVfpTableData.
2024-05-13 15:45:55 +02:00
Magne Sjaastad
b8391e6f92 Remove pure virtual from RimPlotCurve
Make it possible to use RimPlotCurve directly. Remove depnendencies on special implementation in derived classes.
2024-05-13 15:45:55 +02:00
Magne Sjaastad
aae5f55dc2 Rename to "Import VFP Data" 2024-05-07 17:06:41 +02:00
Magne Sjaastad
a55b53c725 Add parsing of *.DATA and add zoom to VFP plots
Parse *.DATA and create VFP plots for all tables
Add zoom in VFP plots
2024-05-03 14:39:39 +02:00
Magne Sjaastad
24aa7fca3e Make sure onChildrenUpdated is called in RicToggleItemsOnOthersOffFeature 2024-05-03 14:39:39 +02:00
jonjenssen
2e4ca390c7
Remove old polygon annotations. (#11404)
* Remove old polygon annotations from GUI. 
* Upgrade old annotation objects to new polygon objects on load.
2024-05-01 10:50:19 +02:00
Magne Sjaastad
df7112e615 Add missing includes 2024-04-25 10:00:25 +02:00
Magne Sjaastad
ed5382af24 Merge branch 'main' into dev 2024-04-25 09:34:11 +02:00
Magne Sjaastad
2b25ac87e7 Show error message if no flow data is available 2024-04-25 09:22:43 +02:00
Magne Sjaastad
d1e871eb69 #11393 Contour map: Make sure polygon cell filter works as expected
Add the polygonInViewCollection to display the polygon in tree view. This makes the polygon filter work, and interaction in contour map is also supported.

Polygon cell filters are not working due to different organization of the project tree for Eclipse view and contour map view. Manually assign pointers to polygon objects.
2024-04-25 09:22:43 +02:00
Magne Sjaastad
c759a11888
Cmake cleanup and selected Qt6 adjustments
- Avoid warning using newer CMake by removing obsolete cmake requirements in sub projects
- Several adjustments preparing for Qt6
2024-04-17 15:06:51 +02:00
Kristian Bendiksen
174123f8b5 Refactor: rename confusing push_back method on view collections. 2024-04-17 14:34:36 +02:00
Kristian Bendiksen
ade044adbf Grid Ensemble: add methods to add view 2024-04-17 14:34:36 +02:00
Kristian Bendiksen
b84362dfc0 Grid Ensemble: add menu item for importing grid ensemble. 2024-04-17 14:34:36 +02:00
jonjenssen
74f55c885b Fix eclipse case contour map left click (#11378)
* Make sure we operate in the correct domain when picking points in the contour map
2024-04-17 11:54:41 +02:00
jonjenssen
5b4da82844
Fix eclipse case contour map left click (#11378)
* Make sure we operate in the correct domain when picking points in the contour map
2024-04-17 11:53:29 +02:00
Magne Sjaastad
030688cff6
Several adjustments related to Qt6
* Avoid ambiguous definition during unity build on Windows
* Add missing include
* Add Qt6 to expressionparser
* Add Qt6 to nightcharts
* Replace forward define of QStringList with include <QStringList>
* Use toMSecsSinceEpoch
* Use setContentsMargins
2024-04-16 14:22:15 +02:00
Kristian Bendiksen
9c0f601ba6 Fix crash when creating contour map from 3d view. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
4f8c081669 Support global and local views. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
b5666c333a Refactor connection between cases and views.
Eclipse grid views and contour maps are not longer a child of the case.
The views are not separate collections (one for grid and one for contour maps)
on root level.
2024-04-15 16:10:43 +02:00
jonjenssen
bbc279d587 Improve cell filter collection menu 2024-04-10 10:43:49 +02:00
Kristian Bendiksen
c074033dc2 Refactor: Fix misspelling of "synchronize". 2024-04-05 13:55:09 +02:00
Kristian Bendiksen
873282b339 Refactor: avoid local variable only used in range-based for loops 2024-04-04 10:24:21 +02:00
Kristian Bendiksen
be3d06c549 Refactor: improve api for views and oil fields. 2024-04-04 10:24:21 +02:00
Magne Sjaastad
ef637e3053
Move stream operator from AppEnum header
This PR will reduce the compile time of code using AppEnum. 

* AppEnum: Move QTextStream operator to avoid include of QTextStream
* Avoid use of iostream in cafAssert
rator to avoid include of QTextStream

Include file profiling shows that include of QTextStream is a performance issue. Create a non-templated base class for AppEnum. Implement the QTextStream operator for this interface.
2024-03-25 15:14:04 +01:00
Magne Sjaastad
b57767d895
Add feature to set parent well 2024-03-25 10:19:31 +01:00
jonjenssen
2001c94a39
Polygon updates (#11298)
* Make menus similar for polygon and polygonInView
* Crash fix: Iterator might be invalidated by erase, reorder operations.
* Update pick editor after reload
* Do not enable edit if polygon is read only
* Make sure filter and intersection geometry is updated after a reload
* Make sure other pick editors are updated when polygon in view is changed
2024-03-18 14:31:06 +01:00
Magne Sjaastad
bfda6519db
Cleanup includes
Use new tools in Visual Studio to help cleaning up includes and remove redundant includes.
2024-03-07 19:45:43 +01:00
Magne Sjaastad
3689cccae7 Add operations on polygon : Duplicate, exportCsv, exportPol and simplify
SimplfyPolygon applies an operation on polygon to reduce the number of points in a way that the shape of the polygon is conserved.
2024-03-04 11:24:42 +01:00
Magne Sjaastad
818c5c0f9c
Add polygon file readers and make sure UI items are in sync
* Add polygon reader for POL file format
* Add CSV import
* Add helper function to create tag with color and text
* Show polygon color as tag, allow color edit by clicking on tag
* Support optional header in csv file
* Add Reload on polygon file
* Show warning icon if no polygons
* Improve logging text
* Do not show file polygon in view if no polygons are imported
* Use appendMenuItems
* Set default polygon color to orange
* Enter edit state when creating a new polygon
* Fix missing UI text in menu builder
2024-03-01 14:59:14 +01:00
Kristian Bendiksen
b0ade5d318 WBS Plot: Fix disappearing curve names for disabled curves. 2024-02-29 10:47:12 +01:00
Kristian Bendiksen
8ea017da3c WBS: Make PP data from CSV more pink.
Goal is to differentiate from existing PP results.
2024-02-29 10:47:12 +01:00
Magne Sjaastad
672fbe177b
Improve summary calculation performance
* Only reload calculation data
* Make sure performance is good when a calculated object is added or changed
- avoid recreation of summary file readers
- delete all nodes in address tree representing calculated curves
- build address nodes for calculated curves
2024-02-26 13:55:41 +01:00
Magne Sjaastad
28d281e1d6
Use polygon as data source for intersection
- Use polygon as data source for intersection
- Add padlock icon
- Show padlock icon on read only polygons
- Add Fwk function appendMenuItems() to make it possible to define context menu content in a PdmObject
- Context menu "Create Polygon Intersection"
- Updates to make visualization consistent with object and object collection enabled state
2024-02-25 09:21:48 +01:00
Magne Sjaastad
6fe997b3c9 Add and use caf::PdmUiPushButtonEditor::configureEditorLabelHidden 2024-02-23 08:47:52 +01:00
Magne Sjaastad
a3d520e26e
Use project polygons from polygon cell filter
* Use RimPolygonInView to edit locally defined polygon
* Add scaling to polygon in view
* Move polygon line visualization to RimGridView
* Rename to polygonInViewCollection
* Show appearance for local polygon
2024-02-22 15:13:29 +01:00
Magne Sjaastad
16896212d4 Cleanup obsolete code 2024-02-16 15:51:19 +01:00
Magne Sjaastad
5fdf30d124 Add polygon classes 2024-02-16 15:51:19 +01:00
Magne Sjaastad
dc1e675b37 Move findActiveTargetsAroundInsertionPoint to base class 2024-02-16 15:51:19 +01:00
Magne Sjaastad
33dcd55561 #11206 Guard assert when picking in a zoomed scene 2024-02-16 12:12:17 +01:00
Kristian Bendiksen
85753568b6 WBS Plot: Improve initial placement of curve, and add better default colors. 2024-02-14 15:16:47 +01:00
jonjenssen
5391179e16
Add separate target for unit tests for easier test access. Remove unit tests from ResInsight application. (#11184)
Clean up cmake configuration a bit, and pull down gtest when needed, no longer use a thirdparty subfolder
Add a ResInsight-tests target to run the unit tests
2024-02-11 20:04:04 +01:00
Magne Sjaastad
ce513be638 Remove all use of .uiCapability()->setUiTreeHidden( true ); 2024-02-05 10:15:36 +01:00
Magne Sjaastad
5151717743 #11088 Use non-optimized version for old projects to compute active cells BB
The performance to compute geometry BB for active cells has improved. The original code also set displayModelOffset based on the BB of active cells. To make sure that existing project files produce identically the the same, the non-optimized version is used in this case.
2024-01-31 12:43:55 +01:00
Magne Sjaastad
d0b5c8d9cb #11134 Export completions: Call ensureReservoirCaseIsOpen before export
This change will enable export without any open views.
2024-01-30 14:34:33 +01:00
Kristian Bendiksen
a8c719b289 #10663 WBS Plot: Import well log from CSV file.
Also compute SH_MK_MIN/EXP/MAX and FG_MK_MIN/EXP results.
2024-01-29 15:05:08 +01:00
Magne Sjaastad
6922ba22b0
Improve reload and replace of cases
* Move code to from features to helper classes
* Ask user if replace case should also happen for the associated grid or summary file
2024-01-25 10:41:57 +01:00
Magne Sjaastad
80fdd1da74 Return pair of vectors and rename 2024-01-22 14:52:49 +01:00
Magne Sjaastad
50ef5d916e Import surfaces with xyz as extension
*.dat and *.xyz can be imported using the same code
2024-01-19 11:53:06 +01:00
Magne Sjaastad
df083a870a Add Memory Report dialog
Compute how much memory is used for result/case/total. Show as text in dialog.
2024-01-19 11:00:28 +01:00
Kristian Bendiksen
33c24a219c Fix crash when deleting case. 2024-01-08 18:05:48 +01:00
jonjenssen
daae1e6e05
Improve fault reactivation file names (#11005)
Use model name in exported file name.
Add model name to include file names.
2024-01-05 08:43:40 +01:00
jonjenssen
50a766591b
Enable INP support without ODB libraries (#10990)
Enable INP support without ODB libraries
2024-01-03 11:55:35 +01:00
Jon Jenssen
a4db175bea Make sure imported element properties goes to the selected case.
Improve reload/close element property UI
2023-12-21 08:23:37 +01:00
Magne Sjaastad
894bbbe06b Add reservoir case for EM data
- read geometry definition from h5grid files
- import cell results from h5grid files
- create and import case using drag/drop of h5grid file into ResInsight
2023-12-20 19:05:45 +01:00
jonjenssen
858c1227bc
Use correct result name for Void ratio (#10969)
Use correct result name for Void ratio
Enable porosity calculator for imported inp data
Add model validation check for export/show model
Fix last res. layer not being splitted into subelements
Add model validation check in file exporter
Bump version to dev.04
2023-12-18 15:03:08 +01:00
Kristian Bendiksen
9e1a09bcf9 Refactor: move fault reactivation data access to fix ownership problems. 2023-12-18 14:28:00 +01:00
jonjenssen
1fab743d56
INP import updates (#10952)
Support reading element type results
Automatically load properties from INP include files generated by Fault Reactivation Model exporter
Some refactoring of element and result types.
2023-12-14 08:46:41 +01:00
Magne Sjaastad
cf9a9d4bad Add copy/paste of cell filters 2023-12-11 12:32:19 +01:00
Kristian Bendiksen
08f9e9b5bb Janitor: move historyIdentifier/differenceIdentifier. 2023-12-04 17:26:44 +01:00
Kristian Bendiksen
ca87cee79b Summary Calculation: add import and export to toml 2023-12-04 17:26:44 +01:00
Magne Sjaastad
ae9f1c06a8 If empty, add .toml as file suffix 2023-12-01 12:13:09 +01:00
Kristian Bendiksen
fa7a56f1e2 #10861 Add import/export for grid calculations 2023-11-28 11:42:21 +01:00
Magne Sjaastad
4b0f2b362e Add support for placing legend at several positions
Show legends on top of preview plot
2023-11-27 13:14:16 +01:00
Magne Sjaastad
243b07c42f Remove preview plot title 2023-11-27 13:14:16 +01:00
Magne Sjaastad
9d21faf38c Make sure summary case is set before assigning curve axis 2023-11-27 13:14:16 +01:00
Magne Sjaastad
da20b81c0e Make sure the detection of only cross plot curves works as expected 2023-11-27 13:14:16 +01:00
Magne Sjaastad
00cb4e3252 Always use auto title in preview plot 2023-11-27 13:14:16 +01:00
jonjenssen
2b795bf499
Fault reactivation gridding update (#10855)
Rewrite grid generator - grid based on eclipse model layers in reservoir.
2023-11-20 15:39:17 +01:00
Magne Sjaastad
0852f857a0 Not required to process event anymore 2023-11-20 14:13:24 +01:00
Magne Sjaastad
98ce0dc226 Hide deprecation warning starting from MSVC 17.8 2023-11-20 14:13:24 +01:00
Magne Sjaastad
a78f8f8982 Use enum instead of string 2023-11-17 09:53:30 +01:00
Magne Sjaastad
68a4d54af2 #10754: Exclude COMPDAT for de-activated laterals 2023-11-13 09:17:30 +01:00
Magne Sjaastad
678a368361
Refactor LayoutOptions to improve readability
* Make it possible to use designated initializer list
- remove default constructor
- move static member to outer scope

* Add helper function to add field on same row
2023-11-10 14:48:56 +01:00
Magne Sjaastad
fb890300c5 Propagate variable changed signal to RicUserDefinedCalculatorUi
- ensure that the UI is updated
- if the grid size is different, set destination case equal to the input variable case
2023-11-10 12:07:26 +01:00
Magne Sjaastad
69f132ffa5 Add import/export grid calculations to Grid Calculator
Refactoring
2023-11-10 10:14:59 +01:00
Magne Sjaastad
f49053c61d Guard null pointer use 2023-11-10 09:01:28 +01:00
Magne Sjaastad
32a878a7ea Select the new view to make sure RiaApplication::setActiveReservoirView() is called 2023-11-10 09:01:28 +01:00
Magne Sjaastad
ee4c8362e5 Make sure eclipse case is opened before creating contour map to avoid crash 2023-11-10 09:01:28 +01:00
Magne Sjaastad
39fc9d5c36 Add support for grid calculations as data source for statistics
- add data source selection, either Case Property or Grid Calculation
- add Time Step Selection, can be used for both dynamic case properties and Grid Calculations
- optionally release grid calculation data when statistics is computed
- recursive grid calculations is supported
2023-11-08 08:39:04 +01:00
Magne Sjaastad
7eb3e98bb2 Optionally apply a grid calculation on all grids 2023-11-07 19:14:58 +01:00
Magne Sjaastad
2069ad55cf Refactor RimSummaryAddressModifier
Use std::variant to wrap curve and ensemble curve set.
Move some code into RimSummaryAddressModifier
2023-11-06 10:20:22 +01:00
Magne Sjaastad
12f24af154 Remove obsolete source stepping code
After merging the cross plot with the summary plot, the sources stepping can be simplified. Remove obsolete sources stepping code, to prepare for other source stepping issues.
2023-11-06 10:20:22 +01:00
Magne Sjaastad
4f25fb4463 Create multiple RFT plots based on the selected RFT plot
Show a dialog with all available RFT wells, and let the user select from this list. Create a copy of the RFT plot, and replace well name in the copy.
2023-11-06 10:10:22 +01:00
Magne Sjaastad
a91afff937 Make sure axis is set correctly when appending plots
The plots are duplicated, and the axis objects are referenced using ptrField. Make sure resolveReferencesRecursively() is called after the plot is inserted into the project tree.
2023-10-30 11:20:21 +01:00
Magne Sjaastad
cb7fe4fae5 Valve Import: Avoid duplicated import 2023-10-20 15:43:18 +02:00
Magne Sjaastad
bc7ec5f40c Fishbones : Add support for creating three different parameter sets 2023-10-19 14:49:42 +02:00
Magne Sjaastad
0ec5913024 Create Cross Plot: Improve text and add menu separator 2023-10-19 14:49:42 +02:00
Magne Sjaastad
5f0f483025 Show Plot Data: Add special handling for well log plots
Well log plots do not derive from RimPlot, add special handling.
2023-10-19 07:50:02 +02:00
Magne Sjaastad
f763f73ba3 Regression Curves: Use a contrast color for the regression curves
Use a list of predefined colors, and select the color with the larges RGB difference to the source curve. This will ensure that we avoid ending up with fully white or fully black curves, unable to see.
2023-10-19 07:50:02 +02:00