Commit Graph
415 Commits
Author SHA1 Message Date
Magne Sjaastad 86691d8844 #13095 Avoid error message trying to read data not present in file 2025-11-10 14:58:55 +01:00
Magne Sjaastad 2a0e39ef80 Removes ensemble summary import mode as separate cases import is not supported.
Simplifies the UI by removing the ensemble import option, and updates the logic to handle summary import mode correctly by only supporting skip or unified imports. If separated cases is required for a single summary case, this can be activated by using the import dialog.

Adds logic to initialize after read to ensure that if SummaryImportMode is SEPARATE_CASES, it changes to NOT_IMPORT.
2025-11-10 14:58:55 +01:00
Magne Sjaastad 3621b4ea57 #13137 Make sure calculated vectors appears in tree view
When populating the addresses to be displayed in the tree view, the native file readers must be populated first. The calculated addresses depend on addresses available in native readers.
2025-11-10 14:58:55 +01:00
Magne Sjaastad a236ae2051 Compute measured depth if not present on file (#12872)
* Refactors RigWellPathGeometryTools to namespace
* Refactors measured depth calculation to utility.
* Calculates MD if missing from well path data
2025-10-13 14:35:42 +02:00
Magne Sjaastad 24ca039790 #12927 Add optional time threshold before creating ESMRY
When checking timestamp for ESMRY vs SMSPEC, allow ESMRY to be written before SMSPEC within a given limit in time difference.
2025-10-13 14:35:42 +02:00
Magne Sjaastad 1bc0c112a9 #12989 Always evaluate calculated expressions before file data 2025-10-13 14:35:42 +02:00
Magne Sjaastad 083a1dbfad #12996 Resdata: Prefer UNRST over FUNRST 2025-10-13 14:35:42 +02:00
Magne Sjaastad 8ff9d44c3f #12953 Always check date of all realizations
The date stamp of UNSMRY is compared to date stamp of ESMRY. This takes some time, and a performance improvement was seen when this operation was done only on a single representative realization of an ensemble. This is not stable, as a single realization might crash or have no new data compared to other realizations.

This feature is removed.
2025-10-13 14:35:42 +02:00
Magne Sjaastad 917136fec8 Release 2025.09.0 2025-09-01 12:38:48 +02:00
Magne Sjaastad 649de047d0 Add resampling method to RiaCurveMerger
Delete unused parameter
2025-06-16 14:25:13 +02:00
Magne Sjaastad d7d18ce9ab #12495 Refactors ensemble statistics handling
Removes the dedicated `SUMMARY_ENSEMBLE_STATISTICS` category and instead uses a `statisticsType` field within `RifEclipseSummaryAddress` to represent ensemble statistics.

This change simplifies the code and avoids potential confusion by representing statistics as attributes of existing summary types, rather than a separate category. It also improves code robustness.
2025-06-10 10:52:18 +02:00
Magne Sjaastad fae4623477 #12419 Avoid assert during load of simulation case
Validate incoming parameters before use
2025-05-09 08:32:04 +02:00
Magne Sjaastad 5c2869d75f #12427 Support both single and double underscore as keyword divider 2025-05-09 08:32:04 +02:00
Magne Sjaastad d2d50a4866 #12436 Read and display date for summary restart files 2025-05-09 08:32:04 +02:00
Magne Sjaastad ec191f32e3 #12425 Use Qt file operations to establish absolute path to restart case 2025-05-09 08:32:04 +02:00
Magne Sjaastad f96374a6b4 2025.04.0 Merge dev into main 2025-04-07 12:21:57 +02:00
Magne Sjaastad a18728b6e7 #11989 Check indices before accessing two-dimensional vector 2024-12-16 08:01:10 +01:00
Magne Sjaastad b48b58ca14 #11386 Summary plot: TCPU and ELAPSED are cumulative vectors 2024-12-04 18:47:07 +01:00
jonjenssen 5fa572266f Fix missing size check. 2024-11-21 12:57:50 +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 06fb3e1241 #11895 Always show Oil Saturation as available
If no SOIL is found on file, compute based on available SWAT and SGAS.
2024-11-19 13:08:04 +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
Magne Sjaastad 664b082c81 Use opm-common to read restart file from summary file
Testing identified performance issues related to reading restart file name from summary files.

Make sure the reading of timesteps is done only when required in new function getFileInfoAndTimeSteps.

Add reading of restart file name using opm-common when opm-common is active. The performance of this reader is much better than resdata.
2024-11-14 19:28:51 +01:00
Magne Sjaastad acbf0ef15a Fix crash when accessing an empty vector
If the UNSMRY data is missing, no timesteps are available. Make sure that we check if any timestep is available before accessing the vector.
2024-11-14 19:28:51 +01:00
Magne Sjaastad 7550b8702c Rename delta ensemble and case
Rename to RimDeltaSummaryCase and inherit RifSummaryReaderInterface
Rename to RimDeltaSummaryEnsemble

Remove obsolete RifDerivedEnsembleReader
2024-11-13 15:18:10 +01:00
Magne Sjaastad d2cd425ad0 11867 Do not assume that the first reported time step is initial time step 2024-11-07 12:02:25 +01:00
Magne Sjaastad 275526a64a Remove unused includes
Remove unused includes, mostly AppEnum.h
2024-11-04 09:54:23 +01:00
Magne Sjaastad 9a1c54c7d6 Add debug timers to import of UNRST files 2024-10-31 19:05:10 +01:00
jonjenssen da683bed9e Move Rig well related things to subfolder and update include statements 2024-10-31 15:08:59 +01:00
Magne Sjaastad 2154c0ae3b Use updated API for total cell count 2024-10-29 18:17:31 +01:00
jonjenssen f21d1545f8 Some cleanup 2024-10-29 18:17:31 +01:00
jonjenssen db66ec82de Some clean up and fixes 2024-10-29 18:17:31 +01:00
jonjenssen 78d82acb41 Add specialiced active cell subgrids 2024-10-29 18:17:31 +01:00
jonjenssen 88118ee4e1 Privatize grid cell array 2024-10-29 18:17:31 +01:00
jonjenssen 69878f54d3 Work in progress 2024-10-29 18:17:31 +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 a9ea615bf0 Add support for increase of serial number when data is assigned to a SUMO case 2024-10-24 08:50:26 +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 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 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
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 d2a160f793 Make RFT pressure data more robust
Replace tab with space, and fix an out of bounds bug.
2024-09-24 14:49: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
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
magnesj fc2106edb0 Fixes by clang-tidy 2024-09-02 15:26:44 +02:00
Kristian Bendiksen 1736c01dfa Janitor: fix warning on clang 14. 2024-09-02 13:58:00 +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