Commit Graph

27 Commits

Author SHA1 Message Date
Magne Sjaastad
2814b92055 Qt6: Adjustments (#11804)
* Qt6: Avoid insertWidget, use addWidget
In Qt6, the insertWidget function checks if the index parameter is valid based on current widgets present in the layout. This is error prone, and use addWidget to avoid manual counting of index.

* Disable use of Qt keyword foreach

* Replace use of QRegExp with QRegularExpression
Replace use of QRegExp with QRegularExpression
Remove dependency on qt5compat module
Simplify an expression based on review

* Remove Qt5 ifdefs

* Guard access out of bounds seen in debug build

* Avoid reuse of string variable

* Disconnect all signals from the QOpenGLContext
The call stack when this assert happens indicates that there are more signals to be disconnected from the object. Crash is fixed by disconnecting all signals.

Assert seen in debug build:

ASSERT failure in caf::Viewer: "Called object is not of the correct type (class destructor may have already run)", file C:\Qt\6.6.3\msvc2019_64\include\QtCore/qobjectdefs_impl.h, line 130

* Fix issue related to delete of a linked view
Guard null pointer use in view linker. Remove complicated cleanup in destructor in Rim3dVew.
2024-10-28 13:09:18 +01:00
jonjenssen
fd2989972d Add option to skip/invalidate long, thin cells. (#11691)
* Add option to choose if the user wants to skip/invalidate long, thin cells.
2024-09-13 07:34:14 +02:00
Magne Sjaastad
a3a740b722 PFLOTRAN: Make parsing of faults more robust
Remove logging text causing noise, write out message only when PFLOTRAN file is found.
2024-09-11 10:28:07 +02:00
Magne Sjaastad
e9509f026a Improve robustness when parsing PFLOTRAN files
The include statements can optionally have a / at the end of the line. Make sure the parsing handles this correctly.
2024-09-06 17:22:09 +02:00
Magne Sjaastad
24fcec79ab Look for fault definition in Pflotran input files
Look for fault definition in Pflotran input files If no *.DATA file is found, look for *.IN file and search for fault definitions.
2024-08-30 10:03:03 +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
21843820e6 Update clang-tidy.yml
* Make sure clang-tidy action use .clang-tidy config file
Use add-paths to instruct create-pull-request to a sub folder to avoid diff from Qt and vcpkg

* Use empty() in macro to avoid clang-tidy warning
* Add NOLINT to CAF_ASSERT
* Add NOLINT to cvfAssert
2023-10-03 09:04:08 +02:00
Magne Sjaastad
13b4c19bbb Import of AICD valve definition from text file
* Add readKeywordContentFromFile
* Add import of AICD values from Completor and Eclipse
2023-09-12 19:45:32 +02:00
Magne Sjaastad
b1157436fe #10523 Export sector model: Support more result categories
Allow export of GENERATED and INPUT_PROPERTY in addition to STATIC.
2023-08-21 13:58:58 +02:00
Magne Sjaastad
3030e9f4af Refined grid export appears to give wrong number of cells
* #10503 Refined grid export appears to give wrong number of cells
Make sure size of exported grid is correct
Refactor computation of cell indices
2023-08-18 10:57:12 +02:00
Magne Sjaastad
5ee764af48 Refactor result definition 2023-05-11 08:37:58 +02:00
Jørgen Herje
0d8aee8995 GRDECL: Import multiple grid files from dialog (#10142)
Add import of N .GRDECL grid files - as done for roff-files
2023-04-21 10:34:29 +02:00
Magne Sjaastad
952e766c2f Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +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
Magne Sjaastad
f0e78f32e8 Minor issues related to release
* Add shortcut for Plot Editor, and modify how command features are triggered
Use Ctrl-E to launch the Plot Editor.

* Add optional use of NOECHO and ECHO keywords in GRDECL files
* Add ECHO keywords to sector model export
* Add Help button to Preferences
2023-02-20 08:18:08 +01:00
Magne Sjaastad
edbeb4dfb1 Fix invalid parsing of line with keyword end tag and comment
* Add error text when size differs
* #9845: Remove invalid parsing of data in comment line
The line '/ -- 123 123' was parsed incorrectly, and values 123 123 was added to the list of valid values for the keyword.
2023-02-16 13:04:16 +01:00
Magne Sjaastad
70bb221162 Janitor issues
* Remove obsolete code
* Fix path modification of a relative folder
Replace start token '.' with file path to the project file to make sure that the path './wells/a-1h.dev' can be imported correctly.
* Add more logging when keywords are missing from import
2023-02-15 07:56:17 +01:00
Magne Sjaastad
86af2b4dfc Export Sector Model: Add file path
* Export Sector Model: Add file path
* Avoid abort if a file cannot be opened
* Add missing return
2022-11-28 11:57:00 +01:00
Magne Sjaastad
806a149809 Fix several deprecation warnings (#8657)
* Use constructor instead of nullptr for WindowFlags
* Use constructor instead of nullptr for Alignment
* Disable deprecation warning for QProcess
* Add string split method to RaTextStringTools
* Add caf.cpp used to manage Qt function deprecations
* Use position()
2022-03-11 13:24:01 +01:00
Magne Sjaastad
6b13a31349 #8143 Performance: Avoid parsing grid GRDECL file twice
Previous implementation parsed grid file twice both for geometry data and properties.
2021-10-21 14:21:16 +02:00
Magne Sjaastad
54d1b67d88 GRDECL import : Fix import of mapaxes 2021-10-18 10:20:28 +02:00
Magne Sjaastad
04b19e3ad7 #8143 GRDECL import : Refactor grid data and property import 2021-10-14 07:26:13 +02:00
Magne Sjaastad
63690d5196 Major rewrite of MSW export model 2021-04-13 07:54:34 +02:00
Kristian Bendiksen
6f3640ff78 #6947 Silence warning about ECHO eclipse keyword size mismatch. 2021-03-05 13:42:58 +01:00
rubenthoms
bc81437435 Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)
* Moved UnitSystem from RiaEclipseUnitTools to RiaDefines.
- Renamed UnitSystem to EclipseUnitSystem
- Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h
* Moved  result name functions into separate file.
* Minor cleanup

Co-authored-by: rubenthoms <rubenthoms@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2021-01-21 12:58:46 +01:00
Gaute Lindkvist
81699db187 Rename ApplicationCode to ApplicationLibCode 2021-01-11 15:27:45 +01:00