Commit Graph

211 Commits

Author SHA1 Message Date
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