Commit Graph

446 Commits

Author SHA1 Message Date
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
Magne Sjaastad
0fd27a3a8d Add [BETA] as postfix to user interface
Add postfix to SUMO and OSDU cloud import features.
2024-08-28 09:22:55 +02:00
Kristian Bendiksen
0518e594ce Improve caching. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
44076f4911 Sumo: load parameter sensitivities (i.e. "parameters.txt") for ensembles. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
c322ba62bb #11636 Fix missing well path creation when importing LAS file without a well path file
Fixes #11636.
2024-08-23 17:07:48 +02:00
Kristian Bendiksen
f6fa93bb66 Sumo: Fix concurrency issue when stepping too fast. 2024-08-23 12:18:05 +02:00
Kristian Bendiksen
ef9a397188 Sumo: improve logging and remove some unused code. 2024-08-23 12:18:05 +02:00
Kristian Bendiksen
123f6fdcfa Sumo: Fix incorrect signal-slot connection. 2024-08-23 12:18:05 +02:00
Kristian Bendiksen
12069ca80a Sumo: Fix incorrect signal connection.
The signal was not connect using the std::function signalCallable.
Therefore the signal would never trigger the QEventLoop::quit() slot,
and UI would be stuck waiting for the time out.
2024-08-23 12:18:05 +02:00
Kristian Bendiksen
f777dfa4ba Sumo: Increase request timeout. 2024-08-23 12:18:05 +02:00
Magne Sjaastad
1a3a005c1c Add optional import of SUMO/OSDU settings from JSON (#11630)
Add optionally import of SUMO/OSDU settings from JSON. Check for sumo_config.json and osdu_config.json. If present, import settings to preferences and set fields read only.
2024-08-22 07:18:06 +02:00
Magne Sjaastad
141484f8a7 Improve error handling when trying to access OSDU data
Show more details when support for SSL is missing.

Move connection of signal/slot away from constructor. This makes it possible to use ResInsight even if SSL is not available.
2024-08-19 16:33:19 +02:00
Kristian Bendiksen
b324fdb26b Close project if cancelling well path loading. 2024-08-16 15:46:22 +02:00
Kristian Bendiksen
bf2a852b4d Add cancellation of well path collection loading. 2024-08-16 15:46:22 +02:00
Magne Sjaastad
f0e19b0fb5 Use vcpkg for fast-float and spdlog 2024-08-14 13:58:11 +02:00
Kristian Bendiksen
6e3e0ad538 Use unique_ptr for data loaders. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
76a1d43b0e Osdu: make sure token is valid before background loading. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
2651ca91b6 Add well log loaders. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
694d2eda66 Add background data loader framework and well path loaders. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
e9c46c5cec Rename RimSummaryCaseCollection to RimSummaryEnsemble. 2024-07-30 08:55:12 +02:00
Magne Sjaastad
6fb74654a1 Improve interface for string operations
Trim incoming string before converting to number
Remove use of std::strtod and std::stoi
Use std::string_view instead of std::string when possible
2024-07-25 21:21:53 +02:00
Magne Sjaastad
d8bd7bc81a Cloud connector cleanup
* Rename to RiaOAuthHttpServerReplyHandler
* Add comment header
* SUMO: Use function pointer to simplify network request
2024-07-23 11:49:07 +02:00
Magne Sjaastad
a77f50e3a8 SUMO connector adjustments
Disable SUMO connector object when running regression tests to avoid request for credentials
2024-07-22 11:33:38 +02:00
Kristian Bendiksen
773d9b08c9 Janitor: remove unused code. 2024-07-13 12:07:49 +02:00
Kristian Bendiksen
2aa1bfe940 Cloud: save expiration timestamp for access token.
Expired access tokens are ignored when reading from file.
2024-07-13 12:07:49 +02:00
Kristian Bendiksen
3e2af38c90 Cloud: Use separate files for Osdu and Sumo tokens. 2024-07-13 12:07:49 +02:00
Kristian Bendiksen
896e4979bf Cloud: Handle refresh of access token. 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
151f433124 Cloud: create directory if missing when saving access token. 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
734a84956e Osdu Well Log: use channel "CurveId" instead of "Mnemonic". 2024-07-12 19:18:09 +02:00