Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 3bca1507b2 Fix launch of unit tests 2023-04-28 15:20:02 +02:00
Magne Sjaastad 448e3dfcbc #10191 Read NNC data from INIT file for Intersect files 2023-04-28 11:38:23 +02:00
Magne Sjaastad f3faf4642a Avoid out of bounds value access in vector 2023-04-27 10:24:13 +02:00
Magne Sjaastad f0b28170da Copy openvds libraries to binary build folder 2023-04-27 08:44:51 +02:00
Magne Sjaastad 0907f57de9 Use target_include_directory
* Fwk: Avoid use of include_directories
* Remove target_include_directories from Commands
* Refactor cmake includes
- Avoid using include_directories, and use target_include_directories.
- Use add_subdirectory directly from main cmakefile, do not use in ApplicationLibCode.
2023-04-25 13:14:26 +02:00
Magne Sjaastad 90ccf447fb Download and use openvds package (#10153)
Download and use openvds package
2023-04-24 17:10:51 +02:00
Magne Sjaastad f8c1eebe01 Use AABB tree to speed up fault distance calculation 2023-04-24 12:40:25 +02:00
Magne Sjaastad 10adcbc082 Disable warnings on MSVC when including HDF5 2023-04-24 12:40:25 +02:00
Magne Sjaastad 48203115b1 Set python version for linting 2023-04-24 07:54:13 +02:00
Magne Sjaastad 643ccd67b8 Improve ensemble curve colors
* Use unique_ptr
* Improve default assignment of curve appearance
* Improve display of color tags in tree view items
* Select curve or ensemble instead of plot
* Only change curves connected to a Rim-object

* Improve color management for ensemble curves
Use a base color for statistics curves and set realization curves transparent
Make sure new curves are assigned a unique color
Harmonize how dropped addresses are handled

* Update all tags always
The update of tags for a subset of tree nodes is currently broken. Always update all tags.

* Add const
2023-04-19 15:36:06 +02:00
Magne Sjaastad d4f11e0f8f WBS-plot: Add optional support for maximum curve interval for UCS parameter curve (#10118)
* WBS-plot: Add optional support for maximum curve interval for UCS parameter curve
* GeoMech: Guard out-of-bound access to Pore pressure data
2023-04-19 07:16:13 +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
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
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
Magne Sjaastad 310b54ef93 Remove test code related to producer/injector table plots
This code caused legend config to be reset to 1 number of levels.
2023-04-11 10:16:43 +02:00
Magne Sjaastad e8f6d4819f Make sure file paths are resolved before initAfterRead() is called 2023-04-03 16:08:40 +02:00
Magne Sjaastad b2e8cc1663 Add optional max distance between curve points in WBS plots 2023-03-31 16:27:14 +02:00
Magne Sjaastad cde96a39f6 Remove test code for ccache 2023-03-31 16:01:56 +02:00
Magne Sjaastad ee1b363ae0 Add support for field of std::pair<T, U> 2023-03-31 10:21:56 +02:00
Magne Sjaastad 2509977e5a Use unity build for Windows to reduce build time 2023-03-31 10:01:57 +02:00
Magne Sjaastad 7499811564 MSVC: Move seismic libraries into "Thirdparty" 2023-03-27 13:00:26 +02:00
Magne Sjaastad 173a66a409 Fix type conversion error
Weird conversion error seen for Unity build on MSVC. Single file compile works fine.
2023-03-24 18:32:16 +01:00
Magne Sjaastad ab0b958884 Well Targets: Add scaling factor for well targets 2023-03-24 15:37:30 +01:00
Magne Sjaastad d23c6b4bb6 Janitor: Several code hygiene adjustments (#9981)
* Include all libraries in APP_FWK_LIBRARIES
* Several fixes detected by Static Code Analysis
* Remove unused code
* Add .clang.tidy
* Use QElapsedTimer
* Use horizontalAdvance
* Avoid | between enum of different classes
* Avoid illegal character
* Renaming and reorder of constructor initialization
2023-03-23 15:49:06 +01:00
Magne Sjaastad 2abfd08bd9 Fix typo
Use lowercase for function names


Use const
2023-03-23 15:46:24 +01:00
Magne Sjaastad b21c7028c2 #10002 Do not replace '.' with the current project path
When starting resinsight from a working folder, the project file paths can be relative to this folder (current working folder). If files are referenced relative to current working folder, the file references can start with either '..' or '.'  Make sure that these paths are left unchanged.
2023-03-23 15:45:45 +01:00
Magne Sjaastad 6529b1760d #10003 Use auto-value features only for RimSummaryPlot 2023-03-23 15:45:30 +01:00
Magne Sjaastad 42ea16d64b Create close-label.yml 2023-03-22 07:46:30 +01:00
Magne Sjaastad 911f260d0f Improve robustness of well flow calculator 2023-03-21 18:48:55 +01:00
Magne Sjaastad baf379701c Improve main github action for daily builds
Remove qtscript
Remove use of obsolete action
Improve cache key for vcpkg
2023-03-21 14:14:04 +01:00
Magne Sjaastad b30a8507a9 Avoid use of deprecated action 2023-03-21 14:07:16 +01:00
Magne Sjaastad c6d70a56f5 Improve AppFwk unit testing
* Get Cmake and Ninja
* Remove use of QtScript
* Run user interface test only on Windows
2023-03-21 10:22:14 +01:00
Magne Sjaastad 706c8a5266 Use clang-tidy-15
Update clang-tidy.yml to use clang-tidy-15 to be able to support c++20

Do not use OpenMP, as omp.h is not found during parsing

Remove modernize-use-nullptr, as this does not work with <=> (spaceship operator)
https://reviews.llvm.org/D95714
2023-03-21 10:02:03 +01:00
Magne Sjaastad 37abe17582 Fix multiple defined symbols for unity build 2023-03-20 12:02:23 +01:00
Magne Sjaastad 95b94a1cc7 Bump version after release 2023-03-16 15:30:45 +01:00
Magne Sjaastad f2fa0ad024 9939 Temporary fix for crash situation
Crash is seen on application exit
2023-03-16 14:09:39 +01:00
Magne Sjaastad 26c8883761 Prepare release 2023.03.0 2023-03-16 06:44:32 +01:00
Magne Sjaastad eb4ae78f36 Bump version 2023-03-15 13:40:54 +01:00
Magne Sjaastad 26416c8937 Make sure old project files loads as before 2023-03-15 10:53:08 +01:00
Magne Sjaastad 27959b9d13 Reintroduce RimGridSummaryCase to be able to read existing project files 2023-03-15 06:49:14 +01:00
Magne Sjaastad 09c04cbcd0 Improve RFT reader performance
* #9963 Rft reader: Search for DATA file when required
WSEGLINK is used to establish the branch topology for MSW wells. Search and read WSEGLINK data when segment data is requested by the user. This can be a time consuming operation.
Avoid doing this search for standard RFT plots.

* Make sure that single summary curves are displayed correctly
* Make sure single summary curves are visible in the plot
2023-03-14 13:14:40 +01:00
Magne Sjaastad 064c0adb8c #9956 Summary Plot: Fix update of operations on multiple ensembles
When multiple ensemble curve sets are toggled on/off, it is required to do a full RimSummaryPlot::loadDataAndUpdate() that will call RimEnsembleCurveSet::updateCurves() on all ensembles in the plot. This can be a heavy operation, but will happen only once.
2023-03-13 19:33:36 +01:00
Magne Sjaastad 9b4a3f663e Release adjustments
* Add CON*RAT track for tubing branch
* Set long summary vector name as default, and allow both in curve name
* Use line shift if multiple quantities are present on axis title
Insert line shift if multiple quantities are present, otherwise insert space between individual vector names and the unit text.
* Move Groups between Field and Wells
* Bump version
2023-03-13 19:01:31 +01:00
Magne Sjaastad eb5a0cf936 Add reload and delete of pressure/depth data 2023-03-13 16:09:20 +01:00
Magne Sjaastad ab44f9fa17 Add open in text editor feature 2023-03-13 16:09:20 +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 836822c2b9 Adjustments for release
* Show segment plots in Well Log Plot collection
* Improve menu text for operations related to segment plots
* Show reservoir rates for annulus and device
* Make sure curve objects are visible in the Project Tree
* When importing the first summary case, expand case in project tree
* Bump version
2023-03-13 08:10:33 +01:00
Magne Sjaastad 74fa621332 File - Import: Add "Import Pressure Depth Data"
* #9944 Add "Import Pressure Depth Data"  to import menu
Remove obsolete *InMenuFeatures and set all actions in menu to enabled when the signal aboutToShow() is triggered. This is useful for menus where no selection/context is available.
* Use RiaApplication::enableDevelopmentFeatures() to control visibility
2023-03-10 13:20:39 +01:00
Magne Sjaastad 07a4c13dd4 #9913 Fix import of RFT pressure/depth 2023-03-10 13:20:08 +01:00
Magne Sjaastad f5171310bf Add option for word wrap in label and checkbox
* Add support for word wrap in checkbox label
* QLabelEditor: Add word wrap and support for wide label
Add support for one label widget spanning the area usually consumed by a label widget and an editor widget.
* Use word wrap in summary calculation dialog
2023-03-09 12:46:55 +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
Magne Sjaastad e2e239fd07 Several RFT plot adjustments
* #9923 Call loadDataAndUpdate() after visibility of curves is updated
This will ensure that all zoom ranges are recalculated based on visible curves.

* #9923 Put new segment plots in RFT Plot collection
* #9923 Add "Create Rft Sement Plot" to RFT plot collection
* #9923 Make sure the main window is displayed when required
Make sure the main window is opened and views updated when a grid model is opened from a summary case.

* #9923 Make sure fieldChanged is triggered when required
Exclude field having the target state. If these fields are included, the one and only call to setValueWithFieldChanged() can contain a field with the target state value. When setting a value to a field with the same value, nothing happens and the UI will get an inconsistent state (some curves toggled off are still visible in a plot).
2023-03-08 07:35:27 +01:00
Magne Sjaastad 51331facac Improve how wells are connected during import
When importing new wells, consider all wells when connecting multi segment wells
Make sure that import of individual well paths will give the same ordering as importing all wells in a single operation.
2023-03-07 12:51:14 +01:00
Magne Sjaastad fc7bde8d35 #9879 Add icon for calculated summary vectors 2023-03-07 07:48:12 +01:00
Magne Sjaastad bf432f8897 Set version to RC_01 2023-03-06 16:03:29 +01:00
Magne Sjaastad 70c1a2c064 Guard null pointer access 2023-03-06 15:57:20 +01:00
Magne Sjaastad c248c9fb57 RFT segment plot adjustments (#9912)
* Delete RFT plot when associated case is deleted
* Rename
* Hide track/curves with no data
2023-03-06 14:34:22 +01:00
Magne Sjaastad 8f786fed5d #9914 Fix import of single case already present in ensemble 2023-03-06 10:45:49 +01:00
Magne Sjaastad a8e131647f #9915 Fix crash when using Plot Editor 2023-03-06 10:26:22 +01:00
Magne Sjaastad 6b83662e9f Convert file path to native separators for clipboard 2023-03-06 10:00:35 +01:00
Magne Sjaastad 18c88657f3 Add Copy to Clipboard button for file paths 2023-03-04 14:35:51 +01:00
Magne Sjaastad 9bc3659584 Remove special summary case connected to a grid model
* Remove use of RimGridSummaryCase
* Remove unused summary plot filter text
* Delete unused files
2023-03-03 15:28:34 +01:00
Magne Sjaastad 39d011b1e6 #9742 Set default value 1* for KH 2023-03-02 14:16:36 +01:00
Magne Sjaastad d47d4060cc Add valve visualization to MSW wells
* Refactor geo generator
* Add valve visualization to segments that are connected to a valve
2023-03-02 13:06:38 +01:00
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