Commit Graph

474 Commits

Author SHA1 Message Date
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
Kristian Bendiksen
eda26bcc25 Cloud: Extract common oauth2 parts of Sumo and Osdu connector. 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
44daecac9a Refactor: move RiaOsduConnector to Tools/Cloud. 2024-07-10 18:57:15 +02:00
Magne Sjaastad
e63005348c Create a compact string representation of a list of integers 2024-07-05 12:47:54 +02:00
Magne Sjaastad
ffc1687cc7
Add Sumo connector and related cloud tools
* Add cloud data icon
* Add Sumo connector and related helper tools
* Reorganize preferences and remove ssihub
* Use timeout defined for Sumo
2024-07-05 09:31:16 +02:00
jonjenssen
868e9916bc
Grid preferences update (#11547)
* Refactor RifReaderSettings and grid preferences tab
2024-07-04 12:38:41 +02:00
jonjenssen
4365b0dfb9
Grid import using opm-common improvements (#11438)
* Update opm-common EGRID reader to support LGRs, NNCs, dual porosity, unit system info and time step filters
* Rearrange well reading code into separate class
* Update resdata library to not require an ecl_grid when reading well information. Only lgr names are needed, allows reused by opm_common reader
2024-06-18 13:03:48 +02:00
Magne Sjaastad
82dea49ac6 Add color legend to show curve set colors 2024-06-18 11:49:22 +02:00
Kristian Bendiksen
7125670d8c Review fixes. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
44ca21636a Osdu: extract constants to separate namespace. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
8854abe482 Osdu: get well paths from ddms instead of Osdu Storage api. 2024-06-14 17:31:22 +02:00
Magne Sjaastad
41d5e498d7 Simplify PdmDocument class and move fileName to private
Remove resolveReferencesRecursively() and initAfterReadRecursively() from PdmDocument::readFile(). These functions will be called in RiaApplication::loadProject after the file paths modifications are done. This will ensure that file paths can be used in initAfterRead() functions.
2024-06-05 14:35:01 +02:00
Magne Sjaastad
a952fbce7e Move function to RiaProjectFileTools
Rename to RiaProjectFileTools
2024-06-05 14:35:01 +02:00
Magne Sjaastad
1c899df063 Octave: Change default port number and add custom port number to Preferences 2024-06-03 10:17:21 +02:00
Magne Sjaastad
1d57b9032b
Custom vfp plot (#11450)
* AppFwk: When clearing a tree selection, make sure all values are cleared
* Fix deprecated implicit lambda
* Add support for using the closest value in addition to exact match
* Add table data source object and add plot with multiple data sources
Delete the temporary RimVfpDeck class
Add RimVfpTable to represent a table in a data source
Add plot able to show data from multiple tables

* AppFwk: Make it possible to call resolveReferences multiple times
Use case: Vfp tables are stored in files. Multiple tables can be present in one file. Pdm table objects are created after resolve references is done as part of parsing file. When the Pdm object are created, resolveReferences can be called once more.

* Call resolveReferencesRecursively() after RimVfpTable objects are created
2024-05-29 12:55:45 +02:00
Jon Jenssen
9858d09a33 Add support for overriding egrid reader type on command line. Override disables GUI in preferences. 2024-05-27 15:26:48 +02:00
Kristian Bendiksen
577ef1e154 Add support for well paths from OSDU. 2024-05-24 15:19:43 +02:00
Magne Sjaastad
96481d81a8
Add tool used to extract project file revisions from project file database
* Add tool used to extract project file versions from database
* Delete old records from backup to limit number of records to 50
2024-05-04 13:21:31 +02:00
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
ed5382af24 Merge branch 'main' into dev 2024-04-25 09:34:11 +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
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
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
Magne Sjaastad
b9d9d53964 #11355 Use category if result name starts with FIP or ends with NUM 2024-04-15 10:33:56 +02:00
Kristian Bendiksen
85b6ea397a Interpolation: Add check for array size for extrapolation. 2024-04-05 14:39:46 +02:00
Kristian Bendiksen
bebf59c309 Interpolation: Fix "trend" extrapolation for value outside of range on high end. 2024-04-05 14:39:46 +02:00
Kristian Bendiksen
873282b339 Refactor: avoid local variable only used in range-based for loops 2024-04-04 10:24:21 +02:00
Kristian Bendiksen
be3d06c549 Refactor: improve api for views and oil fields. 2024-04-04 10:24:21 +02:00
Magne Sjaastad
eaa96a042b Fix detection of ROFF file type 2024-03-22 08:46:28 +01:00
Magne Sjaastad
785871cae3 Add realization filtering based on text string
Add unit tests and support min max range specifications. Example string "-5, 5, 8-10, 12-"
2024-03-21 07:11:21 +01:00
Magne Sjaastad
a880a42752
Summary performance improvements
* Check flag before rebuilding summary address nodes
* Performance: Use vector instead of set and map locally in thread
* Performance: Skip looking for restart summary filenames for opm-common
* Move adding of case realization parameters to OpenMP loop
* Add unit test for file path operations
* Performance: Avoid using cdUp() function when splitting path into strings
2024-03-18 11:46:43 +01:00
Magne Sjaastad
bfda6519db
Cleanup includes
Use new tools in Visual Studio to help cleaning up includes and remove redundant includes.
2024-03-07 19:45:43 +01:00
Magne Sjaastad
be1a274280 Use consistent scaling factor for gas rates in field units
Use fieldGasToOilEquivalent = 1000.0 / 5614.63;
2024-02-28 11:00:20 +01:00
Magne Sjaastad
a0ecdf47a5
Show git SHA for command line parameter --version 2024-02-27 12:10:19 +01:00
Magne Sjaastad
28d281e1d6
Use polygon as data source for intersection
- Use polygon as data source for intersection
- Add padlock icon
- Show padlock icon on read only polygons
- Add Fwk function appendMenuItems() to make it possible to define context menu content in a PdmObject
- Context menu "Create Polygon Intersection"
- Updates to make visualization consistent with object and object collection enabled state
2024-02-25 09:21:48 +01:00
Magne Sjaastad
6fe997b3c9 Add and use caf::PdmUiPushButtonEditor::configureEditorLabelHidden 2024-02-23 08:47:52 +01:00
Magne Sjaastad
5fdf30d124 Add polygon classes 2024-02-16 15:51:19 +01:00
Kristian Bendiksen
85753568b6 WBS Plot: Improve initial placement of curve, and add better default colors. 2024-02-14 15:16:47 +01:00
jonjenssen
5391179e16
Add separate target for unit tests for easier test access. Remove unit tests from ResInsight application. (#11184)
Clean up cmake configuration a bit, and pull down gtest when needed, no longer use a thirdparty subfolder
Add a ResInsight-tests target to run the unit tests
2024-02-11 20:04:04 +01:00
Magne Sjaastad
4db04c76a2 Add missing include seen on VS 17.8.0 2024-02-07 10:07:18 +01:00
Magne Sjaastad
4dd43a14a0 #11147: Initialize well allocation plot with better data
If plot is empty, initialize well allocation plot with case, first producer and last available time step
Make sure that all flow diagnostics plots are visible at all times.
2024-02-02 10:27:20 +01:00
Magne Sjaastad
06766b3650 Add option to Preferences to flush file loggers when a signal is triggered 2024-02-02 08:30:30 +01:00
Kristian Bendiksen
a8c719b289 #10663 WBS Plot: Import well log from CSV file.
Also compute SH_MK_MIN/EXP/MAX and FG_MK_MIN/EXP results.
2024-01-29 15:05:08 +01:00
Magne Sjaastad
6922ba22b0
Improve reload and replace of cases
* Move code to from features to helper classes
* Ask user if replace case should also happen for the associated grid or summary file
2024-01-25 10:41:57 +01:00
magnesj
f864ab0ba1 Fixes by clang-tidy 2024-01-20 08:39:07 +01:00
Magne Sjaastad
33f18a7c8f Show numbers with space as thousand separator 2024-01-19 11:00:28 +01:00
Magne Sjaastad
df083a870a Add Memory Report dialog
Compute how much memory is used for result/case/total. Show as text in dialog.
2024-01-19 11:00:28 +01:00
Magne Sjaastad
5c096748c8
Optionally log messages to file (#11059)
* Add spdlog as submodule
* Add RiaFileLogger
* Control use of file logger from preferences
2024-01-15 17:51:03 +01:00
Magne Sjaastad
ff6472c6b7
Update to clang-16
Use runner Ubuntu 22.04 for clang-16
Remove unused code detected by clang-16
2024-01-05 15:13:50 +01:00
jonjenssen
daae1e6e05
Improve fault reactivation file names (#11005)
Use model name in exported file name.
Add model name to include file names.
2024-01-05 08:43:40 +01:00
Magne Sjaastad
894bbbe06b Add reservoir case for EM data
- read geometry definition from h5grid files
- import cell results from h5grid files
- create and import case using drag/drop of h5grid file into ResInsight
2023-12-20 19:05:45 +01:00
Magne Sjaastad
81ab903151 #10916 Create derived result used to identify NNC cells 2023-12-07 07:57:40 +01:00
Kristian Bendiksen
08f9e9b5bb Janitor: move historyIdentifier/differenceIdentifier. 2023-12-04 17:26:44 +01:00
Kristian Bendiksen
ca87cee79b Summary Calculation: add import and export to toml 2023-12-04 17:26:44 +01:00
Magne Sjaastad
da20b81c0e Make sure the detection of only cross plot curves works as expected 2023-11-27 13:14:16 +01:00
jonjenssen
2b795bf499
Fault reactivation gridding update (#10855)
Rewrite grid generator - grid based on eclipse model layers in reservoir.
2023-11-20 15:39:17 +01:00
Magne Sjaastad
678a368361
Refactor LayoutOptions to improve readability
* Make it possible to use designated initializer list
- remove default constructor
- move static member to outer scope

* Add helper function to add field on same row
2023-11-10 14:48:56 +01:00
Magne Sjaastad
69f132ffa5 Add import/export grid calculations to Grid Calculator
Refactoring
2023-11-10 10:14:59 +01:00
Magne Sjaastad
5f3e0704f1 Make sure that no curves are created when No Plots is set in Preferences 2023-11-09 16:16:01 +01:00
Kristian Bendiksen
18c29d5fc7 Reveal: fix transmissibility calculation when filter cake is not present.
The "absolute" filter cake adjustment should only be used for cells when
filter cake is present (i.e filtrate thickness is not zero).
2023-11-08 15:52:33 +01:00
Magne Sjaastad
1b2cae64c7 Add FWPR FOPT to cross plot vector list and reorder 2023-10-20 13:56:11 +02:00
Magne Sjaastad
f763f73ba3 Regression Curves: Use a contrast color for the regression curves
Use a list of predefined colors, and select the color with the larges RGB difference to the source curve. This will ensure that we avoid ending up with fully white or fully black curves, unable to see.
2023-10-19 07:50:02 +02:00
jonjenssen
7494302275
Fault Reactivation updates (#10727)
* Generate reservoir element sets
* Add support for materials
* Add local coordinate system support for exported model
2023-10-18 09:10:08 +02:00
Magne Sjaastad
18e9ef0558 Make sure seismic file reader is created in RiaApplication::loadProject() 2023-10-17 07:26:52 +02:00
Magne Sjaastad
55cafc64c3 Always enable undo/redo framework to improve performance
It is possible to toggle undo/redo in Preferences. Use this setting to control display of undo/redo items in GUI (undo/redo buttons, undo stack, ..)

The use of undo/redo framework will speed up several multi-object operations significantly.
2023-10-13 08:08:35 +02:00
Magne Sjaastad
51fe80b897 Create cross plot menu from list of addresses in preferences 2023-10-09 13:28:36 +02:00
Magne Sjaastad
6e41ef8af9 Use vector instead of set to make to avoid sorting of quantities
The plot title for cross plots should use insertion order to make sure the title is displayed correctly
2023-10-09 13:28:36 +02:00
Magne Sjaastad
445672cbb2 Remove use of obsolete cross plot code
Remove obsolete summary cross plot classes and features
2023-10-05 07:47:47 +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
Kristian Bendiksen
8df4dd42eb Refactor: rename RimWellLogFile to RimWellLogLasFile 2023-10-02 16:04:53 +02:00
Kristian Bendiksen
d177491843 #10648 Refactor summary reader: return std::vector<double> instead of taking ptr. 2023-10-02 09:16:52 +02:00