Commit Graph
17082 Commits
Author SHA1 Message Date
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
magnesj 932464ea55 Fixes by clang-tidy 2024-04-18 07:26:55 +02:00
Kristian Bendiksen e77b4f9e3b Bump to version dev 05. 2024-04-17 15:41:15 +02:00
Kristian Bendiksen 3255b649ca #11072 Refactor: remove homemade atomic counter.
std::atomic was introduced in C++11, and provides same functionality in
platform-independent way.

Fixes #11072.
2024-04-17 15:41:15 +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 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 38e4cc364b Update qwt with optional Qt6 support 2024-04-16 15:32:55 +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 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
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 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