Commit Graph

285 Commits

Author SHA1 Message Date
Magne Sjaastad
5ee764af48
Refactor result definition 2023-05-11 08:37:58 +02:00
Magne Sjaastad
f70d2c4949
Add result type and create and use custom legend if possible
* Update submodule
* Use postfix functions and add custom color legend

* Add type to RigEclipseResultAddress
Read types from ROFF and create default legend based on type or custom created legend.

* Use caseId to connect legend configuration to result in a case
2023-05-09 11:41:56 +02:00
jonjenssen
f4cf143401
Import SEG-Y files by converting to VDS (#10175)
* Add seg-y import GUI
2023-04-27 01:32:59 +02:00
jonjenssen
d8def3d986
OpenVDS should always be used (#10166)
* OpenVDS should always be used, remove optional defines
2023-04-24 18:23:31 +02:00
Kristian Bendiksen
350db4d6a9 #10130 Reveal summary import: convert to Eclipse units. 2023-04-24 13:02:57 +02:00
Magne Sjaastad
10adcbc082 Disable warnings on MSVC when including HDF5 2023-04-24 12:40:25 +02:00
magnesj
88ef79c1a1 Fixes by clang-tidy 2023-04-23 08:10:28 +02:00
jonjenssen
0e7cf49b17
OpenVDS seismic access (#10145)
Add OpenVDS support for reading seismic data from VDS files
2023-04-21 16:38:04 +02:00
Jørgen Herje
0d8aee8995
GRDECL: Import multiple grid files from dialog (#10142)
Add import of N .GRDECL grid files - as done for roff-files
2023-04-21 10:34:29 +02:00
Kristian Bendiksen
ff209ad7c2
Refactor ensemble import dialog
* #9773 Refactor ensemble import dialog.
* #9773 Add support for ensemble import of StimPlan/Reveal summary data.
* #9773 Add method for finding min and max time steps.
* #9773 Add option for resampling to hour intervals.
* #9773 Add option for resampling to minute intervals.
* #9773 Ensemble statistics: determine sub-sampling period dynamically.
* Use RiaWeightedMeanCalculator for curve resampling.
* Add HOUR and MINUTE to date time app enum.
* #9773 Generate better ensembles for StimPlan summaries.
* #9773 Fix parameters.txt lookup for StimPlan summaries
* Refactor: Improve interface of RicImportSummaryCasesFreature::createSummaryCasesFromFiles

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-04-20 10:16:43 +02:00
Jørgen Herje
67264da0a8
Roff: support import of N grid files and 1 grid file with N property files
* Add utility to check is roff file contains grid data

* Import of multiple grid files or 1 grid file with N property files

* Fix build errors for using RifRoffFileTools from Commands
- Move template implementation to cpp-file
- Add roffcpp to link libraries in CMake for Commands

* Improve/fix import of single grid file with N property files

* Fix missing add of roff case Id
2023-04-19 15:52:57 +02:00
Magne Sjaastad
b7f8d0e0f1
Increase warning level
* Set warning level to /W3 for MSVC to catch more warnings
* remove several excluded checks for clang
* removed several unused variables
* Hide warnings qwt
* add missing parentheses in logical expressions
* Remove double check on same logical expression
2023-04-17 15:57:39 +02:00
Jørgen Herje
c7b915c141
Replace RifRoffReader code to utilize roffcpp::reader (#10098)
- Replace current content if RifRoffReader to utilize roffcpp
- Remove unit tests not applicable for function (some previous tests now belongs to roffcpp)
2023-04-17 09:45:14 +02:00
Magne Sjaastad
6f6dc80bc6
Added more clang-tidy checks
Improved GitHub Action to run clang-format as part of clang-tidy

* Simplify clang-tidy workflow
* Added modernize-use-using, modernize-redundant-void-arg, readability-static-accessed-through-instance
* Add nolint for libecl typedefs
2023-04-14 14:07:45 +02:00
Jørgen Herje
457dc9080f
Refactor classes in RigWellResultPoint.h
* Move RigWellResultFrame implementation into separate file
Update/correct includes accordingly

* First step of moving attributes from public to private
- Move public members to private and create interface
- Single public member remains due to strong dependency on usage of reference and reference to its object public members

* Second step of moving attributes from public to privatee
- Remove usage of reference directly to attributes. Interface with copy and set.
- Moving attributes in RigWellResultFrame and RigWellResultBranch

* Move class RigWellResultBranch into separate file
2023-04-14 11:00:45 +02:00
Magne Sjaastad
952e766c2f
Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +02:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010)
Add basic seismic section support to eclipse and geomech views.
2023-03-24 15:36:10 +01:00
Kristian Bendiksen
b541acdcb1 #9773 Import data from Reveal and StimPlan as summary case. 2023-03-20 08:58:42 +01:00
Kristian Bendiksen
245d483036
Summary observed data
* #9966 Summary calculations: add support for imported vectors.
* #9966 Summary Calculation: add support for imported and observed data.
* Summary Address: avoid extra level in tree for imported data.
* #9966 Update observed data when calculation is updated.
2023-03-15 13:39:57 +01:00
Magne Sjaastad
40c329f3ac Fix selection of multiple pressure/depth sources in plot
Use spaceship operator to fix issue for multiple pressure/depth curves

It was not possible to show two pressure/drop curves at the same time. This was caused by inconsistent implementation of operator< and operator==. Implement operator <=> to simplify the code.
2023-03-13 16:09:01 +01:00
Magne Sjaastad
07a4c13dd4 #9913 Fix import of RFT pressure/depth 2023-03-10 13:20:08 +01:00
Magne Sjaastad
527743a845
Adjustments for release
* Make sure text for multiple wells in same grid cell is displayed correctly
* Improve selection of result in Advanced Snapshot Export
* Restore the main window that was on top when project was saved
* Trim string to make sure '/' is exported with no space in front
* #9872 RFT-plot: Make colors stable for curves in RFT plots
* Set version to RC_02
2023-03-09 08:54:28 +01:00
Kristian Bendiksen
8a2d9ec83e #9887 Roff: fix freeze due combining omp and progress info. 2023-03-02 07:29:48 +01:00
Magne Sjaastad
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
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 Sjaastad
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
Kristian Bendiksen
69a668df50 Simplify RifSummaryReaderInterface timeSteps. 2023-02-24 10:03:16 +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
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
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
613f4642eb Fix broken build 2023-02-13 15:41:56 +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
Jon Jenssen
657cb4e82d Remove progress things that causes hang in data loading when omp is used. No need for progress feedback in here anyways. 2023-02-07 17:45:44 +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
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
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
Kristian Bendiksen
1eac9f8a1f #9620 Pressure/depth data: add user interface. 2023-01-19 09:00:05 +01:00
Kristian Bendiksen
10187a934c #9620 Add reader for pressure depth text file. 2023-01-19 09:00:05 +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
Kristian Bendiksen
bfbe557c2d Roff: log less to message window. 2023-01-11 11:26:17 +01:00
Kristian Bendiksen
903dd34929 Roff: replace -999 values for inactive cells. 2023-01-11 11:26:17 +01:00
Kristian Bendiksen
1d4140e854 #9601 Roff: templatize method for converting to reservoir index order. 2023-01-11 10:10:51 +01:00
Kristian Bendiksen
7a79930ea6 Roff: add roff namespace. 2023-01-11 07:22:18 +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
Kristian Bendiksen
7d3fbf1234 #9616 Roff: fix incorrect cell mapping leading to incorrect faults. 2023-01-09 15:38:48 +01:00
Magne Sjaastad
f46516ac85
#9630 Fix import of well data from SSIHUB 2023-01-06 14:56:41 +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
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
4b70572a04 Fix some type conversion issues 2022-12-22 19:24:14 +01:00
Kristian Bendiksen
142d8f0cc6 Janitor: Fix spelling of "synchronize". 2022-12-22 19:24:14 +01:00
Kristian Bendiksen
fc4294a6ad Roff: allow roff files in input property import 2022-12-22 19:24:14 +01:00
Kristian Bendiksen
264ad01e9e Roff: improve property handling: handle more data types and map ACTNUM. 2022-12-22 19:24:14 +01:00
Kristian Bendiksen
ca5064e7da Roff: import properties from Roff grid files. 2022-12-22 19:24:14 +01:00
Kristian Bendiksen
492f2dc4f6 Roff: fix incorrect k direction for active data. 2022-12-22 19:24:14 +01:00
Kristian Bendiksen
8b51160ac4
Roff support with submodule
* Roff: Add initial roff support (with roffcpp as submodule).
* Roff: Create viewer when importing roff files.
* Roff: add timing for roff import.
* Roff: precompute active cell indexes.
* Roff: parallelize using OpenMP.
* Roff: Handle exceptions when importing.
* Roff: improvements from review.
* Invert ordering

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-12-19 15:28:26 +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
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
2ee228c120 Add more error checking when opening RFT files 2022-12-02 07:51:43 +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
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
Kristian Bendiksen
99e9944e6e
#9493 grid calculator on active cells only
* Janitor: Improve getter for RigActiveCellInfo::gridActiveCellCounts.
* #9493 Grid Calculator: calculate on only active cells.
* #9493 Grid Calculator: filter with active cells.
* Fix calculation for input grid cases
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-11-24 10:44:03 +01:00
Magne Sjaastad
a74b168e03
Improve property linking
* Allow linking of property filters across cases with same IJK size
* Recalculate when grid is replaced
Find dependencies between calculations and order them accordingly
2022-11-22 10:22:17 +01:00
Jon Jenssen
10d5246644 Remove obsolete fault reactivation assessment feature 2022-11-18 16:13:26 +01:00
Magne Sjaastad
e7c864c6d8
Improve grid cell calculator
* Use full name for grid case view
* FIx signed / unsigned issue
* Support drag/drop of file names into Main Window
* Add function to check if two grid cases are of equal size
* Result Info: Show cell result text for all linked views
* Improve how to specify cells to be included in calculation

- move view filter to calculation
- improve how to assign values to non-visible cells
- avoid computation between grids of different size

Closes #9482
2022-11-17 15:51:01 +01:00
Magne Sjaastad
46b364d0b0
RFT file improvements
* Guard null pointer access
* Delay open of RFT files until data is requested
When opening ensemble summary cases, the opening of RFT files can take some time. Avoid this by delaying the file open operation.

* Fix infinite update loop for RFT plots
* Avoid moving the tracker line when clicking in the plot
2022-11-11 10:07:27 +01:00
Magne Sjaastad
4fea00afbf Fix some signed/unsigned compare issues 2022-11-10 08:37:20 +01:00
Magne Sjaastad
f77b3673b0
Well path import improvements
* #9432 Clean file cache when all wells are deleted
* Key Events: Avoid eating Delete key events 
Do not use a key short cut on menu actions that are always enabled. Will eat events from other actions.

* #9433 Well Path Import: Keep prefix when trying to match existing well path
2022-11-04 10:11:08 +01:00
Magne Sjaastad
0d3347d4d7
RFT plot improvements
* Make curve selection optional to avoid flickering in depth plots
* Replace undefined with zero for some curves
* Add spacing factor for min and max depth
2022-10-28 15:37:45 +02:00
Magne Sjaastad
4c3e1c3fe8 RFT Curves: Add more segment curves
- add CONGRAT
- add pressure track
- add CONFAC
- fix some plot layout issues
- Fix bug for first segment MD location
- Add default scale factor 1e-3 for gas curves
- Avoid inf values in some curves, seen in PRESSURE and CONFAC
- Use assignment in statements instead of std::get
2022-10-27 12:43:46 +02:00
Kristian Bendiksen
806c9af82b
9172 Remove dependency on QtScript
* #9172 Update json encoding/decoding to avoid QtScript
* Janitor: remove unused debug code
* Janitor: minor cleanup
* Remove dependencies to Qt Script

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-10-18 10:07:16 +02:00
Magne Sjaastad
760bfaeec2 #9369 Curve Probing: Show data from other curves in tooltip text
Optionally show data from other curves in tooltip text when hoovering over a curve point
2022-10-18 07:22:56 +02:00
Magne Sjaastad
7c2941aedd #9366 RFT: Show all results with supported item count 2022-10-18 07:22:56 +02:00
Magne Sjaastad
1d23e8f5c9
Show packer in RFT topology track
* Show packers in topology track
* Support optional display of property axis values
* Add legend item clickable option to RimPlotWindow
2022-10-13 13:03:55 +02:00
Magne Sjaastad
6d5e303361
Add topology curves and show in additional track
* Add topology curves and default plot
* Improve visual appearance
* Update sub module opm-common
* Add support for INCLUDE keyword to allow parsing of include files recursively
* Search for *.DATA with fallback to *.SCH to automatically import WESEGLINK data
* Find annulus branch based on MD diff on segment start
* Stop growing device branch if segment starts at a lower MD than previous
2022-10-07 12:37:23 +02:00
Magne Sjaastad
89d7dd4561 Show branch ID range in addition to branch index 2022-10-06 10:32:44 +02:00
Kristian Bendiksen
3dad3c65cb Thermal Fracture: Improve handling of result names and units. 2022-10-03 08:33:55 +02:00
Kristian Bendiksen
8193f24a55 Thermal Fracture: guard for nullptrs for surface export. 2022-10-03 08:33:55 +02:00
Kristian Bendiksen
a84801715d Thermal Fracture: detect when conductivity is already in correct unit. 2022-10-03 08:33:55 +02:00
Kristian Bendiksen
d0b961871a Thermal Fracture: convert conductivity from darcy to milliDarcy. 2022-10-03 08:33:55 +02:00
Kristian Bendiksen
619807b81f Thermal Fracture: add python script for exporting template as surface. 2022-10-03 08:33:55 +02:00
Kristian Bendiksen
2fea355cd2 Thermal Fracture: Fix off-by-one in properties parsing.
Would leave out the last element from the file (i.e LeakoffPressureDrop).
2022-10-03 08:33:55 +02:00
Jon Jenssen
1cc40eee38 Fix broken observed csv data import 2022-08-24 13:34:23 +02:00
Magne Sjaastad
b6973a3644 RFT: Add connection data as segment results 2022-08-22 04:51:46 -07:00
Magne Sjaastad
d994a38959 Show log message when data from WSEGLINK is imported 2022-08-22 04:51:46 -07:00
Magne Sjaastad
1f2e9babe6
RFT: Support device and annulus branches (#9168)
* Add unit test used to read data from WSEGLINK
* Add segment branch type
* Add detection of device branches
* Add data source stepping on branch type
* parse wseglink data
* add RFT case as child of RimFileSummaryCase
2022-08-16 12:40:25 +02:00
Kristian Bendiksen
a87e05035d #9102 Thermal Fracture: handle field units. 2022-08-05 13:45:31 +02:00
Kristian Bendiksen
8f1f20ac7e janitor: Improve variable name. 2022-08-03 14:04:31 +02:00
Kristian Bendiksen
40cc3f9dc6 #9101 Thermal Fracture Import: detect and refuse inconsistent units.
All values in the file should be in either field or metric units, and mixing is
not allowed.
2022-08-03 14:04:31 +02:00
Kristian Bendiksen
65600f58b3 Thermal Fracture Import: handle csv with space between name and unit 2022-08-01 13:56:38 +02:00
Magne Sjaastad
7a0bfd4917 Use updated version of opm-common as submodule
* Adjustments to build system for opm-common
* Add opm-common as submodule
* Disable use of unity build for opm-common
2022-07-07 22:17:33 +02:00
Kristian Bendiksen
44c469c12c #9099 Thermal Fracture Import: include perimter nodes. 2022-07-06 18:18:11 +02:00
Kristian Bendiksen
4b8a02cf46 Thermal Fracture: improve import and display of timestamps 2022-07-06 18:18:11 +02:00
Kristian Bendiksen
972013c631 #9039: Thermal Fractures: add file reader 2022-07-06 18:18:11 +02:00
Magne Sjaastad
b706192ea3
Performance updates (#9082)
* Avoid creation of curve legend widgets during construction of a multi plot
* Make sure default z-value is correct to avoid expensive Qwt updates
* Avoid duplicate plot updates
* Do not create internal Qwt legend by default
* RFT import: Avoid expensive method throwing exception if no data is found
2022-06-24 16:16:46 +02:00
Magne Sjaastad
d854a3d3e7
Merge pull request #9063 from OPM/more-rft-fixes-01
More RFT fixes
2022-06-17 17:24:58 +02:00
Magne Sjaastad
62cf62b9a2
Improve UI for RFT segment curves (#9061)
* Make sure all curve values are set correctly for plot orientation
* Make sure depth zoom is propagated to the Qwt plot
* Expand min/max value range to allow more space around curves
* Use int values to represent RFT segment branch number
2022-06-16 13:55:42 +02:00