Commit Graph

44 Commits

Author SHA1 Message Date
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
Kristian Bendiksen
be3d06c549 Refactor: improve api for views and oil fields. 2024-04-04 10:24:21 +02: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
Magne Sjaastad
6fe997b3c9 Add and use caf::PdmUiPushButtonEditor::configureEditorLabelHidden 2024-02-23 08:47:52 +01:00
Magne Sjaastad
8a3a3aef7e Fix crash when using grid case group 2024-01-22 17:37:15 +01:00
Magne Sjaastad
e2e861ed95 Select none, all cases or a grid case group to apply a calculation
This will enable the use of expressions var_a = sum(x) on a grid case group
2024-01-22 08:42:23 +01:00
Magne Sjaastad
d61838940a Grid calculations: Free memory after data has been read
When data has been read for a variable, free the related data to make sure the memory footprint is as low as possible.
2024-01-22 08:42:23 +01:00
Magne Sjaastad
0c7a8ad2de Fix regression introduced in a9598f
Wrong naming of variables caused wrong refactoring
2024-01-19 11:00:28 +01:00
Magne Sjaastad
a9598fbe0e Define result address for to be used for non visible cells
Display a data source selection dialog to specify the result address to be used for cell values outside the visible cells.
2024-01-17 08:29:41 +01:00
Magne Sjaastad
35cc2127f2 Log error message instead of displaying a dialog
The error message is displayed once for each time step, and appears as eternal loop if you have many time steps.
2024-01-17 08:29:41 +01:00
Magne Sjaastad
f907c6bdff #11024 Allow grid calculator expressions with no input cases
Will make it possible to use calc := 3
2024-01-12 16:06:32 +01:00
Magne Sjaastad
31d11f56f5 #10986 Set non-visible cells to zero for aggregated expressions
For aggregated expressions, set cells outside filter to 0.0. Do nothing for normal expressions.
2024-01-03 10:28:34 +01:00
Magne Sjaastad
30807438d1 Find and evaluate dependent calculations 2023-12-06 15:07:13 +01:00
Magne Sjaastad
3f0b767528 Add time step filter 2023-12-06 15:07:13 +01:00
Magne Sjaastad
27f9ef4700 Rename to m_applyToAllCases 2023-12-06 15:07:13 +01:00
Magne Sjaastad
f247df5079 Cache user response for calculation question 2023-12-06 14:00:33 +01:00
Magne Sjaastad
fee950cdd4 Add missing visibility filter for single grid calculations 2023-12-05 07:48:21 +01:00
Magne Sjaastad
8b2d65e11a Remove use of progress dialog, unstable behaviour
In some cases, the progress dialog remains visible after the computation is completed. When an expression is applied to multiple cases, text is output to Messages window. This can be used to give user information on progress.
2023-12-04 14:59:29 +01:00
Magne Sjaastad
459dea64c7 Grid Calculations: Show statistics for aggregated expressions 2023-12-04 09:21:42 +01:00
Magne Sjaastad
96401c519d Make sure data for a variable is using correct case
Make sure the correct Eclipse case is used when extracting values for a variable. Simplify the data extraction using activeReservoirCellIndices
2023-12-01 12:12:51 +01:00
Magne Sjaastad
3cda00b28b Detect and show aggregated value for each time step in all realizations 2023-11-27 19:10:28 +01:00
Magne Sjaastad
537cead7f1 Add optional input value filter for calculation 2023-11-27 19:10:28 +01:00
Magne Sjaastad
1046bcbb94 Disable view filtering when using grid calculations as part of grid statistics
Active cells can be different between cases, and view filter from one specific case is not able to use for other cases.
2023-11-10 12:49:32 +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
917fd9b3b5 Move grid size check to calculate()
This move will make it possible to use a calculator expression defined for a different grid size for grid case statistics.
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
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
Kristian Bendiksen
1899184a41 Janitor: Remove deprecated method. 2023-09-11 17:39:38 +02:00
Magne Sjaastad
503180ba48 Do not tag calculator results to be stored in cache 2023-08-11 13:09:30 +02:00
Magne Sjaastad
bcc00adea1 Add edit button to grid calculation expressions
Implement add calculation from grid cell result
2023-06-05 09:07:14 +02:00
Magne Sjaastad
f8c5cf389f clang-format: Set column width to 140
* Set column width to 140
* Use c++20
* Remove redundant virtual
2023-02-26 10:48:40 +01:00
Kristian Bendiksen
99e9944e6e #9493 grid calculator on active cells only
* Janitor: Improve getter for RigActiveCellInfo::gridActiveCellCounts.
* #9493 Grid Calculator: calculate on only active cells.
* #9493 Grid Calculator: filter with active cells.
* Fix calculation for input grid cases
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-11-24 10:44:03 +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
Magne Sjaastad
e7c864c6d8 Improve grid cell calculator
* Use full name for grid case view
* FIx signed / unsigned issue
* Support drag/drop of file names into Main Window
* Add function to check if two grid cases are of equal size
* Result Info: Show cell result text for all linked views
* Improve how to specify cells to be included in calculation

- move view filter to calculation
- improve how to assign values to non-visible cells
- avoid computation between grids of different size

Closes #9482
2022-11-17 15:51:01 +01:00
jonjenssen
78e1bf3e94 Refresh data source tree when a grid calculation is updated (#9255) 2022-09-01 11:01:47 +02:00
Kristian Bendiksen
c177e51c45 Grid Property Calculator: Improve UI to allow only one filter. 2022-06-10 13:55:51 +02:00
Kristian Bendiksen
f50b876c99 #8955 Grid Property Calculator : Add filtering support. 2022-06-10 13:55:51 +02:00
Kristian Bendiksen
85cd07c373 Grid Calculator: Improvements after review. 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
8ea4e933aa Grid Calculator: compute results for all time steps 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
144138904d Avoid index-based iterator. 2022-05-09 15:36:27 +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
fdefb214d8 Grid Calculator: Minor tweaks to UI. 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