Commit Graph

1457 Commits

Author SHA1 Message Date
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