Commit Graph

17123 Commits

Author SHA1 Message Date
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
Kristian Bendiksen
55c0e81d9e OpenSSL: remove OpenSSL bundling.
The OpenSSL library from vcpkg is unlikely to be the one needed by Qt.
2024-04-26 11:59:47 +02:00
Magne Sjaastad
df7112e615 Add missing includes 2024-04-25 10:00:25 +02:00
Magne Sjaastad
26df3dda7d Prepare dev branch for new features 2024-04-25 09:37:27 +02:00
Magne Sjaastad
ed5382af24 Merge branch 'main' into dev 2024-04-25 09:34:11 +02:00
Magne Sjaastad
15fe46cf1f Release 2024.03.3 2024-04-25 09:22:43 +02:00
Magne Sjaastad
2b25ac87e7 Show error message if no flow data is available 2024-04-25 09:22:43 +02:00
Magne Sjaastad
a993841671 #11396 RelPerm: Remove display of KROG curve if no gas is present 2024-04-25 09:22:43 +02:00
Magne Sjaastad
6e74fa98c0 #11395 Grid Calculation: Make sure a generated result can be used 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
534348c1a0 #11385 Add exclude list used during identification of category results 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
c17e5237ca Revert "Early return if data already is available"
This reverts commit 274d4fc0db.
2024-04-22 12:25:20 +02:00
Magne Sjaastad
16be653826
Updates after patch release 2024-04-22 10:33:45 +02:00
Magne Sjaastad
b78cc23add Release 2024.03.2 2024-04-22 10:01:41 +02:00
Magne Sjaastad
1bee1d9bed Make sure we read data from file reader only when required
Use same pattern as for dynamic results.
2024-04-22 09:54:43 +02:00
Magne Sjaastad
91c82f0010 Revert "Early return if data already is available"
This reverts commit 274d4fc0db.
2024-04-22 09:07:22 +02:00
Magne Sjaastad
745f9883b5 GHA: Fix download-artifact version 2024-04-19 16:01:18 +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
8b59849203 Bump version to 2024.03.1 2024-04-19 12:34:52 +02:00
Magne Sjaastad
e71226dc8d Bump version to 2024.03.1-RC_02 2024-04-18 13:24: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
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
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
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