Commit Graph

1493 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
Magne Sjaastad
beccd2454e Move updatedFilePathFromPathId() to private
File paths are now updated in initAfterRead()
2024-06-05 14:35:01 +02:00
Magne Sjaastad
a952fbce7e Move function to RiaProjectFileTools
Rename to RiaProjectFileTools
2024-06-05 14:35:01 +02:00
Magne Sjaastad
27339a91fa Guard nullpointer crash 2024-06-05 14:35:01 +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
Kristian Bendiksen
d1d3ee129f Refactor: Extract parser options from RicPasteAsciiDataToSummaryPlotFeatureUi 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
c79f7939b4 Refactor: move method implementation to cpp file. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
6144c1f3a6 Add Well Log root object. 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
6e1289507f Refactor: Rename WellLogFile to WellLogData. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
11128073f7 Refactor: Use NamedObject for WellLogChannel. 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
2862de63a6 Add GRUPTREE and WELSPECS to avoid parser error 2024-05-08 15:16:38 +02:00
Magne Sjaastad
0ba11af5a4 Performance: Improve performance when adding a summary calculation
Rebuild and update of the project tree for summary objects in Data Sources can be time consuming for large cases. Make sure the update of UI only happens when required.
2024-05-08 07:29:18 +02:00
Magne Sjaastad
aae5f55dc2 Rename to "Import VFP Data" 2024-05-07 17:06:41 +02:00
Magne Sjaastad
b0e0bc5f14 Add more details to error messages during parsing of input files 2024-05-07 17:06:41 +02:00
Magne Sjaastad
ae7f29c80f
#11418 Fix calculation between multiple cases 2024-05-06 09:48:00 +02:00
Magne Sjaastad
96481d81a8
Add tool used to extract project file revisions from project file database
* Add tool used to extract project file versions from database
* Delete old records from backup to limit number of records to 50
2024-05-04 13:21:31 +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
b7e5867430 Move qwt axis functions to RimPlotAxisTools 2024-05-03 14:39:39 +02:00
Magne Sjaastad
6d478ddb3c Use opm parser to find all VFP data based on a *.DATA file 2024-05-03 14:39:39 +02:00
Magne Sjaastad
aea804b161 Rename to improve readability 2024-05-03 14:39:39 +02:00
Kristian Bendiksen
03e1d4e762 #11405 Fault reactivation: fix unexpected temperature change outside reservoir.
No change in temperature is expected outside of reservoir between
first (geostatic) and other time steps when exporting reactivation model.
I.e. the temperature gradient and "top of reservoir" temperature from the
geostatic step should be used on all time steps.

Fixes #11405.
2024-05-02 11:54:21 +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
4617bcc673
11402 Save copy of project file to a backup database when saving project file 2024-05-01 09:46:22 +02:00
Magne Sjaastad
3cd80f0871 Always move views from obsolete fields into view collection
The original code caused ProjectFiles2024Tests\TestCase_GridCalculations to fail
2024-04-28 08:26:15 +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
ff12d48ff2 #11394 Make sure single click for source stepper selected item once 2024-04-25 09:22:43 +02:00
Magne Sjaastad
f3cf849458 #11391 RFT plot: Check if formations are present before extracting data 2024-04-25 09:22:43 +02:00
Magne Sjaastad
3965041550 Set a max limit for number of categories sent to category mapper
It is not possible to use the category mapper for a large number of categories.
2024-04-25 09:22:43 +02:00
Magne Sjaastad
98144078c8
Rename to resdata
* Rename to resdata
* Remove development feature for storing grid import type in project file
* Clean up comments
2024-04-22 19:56:10 +02:00
Magne Sjaastad
e9ff3540ba
Update dev branch after patch release
* Fix calculation for active cell values
Always allocate result data for active cells in destination case. Make sure that active cells is used for both population of expression variables and filtering of data. Improved naming to make it clear that we always work with active cell data.

* Check if scalar result index is valid
* Create the static scalar results once
addStaticScalarResult will clear already computed data, causing calculations to be triggered once more

* Early return if data already is available
If not checking if data is available, data is read from file and appended to result vector.

* Always check date for H5 files, and recreate if required

* Always recreate ESMRY if file exists and is older than SMSPEC

* #11355 Use category if result name starts with FIP or ends with NUM

* #11337 Summary import: Make sure ESMRY includes restart history

* #11334 Fix cvf::Viewport assert triggered for small contour map/2d intersection
Size of the overlay is could become negative, and would overflow for small views.

* #11310 Fix assert on single cell model.
Well pipe radius would become HUGE_VAL due to off-by-one error.
The assert could only happen on model with a single cell.

* Check equal grid size only when required
Equal grid size is required if there is more than one grid case in the expression. If a cell filter view is active, the visibility is based on one view and reused for all other grid models, and requires equal grid size.

* Remove obsolete log message

* Do not show dialog during regression tests

* Fix eclipse case contour map left click (#11378)

* Make sure we operate in the correct domain when picking points in the contour map

* Remove obsolete code causing grid to be loaded for all cases


* Bump version to 2024.03.1

---------

Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
Co-authored-by: jonjenssen <69144954+jonjenssen@users.noreply.github.com>
2024-04-19 15:09:15 +02:00
Magne Sjaastad
8c5802c556 Remove obsolete code causing grid to be loaded for all cases 2024-04-18 13:17:58 +02:00
magnesj
932464ea55 Fixes by clang-tidy 2024-04-18 07:26:55 +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
Kristian Bendiksen
acb06b1f53 Grid Ensemble: add pdm object. 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
85136fb343 Make sure project tree is updated when view is deleted 2024-04-16 15:23:53 +02:00
Kristian Bendiksen
2d688b1c8b Eclipse case: avoid invalidating vector while iterating over it. 2024-04-16 15:23:53 +02:00
Kristian Bendiksen
abf61090cc Fix intersection view regression. 2024-04-16 15:23:53 +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
39b9a25faa Fix update of grid nodes. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
ce6199289f Show case option when not in the tree. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
21041c476d Show case option in contour map 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
Magne Sjaastad
16bdf6cd92 Do not show dialog during regression tests 2024-04-15 10:33:56 +02:00
Magne Sjaastad
2893a5deee Remove obsolete log message 2024-04-15 10:33:56 +02:00
Magne Sjaastad
07cc21587a Check equal grid size only when required
Equal grid size is required if there is more than one grid case in the expression. If a cell filter view is active, the visibility is based on one view and reused for all other grid models, and requires equal grid size.
2024-04-15 10:33:56 +02:00
Magne Sjaastad
3e2957bc12 #11337 Summary import: Make sure ESMRY includes restart history 2024-04-15 10:33:56 +02:00
Magne Sjaastad
b9d9d53964 #11355 Use category if result name starts with FIP or ends with NUM 2024-04-15 10:33:56 +02:00
Magne Sjaastad
de4a5bba27 Always check date for H5 files, and recreate if required 2024-04-15 10:33:56 +02:00
Magne Sjaastad
caaba8b2af Check if scalar result index is valid 2024-04-15 10:33:56 +02:00
Magne Sjaastad
65a2d9e7b9 Fix calculation for active cell values
Always allocate result data for active cells in destination case. Make sure that active cells is used for both population of expression variables and filtering of data. Improved naming to make it clear that we always work with active cell data.
2024-04-15 10:33:56 +02:00
jonjenssen
25361ad796
Allow polygon line filter with only one point (#11345)
Allow polygon line filter with only one point, for both eclipse and geomech
2024-04-10 10:47:06 +02:00
jonjenssen
bbc279d587 Improve cell filter collection menu 2024-04-10 10:43:49 +02:00
Magne Sjaastad
8b1b9acd84 #11337 Summary import: Make sure ESMRY includes restart history 2024-04-08 15:57:10 +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
e862bd259f Refactor: modernize 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
Magne Sjaastad
61254ba1b2 Summary: Set default value true for display of sub nodes
Set display of summary nodes to true. This will ensure that the display of vectors in "Data Sources" for a single summary case will be updated when a calculated curve is added or removed.
2024-03-22 08:46:28 +01:00
Magne Sjaastad
d95c4c780c Fix regression causing hidden objects to be visible
Hide objects that by mistake was make visible in ce513be
2024-03-21 09:32:09 +01:00
Magne Sjaastad
672b7a2a65 Make sure all editors are updated after source stepping 2024-03-21 09:32:09 +01:00
Magne Sjaastad
7190d781d0 Grid Case Statistics: Show well data from first realization 2024-03-21 09:32:09 +01:00
Magne Sjaastad
2e456a6f9b Add font size to text content frame 2024-03-21 07:11:21 +01:00
Magne Sjaastad
785871cae3 Add realization filtering based on text string
Add unit tests and support min max range specifications. Example string "-5, 5, 8-10, 12-"
2024-03-21 07:11:21 +01:00
Magne Sjaastad
84875bef4f Fix source stepping on calculated vectors
Make sure the calculation ID is set when a calculated vector is selected in the toolbar
2024-03-19 14:33:29 +01:00
Magne Sjaastad
a248be13cc Always rebuild meta data for summary cases
Rebuild the UI representation when needed
2024-03-19 14:33:29 +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
a880a42752
Summary performance improvements
* Check flag before rebuilding summary address nodes
* Performance: Use vector instead of set and map locally in thread
* Performance: Skip looking for restart summary filenames for opm-common
* Move adding of case realization parameters to OpenMP loop
* Add unit test for file path operations
* Performance: Avoid using cdUp() function when splitting path into strings
2024-03-18 11:46:43 +01:00
Kristian Bendiksen
e014bfd283 Fix incorrect line breaks. 2024-03-15 12:33:57 +01:00
jonjenssen
fb5758a363
Support both AND and OR operations when combining range and index filters (#11275)
Support both AND and OR operations when combining range and index filters
2024-03-11 20:02:47 +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
9f96cb9694 #11258 Grid Calculation: Unintended release of result data memory
Avoid release of memory when working on a single case
2024-03-05 12:40:15 +01:00
Jon Jenssen
406cd087e9 Use local coordinates in generated model by default 2024-03-05 11:47:16 +01:00
Kristian Bendiksen
a2fa2a0e77 WBS: Avoid empty text in legends on reload. 2024-03-04 23:47:14 +01:00
Magne Sjaastad
1217236d73 #11248 Remove caching of simulation well coordinates to avoid state handling bugs 2024-03-04 12:27:56 +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
5217ab5c8b Use signal to notify listeners when coordinates of a polygon changes 2024-03-04 11:24:42 +01:00
magnesj
5d640b91d2 Fixes by clang-tidy 2024-03-02 09:10:54 +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
2f3a20c73c WBS: Fix crash when importing CSV into existing WBS. 2024-02-29 10:47:12 +01:00
Jon Jenssen
b33d117784 Show measurement in static geomech view, too 2024-02-28 14:51:27 +01:00
jonjenssen
86c33c1b46
Fault activation: node adjustments along fault (#11235)
Make sure same thickness vectors and fault lines are used for both parts.
2024-02-27 17:05:48 +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