Commit Graph

1467 Commits

Author SHA1 Message Date
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
jonjenssen
527be5f644 Add scaling factor 50 2023-02-06 16:50:37 +01:00
Jørgen Herje
7a2aebe8b9
Fix active cell not resetting when clicking on cells (#9804)
- Refactor PlotShapeItems highlighting in QwtPlotWdiget - s.t. highlighting is not dependent on plotDefinition RimPlot object and its isCurveHighlightSupported flag.
- Remove plot definition assert and utilize guards to allow nullptr/undefined plotDefinition
2023-02-06 14:33:09 +01:00
Jørgen Herje
b1e94adffd Change to point to point for Accumulated Flow Volume Percentage 2023-02-06 14:00:05 +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
jonjenssen
33e908dd94
Avoid progress window staying behind on Linux when loading summary data (#9774)
Adjust progress info usage in summary file loading
2023-02-01 08:46:22 +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
jonjenssen
132fd41bf4 Show element ID, not element Index in mohrs plot legend 2023-01-27 18:00:20 +01:00
jonjenssen
919d867930 Remove FAULTMOB result fra ST 2023-01-27 16:48:05 +01:00
Bård Skaflestad
6eebd01bd4 Look Up Time Step Object Exactly Once
Using .contains() followed by .at() with the same argument will
perform the same map lookup twice.
2023-01-27 11:52:06 +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
Jørgen Herje
e3a347ccaa Invert default isCurveHighlightSupported flag for RimPlot
- Make default flag = false, thus highlighting must be activated
- To prevent unwanted logic for new RimPlot objects
- Activate highlighting for RimSummaryPlot, RimVfpPlot and RimCorrelationMatrixPlot
2023-01-27 07:14:40 +01:00
Jørgen Herje
3c296202c2 Fix bug in QwtPlotWidget highlight reset
QwtPlotShapeItem objects were not reset
2023-01-27 07:14:04 +01:00
Jon Jenssen
c916459a55 Fix broken test 2023-01-26 14:18:03 +01:00
Jørgen Herje
8aff5b4694
Well Allocation over time adjustements (#9738)
- Add font size settings
- Move legend to right side of plot
- Set default selected time steps to time step count = 10
- When excluding time steps, duplicates rates from next valid time step onto excluded time steps
- Allow time step selection "Show all time steps" or "Time step count" for subset of time steps
- Allow excluding on the active set, i.e. all or subset, of time steps
2023-01-26 10:56:42 +01:00
Jon Jenssen
1f901a5ea5 Fix missing Pazi/Pinc 2023-01-25 18:20:26 +01:00
Jon Jenssen
42a9fef2d3 Fix geomech reload issues 2023-01-25 16:12:10 +01:00
Magne Sjaastad
0cdaf5b62e Regression Test: If only one frame is present, skip adding postfix 2023-01-25 15:31:45 +01:00
jonjenssen
b28832eccd
Support loading only last geomech frame (#9727)
Support option for loading only the last frame for each geomech timestep. Turn it default on for old projects.
2023-01-24 18:30:30 +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
jonjenssen
95f3490acd Remove unnecessary window layout update 2023-01-23 16:12:18 +01:00
Jørgen Herje
632107e77c
Move Reference Well functionality to WellLogExtractionCurve
* Remove reference well feature from plot objects
* Move Reference Well functionality to WellLogExtractionCurve
* Reset reference well selection if new selected well path equals ref
2023-01-23 15:07:48 +01:00
Magne Sjaastad
f48eca9ef5 Update linked views when animation slider is moved 2023-01-23 15:06:33 +01:00
Jørgen Herje
50b1820b60
Create depth adjusted LAS files
* Add support for creating depth adjustment LAS files
* Add RiaDefine for LAS file depth property names
* Remove incorrect check in K-index Calculator

Co-authored-by: jorgenherje <jorgenherje@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-01-23 12:46:54 +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
jonjenssen
56dd33e762 Improve range filter slider gui 2023-01-20 17:16:33 +01:00
Kristian Bendiksen
53a80cd86a Fracture: show perforation length field in fracture for azimuth + user-defined perf length. 2023-01-20 13:31:51 +01:00
Kristian Bendiksen
eedda3fa40 Recompute completion type results when input values change. 2023-01-20 13:31:51 +01:00
Kristian Bendiksen
68db4c7fa5 #9652 Thermal Fractures: fix transmissibilities for long perforation intervals.
Filter out invalid fracture cells (conductivity == positive infinity) when
calculating fracture to well transmissibilities.

Fixes #9652.
2023-01-20 13:31:51 +01:00
jonjenssen
ce9baa0883 Fix missing integration point and element nodal result 2023-01-19 16:20:11 +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
Kristian Bendiksen
061e0d4688 RiaDateStringParser: add option for day-first parsing of ambiguous date strings. 2023-01-19 09:00:05 +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
jonjenssen
712bad97bd
Add time step slider to 3d views (#9695)
Add new toolbar with slider that controls visible timestep in the view
2023-01-18 22:59:06 +01:00
jonjenssen
85f1b004cb
Geomech frames support (#9678)
Support for showing frames in geomech data.
2023-01-18 14:42:33 +01:00
Jørgen Herje
95202ad36a
Well allocation over time plot (#9655)
- Plot for showing well allocation over time. 
- Select time range
- Option to exclude time steps in selected range
- Possible value types: Flow rate, flow rate percentage, flow volume, accumulated flow volume, accumulated flow volume percentage
- Group small contributors into group "Others"
2023-01-18 09:18:00 +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
jonjenssen
14d4022ada
Add toolbar toggle button for showing displacements (#9677)
* Add toolbar toggle button for showing displacements
2023-01-13 20:21:55 +01:00
Magne Sjaastad
a2e73d7cee Move prepareForDelete() to Rim3dView 2023-01-11 12:30:06 +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
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
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
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
Kristian Bendiksen
1bbe02614b Roff: move "Import Roff Case" menu item. 2023-01-09 15:40:04 +01:00
Kristian Bendiksen
6b631b3d5a #9591 Janitor: remove unused parameter in RiuPlotWigdet::createPlotCurve. 2023-01-09 15:39:42 +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
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
Jon Jenssen
10960ea2fa Add safeguard 2023-01-02 16:51:27 +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
Kristian Bendiksen
142d8f0cc6 Janitor: Fix spelling of "synchronize". 2022-12-22 19:24:14 +01:00
Kristian Bendiksen
cc537fc241 Property Import: provide better file patterns. 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
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
Kristian Bendiksen
f92da6a98d Completion export: Export user-defined perforation length for azimuth. 2022-12-21 12:08: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
Kristian Bendiksen
8f33caef74 Fracture: Make conductivity type scriptable from python. 2022-12-20 08:44:42 +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
38bfa9ef1f
#9588 Accumulate N cells for AABB tree 2022-12-19 15:24:53 +01:00
Kristian Bendiksen
42f3316619 Janitor: Clean up includes. 2022-12-19 15:20:40 +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
Kristian Bendiksen
254c74be13
#9439 Fix unstable location of generated well target at sea level
NB! This fix will update the location of well target at sea level, and can potentially change the MD from sea level to first user defined well target. This will affect completions defined for the modelled well, as they are defined by MD.

* #9439 Make MD more predictable when toggling sea level target.
* #9439 Avoid updating well path tangents when toggling sea level target
* Disable IO of well target at sea level


Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-12-19 13:24:04 +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
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
Jørgen Herje
40e0f471d0
Upgrade reference well adjustment algorithm (#9569)
* Add checkbox for enable/disable usage of ref well for curve

- Individual control of utilizing reference well selected on plot-level.
- Default use state = true
- Make ref well path read only

* Upgrade adjustment algorithm to map values from ref well

- Map values from reference well into selected well
- Linearize depth values between top and bottom of k-layer.
- Neglect values and depths outside of common k-layer region
- Handle smoothing of curves after mapping

* Set curve name based on use ref well flag

* Use auto name for parameter track curves

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-12-13 08:29:00 +01:00
Magne Sjaastad
595806079a Fix typo 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