Commit Graph

474 Commits

Author SHA1 Message Date
Magne Sjaastad
1ce2f9651c
#11954 Improve the curve merger algorithm
* Add flag to indicate identical X values when curves are merged
* Detect if x values are monotonically increasing
2024-12-03 16:53:11 +01:00
Arne Morten Kvarving
6d4824b204 fixed: build against QT 6.8 2024-12-03 12:40:26 +01:00
Magne Sjaastad
041e2f2e13 #11938 Cloud Config: Show the full path to config file for cloud services 2024-11-29 06:28:02 +01:00
jonjenssen
bb19ba75a4
Add support for deleting OSDU and SUMO user token files (#11935)
* Add support for deleting OSDU and SUMO user token files
2024-11-28 19:40:17 +01:00
Magne Sjaastad
e54c4f3c1e Make sure all scheduled redraws are done
Snapshot image from the regression test
TestCase_Flow was wrong for well allocation plots, the well log part was not updated correctly.
2024-11-27 12:29:12 +01:00
jonjenssen
f716b4e964
Support multiple timesteps per day using opm_common reader (#11908)
* Fix progress window hiding time step filter dlg
* Clean up reader preferences
2024-11-21 12:42:13 +01:00
Magne Sjaastad
9b6e441386 Make it possible to exclude partial delta curves
Make sure statistics curves are recomputed on flag change

When toggling "Discard Missing or Incomplete Realizations", make sure the statistics is recomputed and the ensemble plots updated.
2024-11-18 07:45:20 +01:00
Kristian Bendiksen
c2ec023720 Add utility for finding min/max of vector. 2024-11-13 15:36:44 +01:00
Magne Sjaastad
b0344a1e72 Logging: Skip identical messages logged close in time
There can be situations where multiple identical log messages are computed in a short time interval. Default time interval is set to 1 second, if the message is reported after this interval, the message is added to the log.
2024-11-13 15:18:10 +01:00
Magne Sjaastad
67e6df28b5 #11857 Make sure the summary curve type is updated
Always compute curve type Rate or Accumulated based on address if Auto curve type is set.
2024-11-06 07:16:07 +01:00
Magne Sjaastad
1cbdbfa7df Remove waitUntilWorkIsDone as this can cause eternal loops 2024-11-06 07:16:07 +01:00
Magne Sjaastad
1a3cb1f241 Fix missing include and bump version 2024-11-04 18:31:18 +01:00
Magne Sjaastad
9ed4318470 Avoid redraw of 3D views during summary import 2024-11-04 17:34:49 +01:00
Magne Sjaastad
71b0ae1a16 Remove duplicated code in RiaPlotWindowRedrawScheduler 2024-11-04 17:34:49 +01:00
Magne Sjaastad
59df1a655e #11851 Initialize OpenGL when main window is created 2024-11-04 17:34:49 +01:00
Magne Sjaastad
275526a64a Remove unused includes
Remove unused includes, mostly AppEnum.h
2024-11-04 09:54:23 +01:00
jonjenssen
da683bed9e Move Rig well related things to subfolder and update include statements 2024-10-31 15:08:59 +01:00
jonjenssen
69878f54d3 Work in progress 2024-10-29 18:17:31 +01:00
Magne Sjaastad
95365ad5d0 Add timing support to logger 2024-10-29 14:33:48 +01:00
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
Magne Sjaastad
c795eccf0b Align the search expression with sumo explorer 2024-10-24 08:50:26 +02:00
Magne Sjaastad
fd0ebd989b Improve performance when computing interpolated values
Use OpenMP when computing interpolated values for a curve.
Use std::lower_bound to quickly find a relevant start index, avoids starting from 0 each time.
2024-10-23 12:38:22 +02:00
Magne Sjaastad
581b268928 Use hash of input do control if calculation is required
Add hash functions
Add serial number to SummaryReaderInterface
Add hash for RimSummaryCase

Use hash based on input parameters to control caching of data in RimEnsembleStatisticsCase::calculate  and RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses
2024-10-23 12:38:22 +02:00
Magne Sjaastad
df091336e0 Move summary tools into separate folder 2024-10-22 07:28:43 +02:00
Magne Sjaastad
2e305bd762 Add quick access dock widget 2024-10-21 14:11:22 +02:00
Magne Sjaastad
4ff5aaf381 Add quick access data model objects 2024-10-21 14:11:22 +02:00
Magne Sjaastad
c3d60869bd Improve support for network vectors
Show all text if summary address contains multiple : for network addresses
Consolidate replace of tokens in summary address
2024-10-21 09:38:33 +02:00
Magne Sjaastad
77c789a179 Improve performance when creating multiple plots 2024-10-21 09:38:33 +02:00
Magne Sjaastad
4719090b5f Define long names for summary vectors in JSON files 2024-10-14 08:53:28 +02:00
Magne Sjaastad
ca4a7b9000
Remove obsolete code related to Qt5
* Remove bundling of openssl1.1
* Remove obsolete compile flags
* Remove use of obsolete RimCommandObject
* Use QColor::isValidColorName
QColor::isValidColor is deprecated in Qt 6.6, QColor::isValidColorName was introduced in 6.4

* Make sure debug DLLs are copied when required
* Remove Qt5 from AppFwk
* Remove obsolete copy of Qt  DLLs
2024-10-07 10:16:48 +02:00
Magne Sjaastad
e7a082ac29 Regression Test: Find relevant objects and show them in Property Editor 2024-10-02 15:20:27 +02:00
Kristian Bendiksen
13cf450831 Add result calculator for PORV*SOIL, PORV*SGAS, and PORV*(SOIL+SGAS). 2024-09-30 13:42:28 +02:00
Magne Sjaastad
212f5bf5ae
Add support for Qt6 and disable Qt5
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2024-09-30 11:21:17 +02:00
Magne Sjaastad
e1864bf93b Disable experimental settings for only load active cells 2024-09-24 14:49:10 +02:00
Magne Sjaastad
12ae4dbaaa Improve detection of special *FIP* property names
Make sure RFIP* and SFIP* are not treated as category results
2024-09-24 14:49:10 +02:00
Magne Sjaastad
7486f20e98 Exclude some statistics results from category classification
Avoid FIPOIL_MEAN and similar as a category result.
2024-09-24 07:45:10 +02:00
Magne Sjaastad
48070f6539 #11706 Use connection depths when plotting connection data
The plotting of curve values for connections to a segment fails in some cases. The current implementation finds the segment a connection is attached to, and use the depth (both MD and TVD) information from this segment. This method is not working in all cases.

Use the reported location of connections attached to segments based on CONLENST and CONLENEN. When measured depth is requested, use these values. There might be gaps in the reported segment sequence.

Use CONDEPTH when TVD depth is requested.

Use CONBRNO to find the branch number, and then use lookup table branchIdsAndOneBasedBranchIndices to find the branch index. Use the branch index to filter the results for requested branch.

The number of values in CON* result values is different to result values for SEG* results.
2024-09-19 10:21:58 +02:00
Magne Sjaastad
9d66e6195e
Release adjustments
* Use appendMenuItems instead of ContextCommandBuilder
* Specify RimEclipseCaseCollection menu features once
* Add function to enable up/down arrows for combo box
* Guard crash when closing project
* Improve UI for grid case ensemble
- Create a view for the first case in the ensemble
- Show case name in view title
- Enable up/down buttons to Eclipse case
* Make sure 3D views in grid ensemble are created on project load
2024-09-16 09:49:22 +02: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
Kristian Bendiksen
ff3b932257 Cloud: fix crash in PdmUiEditorHandle due to recursive event loop. 2024-09-09 14:32:32 +02:00
jonjenssen
19269ecf72 Add "experimental" to setting label 2024-09-09 13:17:20 +02:00
Magne Sjaastad
7ba4329bb4 Add qt-version to matrix configuration 2024-09-06 12:11:50 +02:00
Magne Sjaastad
a443655b42 Prefix NetworkAuth includes 2024-09-06 12:11:50 +02:00
Magne Sjaastad
03c0e97296 Prefix Sql includes 2024-09-06 12:11:50 +02:00
magnesj
fc2106edb0 Fixes by clang-tidy 2024-09-02 15:26:44 +02:00
Kristian Bendiksen
d8eb34c00d Janitor: fix memory leaks. 2024-09-02 13:58:00 +02:00
Kristian Bendiksen
cf7a38375d #11649 Reverse order of terms in polynomial expression. 2024-08-30 10:21:49 +02:00
Magne Sjaastad
681b4fbffe #11650 Cloud data configuration file search order
Check multiple locations for configuration files. The first valid configuration file is used. Currently, using Qt5 the ResInsight binary file is stored at the root of the installation folder. When moving to Qt6, we will probably use sub folders /bin /lib and others. Support both one and two search levels to support Qt6.
2024-08-30 09:19:39 +02:00
jonjenssen
0572069511
Support for loading only active cell geometry (#11624)
* Only load active cells for main grid, skip LGRs for now
* Handle wells with inactive cells
* Validate mapaxes transform before using it.
* Add log message
* Additional guarding when trying to find the geometrical location of a simulation cell
* Add extra safeguarding for init/restart file access in opm common. Only support unified restart files.
2024-08-28 18:22:57 +02:00
Magne Sjaastad
27c46a65fd
Improve user control on resampling operations
Allow user to specify Accumulated or Rate for a summary curve. Default setting is Auto, and summary address is used to derive Accumulated/Rate. User can set curve type explicitly.
2024-08-28 15:23:07 +02:00