Commit Graph

17277 Commits

Author SHA1 Message Date
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
Kristian Bendiksen
8f96d8b131 Bump to version dev 04. 2024-04-15 13:26:08 +02:00
Kristian Bendiksen
b181c55db8 WBS Plot: use PP (from any source) for shale for SFG. 2024-04-15 13:26:08 +02:00
Kristian Bendiksen
9dc5e99be0 #11354 Fix FG_MK_MIN/FG_MK_EXP calculations
Was not using Kirsch at all due to misunderstanding.

Fixes #11354.
2024-04-15 13:26:08 +02:00
Magne Sjaastad
62e497f5fc Bump version to 2024.03.1-RC_01 2024-04-15 10:33:56 +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
Kristian Bendiksen
0c35890c70 #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.

Fixes #11310.
2024-04-15 10:33:56 +02:00
Kristian Bendiksen
3f9979823e #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.

Fixes #11334.
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
44e32fcff3 Always recreate ESMRY if file exists and is older than SMSPEC 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
274d4fc0db Early return if data already is available
If not checking if data is available, data is read from file and appended to result vector.
2024-04-15 10:33:56 +02:00
Magne Sjaastad
d6a1db843f Create the static scalar results once
addStaticScalarResult will clear already computed data, causing calculations to be triggered once more
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
Magne Sjaastad
869a2430ae Revert "Pin cmake to 3.28.x due to build issues with 3.29"
This reverts commit df0a86f076.

Issue was fixed in 3.29.2
https://gitlab.kitware.com/cmake/cmake/-/issues/25873
2024-04-14 20:27:08 +02:00
Kristian Bendiksen
eeecc41ad1 Fix typo. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
c402142e58 Refactor: extract duplicated code. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
eb02e9e0a5 #11332 2D Intersection Views: Improve automatic depth resolution. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
7836181ad1 Refactor: use lambda instead of define. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
c367fe5e7f Bump to version dev 03. 2024-04-10 13:05:34 +02:00
Kristian Bendiksen
67a9e14417 CSV Well Log: change sampling rate from 1.0 meter to 0.1 meter. 2024-04-10 13:05:34 +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
3f3b5a621d #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.

Fixes #11334.
2024-04-08 14:41:46 +02:00
Magne Sjaastad
df0a86f076 Pin cmake to 3.28.x due to build issues with 3.29 2024-04-07 14:16:12 +02:00
Kristian Bendiksen
55ca147f9d Bump to version dev 02. 2024-04-05 14:39:46 +02:00
Kristian Bendiksen
85b6ea397a Interpolation: Add check for array size for extrapolation. 2024-04-05 14:39:46 +02:00
Kristian Bendiksen
efe37bb063 Well Log CSV: fix interpolation of CSV data.
The TVD measurements from the well path were used to interpolate the CSV data.
The typically well path is too coarsely sampled which would lead unwanted
smoothing of the data.

Fixed by resampling the well path to a one meter sampling interval.
2024-04-05 14:39:46 +02:00
Kristian Bendiksen
bebf59c309 Interpolation: Fix "trend" extrapolation for value outside of range on high end. 2024-04-05 14:39:46 +02:00
Kristian Bendiksen
bce4dcfe54 #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.

Fixes #11310.
2024-04-05 14:26:57 +02:00
Eirik Marthinsen
29d991159b AppFwk: Move include of windows.h to top of file
The include was located in the middle of a file inside a namespace caf
block and lead to ambiguous symbols when compiling with unity build and
Qt6. It is also considered good practice to have includes at the top.

The pragma warning disable is also removed as the warning seems to be
gone (and none of the other windows.h includes have it).

Closes #11327
2024-04-05 14:20:00 +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
d72a45d3fe Bump version to 2024.03.1-dev.01 2024-03-25 12:59:48 +01:00
Magne Sjaastad
820fa561ba
Fix deploy to pypi 2024-03-25 12:57:49 +01:00
Magne Sjaastad
2842f59db9 Merge tag 'v2024.03.0' into dev 2024-03-25 10:41:20 +01:00
Magne Sjaastad
4a0c2f2f4f
Merge pull request #11316 from OPM/dev
Release 2024.03
2024-03-25 10:32:37 +01:00
Magne Sjaastad
e069e13c86 Bump version to 2024.03.0 2024-03-25 10:21:31 +01:00
Magne Sjaastad
b57767d895
Add feature to set parent well 2024-03-25 10:19:31 +01:00
Magne Sjaastad
7e60a4185b
Merge pull request #11315 from OPM/main
Merge pull request #10940 from OPM/dev
2024-03-25 10:09:15 +01:00
Magne Sjaastad
cf4cf562b0 Bump version to 2024.03.0-RC_04 2024-03-22 08:46:28 +01:00