Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastadandmagnesj d2f435c00a Improved simulation well visualization
* Move members to private in RigWellResultPoint
* Create simulation well path geometry using well topology
* Add separate MSW well pipe centerline computations
* Review comments

---------

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2023-02-28 16:06:37 +01:00
Magne Sjaastad ee0a969d07 Add missing include 2023-02-27 13:36:41 +01: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 SjaastadandKristian Bendiksen 8768e186d8 #9671 summary calculations for summary items
* Summary Calculation: use shorter name in title
* Sort summary addresses to group calculated results last.
* Summary Calculation: add option to distribute calculation to other items.
* Add support for summary calculation for RimGridSummaryCase.
* Use short name for calculations in plot titles.
* Update ensembles in Data Sources when calculation is added.
* Summary Calculation: allow drag-and-drop of ensembles
* Summary Plot: fix axis range aggregation for calculated ensemble addresses.

---------

Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2023-02-26 08:08:06 +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 345095185e #9859 PLT plot: Fix missing LAS data for regression test 2023-02-17 12:52:06 +01:00
Magne Sjaastad 320ece44dd Janitor: Skip undo/redo if field is marked as non-writable 2023-02-17 12:52:06 +01:00
Magne Sjaastad ac9b9b2699 Fix regression test issues
* Fix eternal loop causing the application to hang
* Revert changes related to file well path introduced in 70bb22
* Use some iterations to find representative cells for computation of cell sizes
2023-02-16 20:05:12 +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 20439e1da9 Export Completion: Fix missing segments and connections for LGR grids
* Compute characteristic cell size based on active cells
* Compute cell face normal based on a suitable active cells
Using all cells as basis for face normal is fragile. Some models have highly distorted/twisted cells, but all active cells should be geometrically more stable.
2023-02-15 15:25:38 +01:00
Magne Sjaastad a7acbe2c86 Make sure a plot always is created when "Add Summary Plot" is triggered 2023-02-15 15:06:11 +01:00
Magne Sjaastad 1922a02fc3 #9139 Avoid crash for dual porosity case with NNC
libecl supports only import of NNC data for matrix. Disable asserts to avoid crash in file reader. No NNC fracture data is imported.
2023-02-15 13:55:50 +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 af7fe8f00e #9844 Summary Restart: Add more guarding on empty strings
When trying to import a restart case, parsing of the restart path causes crash in some cases. Add more checking on NULL.
2023-02-14 19:11:14 +01:00
Magne Sjaastad 613f4642eb Fix broken build 2023-02-13 15:41:56 +01:00
Magne Sjaastad d91e8ccb56 Avoid throwing exception when opening a file for export 2023-02-13 15:03:42 +01:00
Magne Sjaastad 6ad42817c6 Always use export folder if defined
Rename to m_customFileNameIncludingPath, and split into folder and file name for export object
2023-02-13 15:03:42 +01:00
Magne Sjaastad 947185bdcc Visual Studio: Enable support for Static Code Analysis 2023-02-13 14:44:01 +01:00
Magne Sjaastad de118ddae2 #9833: Add extra check based on value/cells count
Some models do not have the dual porosity flag set correctly. Add additional check to set the dual porosity flag if the number of active cells is the double of main grid cell count.
2023-02-13 14:09:35 +01:00
Magne Sjaastad b3a56a9353 Add support for radial grids
* Update radial grid operations in submodule
* Optionally display cell center and cell corners when clicking on cell
* Add support for import of radial grids
* Modify node coordinates to match host cell
2023-02-10 12:39:13 +01:00
Magne Sjaastad 9ae00177bf Well measurement improvements
* Update 3D view and plot when measurement data is added
* #8625 Make visibility of measurement follow well path visibility
2023-02-07 17:44:47 +01:00
Magne Sjaastad 8028444018 GitHub Actions: Add apt mirror to make package download more robust
- Download of Ubuntu packages from Azure is unstable. Add mirror sites to improve reliability.
- Improve use of clang-format and include source code changes
2023-02-07 07:22:57 +01:00
Magne Sjaastad 60abadb86e GHA: Add retry for apt commands 2023-02-06 16:42:03 +01:00
Magne Sjaastad eb8c0c1de7 Add missing include and update example 2023-02-05 10:24:44 +01:00
Magne Sjaastad 349c88bfeb Use ads forward declares in RiuMainWindowBase 2023-02-02 15:20:34 +01:00
Magne Sjaastad cc21e2f3b4 #9147 Fix wrong curve name for summary group curves 2023-02-02 13:42:44 +01:00
Magne Sjaastad ec611a9a3a #9780: Compare axis unit text case insensitive 2023-02-02 07:25:43 +01:00
Magne Sjaastad b9f6662126 #9771: Guard nullpointer access 2023-02-01 13:44:06 +01:00
Magne Sjaastad 82b538719e Remove unused variable 2023-01-30 16:33:12 +01:00
Magne Sjaastad f919ba6749 Use <=> operator for RifEclipseSummaryAddress
* Use spaceship operator for RifEclipseSummaryAddress
* Set gcc-10 as compiler for Ubuntu 20.04
* Reorder declaration of members to get wanted sorting
2023-01-30 14:53:07 +01:00
Magne Sjaastad 234719aea3 Improve RftPlt data source objects (#9769)
Move AppEnum init to RifDataSourceForRftPlt
Simplify constructors for RifDataSourceForRftPlt
Rename enum names in RifDataSourceForRftPlt::SourceType
Add missing pressureDepthData in RimDataSourceForRftPlt
2023-01-30 11:12:26 +01:00
Magne Sjaastad 863925f980 Avoid debug info flag /Z7 flag for release build 2023-01-28 09:42:44 +01:00
Magne Sjaastad 073343ce9b CMake: Improve setting of debug info flags for buildcache 2023-01-27 18:31:35 +01:00
Magne Sjaastad 62ce2b18e0 RFT improvements
* Avoid accessing nullptr
* remove unused function
* Allow RFT data from single summary case to be used in RFT plots
* #9736 Support horizontal plotting of LAS curves
2023-01-27 10:29:11 +01:00
Magne Sjaastad 26e7d5aad0 Cancel running process if new commit is pushed 2023-01-26 12:01:29 +01:00
Magne Sjaastad 0cdaf5b62e Regression Test: If only one frame is present, skip adding postfix 2023-01-25 15:31:45 +01:00
Magne Sjaastad 77bca7affa Make sure qoffscreen.dll is included in distribution
Headless plot export requires qoffscreen.dll, make sure this file is included in installer.
2023-01-25 06:39:03 +01:00
Magne Sjaastad a770f89082 #9722 Grid Group Statistics: Guard accessing empty data structures 2023-01-24 15:02:23 +01:00
Magne Sjaastad 583c248cf9 Janitor issues
* Use horizontalAdvance
* Remove unused code
* Hide some warnings from Qt code
* Remove message for _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
* Use CMP0077 NEW
* Move roff libraries to folder Thirdparty
* avoid operator()==
* Remove cmake_minimum_required and set version to 3.15
2023-01-24 12:29:27 +01:00
Magne Sjaastad c8dbf3d125 Trim spaces and avoid spaces in generated address text
* Trim spaces and avoid spaces in generated address text
* Fix unit test
2023-01-24 11:26:34 +01:00
Magne Sjaastad f48eca9ef5 Update linked views when animation slider is moved 2023-01-23 15:06:33 +01:00
Magne Sjaastad ab165b0d72 Fix issues related to well bore stability plots
* Check if data is present
* Move plot update to geomech case
* Return empty vector if no data is present
2023-01-23 12:38:55 +01:00
Magne Sjaastad abc9e82ff5 System: Enable and use c++20
Enable c++20 in top level cmake. Keep c++17 for GrpcInterface, as the protoc tool does not work with c++20.
Several code adjustments to fix compiler issues.
2023-01-19 08:33:02 +01:00
Magne Sjaastad 128df2ada4 Fix invalid dates for data imported from ESMRY
Compute time_t based on the "TIME" values in summary file
2023-01-17 21:57:16 +01:00
Magne Sjaastad 424ecaa560 Maintenance: Issue submodule update once
Avoid calling submodule update on specific subfolders. 
Fixes by cmake-format
2023-01-17 09:39:10 +01:00
Magne Sjaastad eaf3b970ad add apt-get update
Make sure to call apt-get update before apt-get install
2023-01-13 15:08:30 +01:00
Magne Sjaastad 3354630726 Add optional support for ccache for MSVC (#9667) 2023-01-13 07:57:13 +01:00
Magne Sjaastad 39dc1c45ca Update version to 2023.01.1-dev.01 2023-01-12 09:29:24 +01:00
Magne Sjaastad a2e73d7cee Move prepareForDelete() to Rim3dView 2023-01-11 12:30:06 +01:00
Magne Sjaastad b108cdb72d Fix crash seen when deleting a 3D view part of a linked view collection 2023-01-11 08:39:51 +01:00
Magne Sjaastad 5a56a285a0 Add field and keywords 2023-01-11 08:39:51 +01:00
Magne Sjaastad 8d82558904 Set version to 2023.1.0 2023-01-10 11:53:12 +01:00
Magne Sjaastad 8e161a5c89 Stabilization fixes related to regression testing
* Added fmtlib to LicenseInformation.txt
* Add license info for roffcpp
* Regression Tests: Guard use of invalid bounding box
* Regression Test: Check if file is present before opening
2023-01-10 11:45:37 +01:00
Magne Sjaastad 0740bccd75 Improve warning text 2023-01-10 07:32:08 +01:00
Magne Sjaastad a4123609d9 Bump version to RC_03 2023-01-09 15:48:36 +01:00
Magne Sjaastad 5de5926950 #9622: Find a fairly regular cell and compute face normal direction
In some models, the grid cells can be very twisted, distorted, or zero(low) volume. Improve the logic to find a reasonably regular cell and use this cell to compute the direction of the face normals in this cell.
2023-01-09 15:47:08 +01:00
Magne Sjaastad 62a13d3847 #9622: Exclude cells with very small volumes 2023-01-09 15:47:08 +01:00
Magne Sjaastad f46516ac85 #9630 Fix import of well data from SSIHUB 2023-01-06 14:56:41 +01:00
Magne Sjaastad fe181ed60e Guard use of pointers 2023-01-06 13:30:56 +01:00
Magne Sjaastad eeeb3c40c6 if createEnhancedSummaryDataFiles() is true, always create and use ESRMY
If h5 file is present if folder, the h5 file is used before the ESMRY is recreated
2023-01-05 15:59:10 +01:00
Magne Sjaastad 752363a4b8 #9624 Add alphabetical and by value sorting 2023-01-05 12:14:49 +01:00
Magne Sjaastad 28b3f16db1 #9614 Check last write time for ESMRY files and SMSPEC files 2023-01-05 09:29:19 +01:00
Magne Sjaastad 4c0e7b2979 #9611 Support up to three header lines for CSV import 2023-01-04 08:51:26 +01:00
Magne Sjaastad 09e05e9996 Fix summary issues
* Add missing time conversion for month
* #9606: FIx wrong usage of function when accessing data from summary file
The result values are aggregated into the destination vector in RimSummaryCaseCollection::computeMinMax(), so make sure the vector is recreated per case.
* #9602 : Make sure the plot is updated correctly for "Time since simulation start"
* Move roundToNumSignificantDigits() to RiaNumericalTools
* Make sure the time axis is consistent when individual time range differs
2023-01-02 10:22:44 +01:00
Magne Sjaastad 984557a46a RegressionTest: Match on full name 2022-12-29 08:45:56 +01:00
Magne Sjaastad 4b70572a04 Fix some type conversion issues 2022-12-22 19:24:14 +01:00
Magne Sjaastad 9db4d03a5f RegressionTests: Fix performance issues related to DockManager::restoreState
* Performance: Disable DockManager::restoreState when running regression tests
* Set parent to Qt widgets to avoid memory leak
* Change singleton pattern to avoid memory leak
2022-12-22 15:35:45 +01:00
Magne Sjaastad 5d072663f1 Set version to 2023.01.0-RC_01 and disable debug output of AABB tree 2022-12-22 09:49:34 +01:00
Magne Sjaastad c1aceb7134 Avoid random assignment of sub/lateral index to make regression test stable 2022-12-21 15:30:08 +01:00
Magne Sjaastad f27f47fad5 Ensemble: Disable auto name for old projects
Set auto name to false to be able to use the stored name in project files.
2022-12-21 13:59:20 +01:00
Magne Sjaastad f731153c22 Revert OpenMP for detection of faults
The use of OpenMP is not stable, and produce wrong geometry in some cases.
2022-12-21 11:12:56 +01:00
Magne Sjaastad e815a02758 Minor GUI adjustments
* Select view when MDI window is activated

* Update linked views when property filter is linked

* Do not ask for restore of cell filters if none are present

* Update tree view when linking of property filters is disabled

* Add check box for multiple results in Result Info box
2022-12-21 10:50:26 +01:00
Magne Sjaastad de29b3b0ed OpenMP: Use default AABB tree construction for one cell per BB
Do not use buildCellSearchTreeOptimized() when when cellCountPerBB is 1, as the performance in this case is best using buildCellSearchTree()
2022-12-20 13:39:29 +01:00
Magne Sjaastad 38bfa9ef1f #9588 Accumulate N cells for AABB tree 2022-12-19 15:24:53 +01:00
Magne Sjaastad a423ecf95f Several OpenMP improvements
Several optimizations based on profiling of 20M grid model. These fixes will improve the largest performance issues, but there are still more operations that can be refactored.

* OpenMP: Use in fault geometry generator
* OpenMP: Use when computing statistics for result values
* OpenMP: Use multithreading on fault detection
* Add RiaOpenMPTools
* VizFwk: Use openMP for texture generation
2022-12-19 13:49:03 +01:00
Magne Sjaastad befab37588 Add debug output of AABB tree 2022-12-16 15:36:48 +01:00
Magne Sjaastad 529c9af9a4 Guard recursive updates if NNC data import is disabled
Import of NNC data can be turned off in Preferences. If this is off, loading of projects using NNC data can enter a recursive update loop.
2022-12-16 15:29:50 +01:00
Magne Sjaastad 4e51516a96 Import of grid models: Support mix of lower and upper case letters in file name
* #9529 libecl: Allow mix of upper and lower case in file names
2022-12-16 07:00:45 +01:00
Magne Sjaastad 16239cd80c #9522 Contour Map: Ensure correct update of grid calculator maps 2022-12-16 06:57:31 +01:00
Magne Sjaastad 500b4d2922 #9549 RFT plotting: Improve visibility for topology curves
- set row span to 2
- adjust default min/max for zoom
- make symbols a bit smaller
2022-12-16 06:57:31 +01:00
Magne Sjaastad 296718fd29 Fix location of ICV for MSW wells
* Show warning if no wells are visible
* #9461 MSW: Start export of a lateral at the tie in location on parent well
Previous implementation used the full well path for the lateral, including the part of the parent well up to sea level.
2022-12-14 08:59:24 +01:00
Magne Sjaastad e4c0b45b15 Improve the help for a calculation
Add help text and plus AND example


Improve help pages for calculator
2022-12-14 08:57:08 +01:00
Magne Sjaastad bfae28b4b4 Avoid crash when exit from python is called when UI is running 2022-12-14 08:57:08 +01:00
Magne Sjaastad 595806079a Fix typo 2022-12-11 10:15:26 +01:00
Magne Sjaastad cfa9d07d8e #9563 Reorganize how and when objects are deleted when shutting down GRPC 2022-12-11 10:15:26 +01:00
Magne Sjaastad 7cb6c587c1 Adjustments to UI
* #9551: Guard nullpointer if no RFT data is present
* Hide RFT in tree view if no RFT file is found
* Avoid display of 3d main window when importing a summary case
* Use specific grid import feature instead of general file import feature
2022-12-09 08:47:40 +01:00
Magne Sjaastad 5ec32f8613 Update text for curve names and plot titles when source data changes
* Update titles after dropping vectors into plot
* Do not replace _Name variables
* Make sure signals are wired when opening a project file
* Add auto name field and set default on
* Remove includes from header files
2022-12-09 08:46:36 +01:00
Magne Sjaastad 3d594257dd Add name variable for path in project file
Add support for user defined variables in the path section of the project file
2022-12-08 07:08:22 +01:00
Magne Sjaastad 1eb44e519e RFT plot: Fix stepping on well
* Rft: Store segment and connection count per well
* Update the segment branch index combo box when well changes
* Bump version number
2022-12-05 18:36:21 +01:00
Magne Sjaastad d3a5355141 #9534 Make sure indexIJK values are computed only once (#9537) 2022-12-02 14:36:32 +01:00
Magne Sjaastad e8f5806e55 Guard use of nullpointer 2022-12-02 07:51:43 +01:00
Magne Sjaastad 2ee228c120 Add more error checking when opening RFT files 2022-12-02 07:51:43 +01:00
Magne Sjaastad 14db528c98 Append property filter to field instead of returned array 2022-11-29 13:46:29 +01:00
Magne Sjaastad 9995af07a1 Support copy of property filters to linked views
* Copy and overwrite property filters when linked
When linking property filters between different cases, the property filter settings are copied and the property filter is evaluated per case. The previous implementation worked only for a single case.

* Move field to private
2022-11-28 14:34:26 +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 2ba3191539 Fix typo 2022-11-28 11:25:44 +01:00
Magne Sjaastad dfa1bc2cd0 Some fixes for new gcc/clang
Minor fixes for newer gcc/clang. These issues were seen when using ubuntu-latest (Ubuntu 22.04) on Github Actions.
2022-11-25 08:59:10 +01:00
Magne Sjaastad 51443d7aa3 #9383 Not able to press resample checkbox
For some unknown reason, the checkbox in a group was not responding to mouse click. Keyboard interaction was possible. Remove the group and reorganize the UI.
2022-11-25 07:40:27 +01:00
Magne Sjaastad 6c7e1423a2 #9489 Make sure well measurements is visible in geo mech view 2022-11-25 07:40:27 +01:00
Magne Sjaastad 82968ca1a9 Support linking of 2D intersection views
* Major refactor from RimGridView to Rim3dView
* Move view linker/controller functions to Rim3dView
* Add bitmask to define the content of a 3D view
* Link views based on matching content
* Enable bit mask operators at global scope
* Make it possible to use 2d intersection views as comparison views
* Fix crash when a view used as comparison view is deleted
* Move unlinking to Rim3dView

* Add options to snapshot only 3D views/plots as part of regression testing
* WBS plot: Improve default name, hide axis for some tracks
2022-11-24 10:46:54 +01:00