Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 358c11264a Merge pull request #8519 from magnesj/simplify-windows-env
Simplify GitHub Action and support windows-2022
2022-02-04 08:45:38 +01:00
Magne Sjaastad 2c0ebfd14c Make face test robust 2022-02-03 16:30:21 +01:00
Magne Sjaastad 94a541f966 #8513 Use cell face when leaving cell when well path starts inside cell 2022-02-03 16:30:21 +01:00
Magne Sjaastad 69e627cac9 Update ResInsightWithCache.yml 2022-02-03 13:08:26 +01:00
Magne Sjaastad ffc77516e8 Summary Import : Support cases with one file per time step (#8493) 2022-01-28 13:18:46 +01:00
Magne Sjaastad 2d2bf0bbc7 CMake : Improve handling of compiler flags (#8486)
#8478 Code cleanup to fix some warnings

Several adjustments to improve the specification and usage of compile flags.
2022-01-26 10:08:28 +01:00
Magne Sjaastad d5b17976ed Merge pull request #8459 from OPM/8458-summary-drop-target
Closes #8458
2022-01-21 14:32:51 +01:00
Magne Sjaastad b0470d38ee #8463 Plotting : Add command line parameter to show 2D main window 2022-01-21 07:48:15 +01:00
Magne Sjaastad 40d59b7bdc Regression Test : Make it possible to override plot engine
Add GUI to override plot engine to either Qwt or QtCharts in regression test dialog
2022-01-20 14:34:34 +01:00
Magne Sjaastad 5ff9f36448 Merge pull request #8461 from OPM/8460-plot-curve-fixes
Guard access to QtCharts objects that might be null
Fix visibility of items in legend based on state in parent plot
2022-01-20 12:52:36 +01:00
Magne Sjaastad 8f75dcb29f #8456 Early reject if no plot is created 2022-01-18 09:20:23 +01:00
Magne Sjaastad dc31a731ad Summary Data Source Stepping : Reintroduce stepping for summary plot
Data source stepping for multi plot is work in progress, and have disabled stepping for single summary plots. This commit will make it possible to do source stepping on single summary plots.
2022-01-11 15:15:56 +01:00
Magne Sjaastad eb02908dc7 Intersection : Support creation of multiple intersections from sim wells 2022-01-10 22:19:22 +01:00
Magne Sjaastad 051bbe6467 Intersection Depth Filter : Add missing geometry update 2022-01-10 21:57:18 +01:00
Magne Sjaastad 457f9653a8 Janitor : Remove hard-coded height 2022-01-10 21:57:18 +01:00
Magne Sjaastad 3495cdd4b4 Gha: Do not use unity build 2022-01-10 19:07:43 +01:00
Magne Sjaastad e203c76099 #8425 Summary Multi Plots: Add grouping on wells, groups, ...
* #8425 Multi Graph : Support grouping on object name
* #8425 Multi Graph : Improve creation of new graphs
* #8425 Multi Graph : Improve default tick mark count
* Handle history and non history as identical headers
* #8425 Multi Graph : Increase space below a graph
2022-01-10 14:51:31 +01:00
Magne Sjaastad aeb0bf0677 #8416 VFP Plot : Support import of all units (Field, PVT, ..) 2022-01-09 19:22:54 +01:00
Magne Sjaastad fef0a2b70c Janitor : Remove obsolete includes in header files 2022-01-07 10:38:56 +01:00
Magne Sjaastad dfd8b9986f Janitor: Make sure the default legend is configured for intersection results 2022-01-07 10:38:56 +01:00
Magne Sjaastad 0cb7a157c9 #8409 NNC : Make sure NNC flow vector directions are stable 2022-01-07 10:38:56 +01:00
Magne Sjaastad d578771a40 #8411 Flow Cell Results : Set useful default legend 2022-01-07 10:38:56 +01:00
Magne Sjaastad 13425ce0e9 #8410 Color Legend : Add option to center legend around zero 2022-01-07 10:38:56 +01:00
Magne Sjaastad 1e17da2926 Janitor : Add SOIL SGAS SWAT to RiaResultNames
wip
2022-01-07 10:38:56 +01:00
Magne Sjaastad 3d5c3134b2 #8409 Flow Vector Result : Rename to Vector Result 2022-01-07 10:38:56 +01:00
Magne Sjaastad 67993d56e3 #8409 NNC : Make sure user defined legend ranges work 2022-01-07 10:38:56 +01:00
Magne Sjaastad 3c35244809 #8420 Janitor: Remove empty parameters in initialization macros 2022-01-07 08:31:52 +01:00
Magne Sjaastad 7db24e9353 #8405 Source Stepping on multiple graphs
- add copy paste of plots into multi summary plot
- improve data source stepping for multi plot
- improve auto generated plot name, graph name and curve name
Fixes by clang-format

Improve readability
2022-01-06 15:49:20 +01:00
Magne Sjaastad 0fbd668569 #8397 Summary Curve : Add long vector name to auto name for curves 2022-01-06 15:49:20 +01:00
Magne Sjaastad 60873e54f4 Janitor: Always report unit for summary vectors 2022-01-06 15:49:20 +01:00
Magne Sjaastad 442abfea05 Janitor : Guard empty string 2022-01-06 15:49:20 +01:00
Magne Sjaastad db8209d23a Janitor : Trim unit text for summary vectors 2022-01-06 15:49:20 +01:00
Magne Sjaastad 9023b01cfa Janitor: Guard null pointer access 2022-01-06 15:49:20 +01:00
Magne Sjaastad bca2fadc28 Janitor: Make sure NNC connections are computed before visibility is evaluated 2022-01-05 15:58:41 +01:00
Magne Sjaastad eeb51bd8f1 #8403 Ensure the NNC connection polygon is created before computing area 2022-01-04 12:24:21 +01:00
Magne Sjaastad 8defab9bc1 Merge pull request #8402 from OPM/8401-flow-vector-result
#8401 Flow Vector Result: Handle empty results for first time step
Use OpenMP for vector calculations

Janitor: Use field of double instead of float to avoid rounding errors. If float is used in field, the current editor is has rounding effects that makes the text representation of 0.1 turn into 0.09999999....
2022-01-04 07:29:56 +01:00
Magne Sjaastad 4d21f90bf9 Add summary multi plot
Improve robustness related to update of Summary Plot Manager

Add RimSummaryMultiPlot
Move shared code into RiaSummaryStringTools
Added "Create Summary Multi Plot" to menu of MultiPlot in project tree
2021-12-23 09:30:36 +01:00
Magne Sjaastad 21f0988493 #8375 NNC : Create NNC generators when NNC data is available
This approach fixes an NNC visibility issue related to use of m_rimFault->faultGeometry()->connectionIndices() before any was assigned in RigMainGrid::distributeNNCsToFaults()
2021-12-20 10:23:52 +01:00
Magne Sjaastad 891a2e7c29 #8375 Flow Vectors : Avoid recomputing NNCs when accessing flow data
Avoid include of RigNNCData.h in header files.
2021-12-20 10:23:52 +01:00
Magne Sjaastad d82fa7f72b Janitor : Show warning when generated NNCs count is larger than 5M 2021-12-20 10:23:52 +01:00
Magne Sjaastad b495284b18 Python : Improve summary data example 2021-12-16 15:13:23 +01:00
Magne Sjaastad 0d213e659c #8371 Make sure all NNC faces are created and assigned
Make sure that the first cell in RigConnection is assigned the lowest cell index. Assign the opposite face if the cell indexes are swapped.
In RigCellFaceGeometryTools, test both combinations of (cellA, cellB) and (cellB, cellA)
2021-12-16 14:25:21 +01:00
Magne Sjaastad 1c70d9a2c5 Janitor : Guard null pointer access 2021-12-14 12:01:06 +01:00
Magne Sjaastad 4090e70507 #8356 Summary Data : Add support for use of summary summary data from Python 2021-12-14 12:01:06 +01:00
Magne Sjaastad 562be98e63 Janitor: Add type cast 2021-12-14 12:01:06 +01:00
Magne Sjaastad 2d5313772e Janitor : Support import of stand alone ESMRY files
All import of summary data was previously started from a SMSPEC file. As the ESMRY file is completely independent, it is useful to import these files directly.
2021-12-14 12:01:06 +01:00
Magne Sjaastad bf7917ab7c Janitor: Remove obsolete code 2021-12-14 12:01:06 +01:00
Magne Sjaastad 033cc4f1b7 #8359 Plot Project Tree : Avoid update of plot if possible 2021-12-10 09:46:01 +01:00
Magne Sjaastad 3938e9e600 #8359 Plot Project Tree : Always show multi plot collection
If no multi plots was present, the top level collection was not visible. This caused the project tree to collapse when a new plot was created.
2021-12-10 09:46:01 +01:00
Magne Sjaastad 48843c50f6 #8354 RFT file open : Inconsistent data might lead to crash
Use try/catch to avoid crash from RFT file reader. Avoid reading data when considering if menu items should be visible.
2021-12-09 09:59:18 +01:00
Magne Sjaastad 29db2bc012 Fix error in Python linting 2021-12-09 09:46:08 +01:00
Magne Sjaastad 34fb7d7e84 #8345 Summary Plot Manager : Several improvements
Add checkboxes for individual plots for vectors/addresses and creation of multiplots.
Moved code into RicSummaryPlotBuilder.
Allow UiComboBoxEditor to disable autocomplete.
Create plot using Enter key without modifiers.
2021-12-07 09:53:02 +01:00
Magne Sjaastad 178a5ab583 Rename to Data Sources 2021-12-07 09:53:02 +01:00
Magne Sjaastad e4357a9ab3 #8348 Theme : Changing theme when maximized plot window causes crash 2021-12-07 09:53:02 +01:00
Magne Sjaastad 0a8b52051d Merge remote-tracking branch 'origin/main' into dev 2021-12-01 16:29:57 +01:00
Magne Sjaastad 4d25081dde Set version to 2021.10.2 2021-12-01 16:27:28 +01:00
Magne Sjaastad 1559d72766 #8339 Summary Preferences : Adjust default settings 2021-12-01 16:27:28 +01:00
Magne Sjaastad 5f2ae7a9ba #8290 commandFile: Crash for scaleFractureTemplate
Make sure closeProject() is called before application exit. If not, some field editors will remain open an cause assert and crash on shutdown.
2021-12-01 16:27:28 +01:00
Magne Sjaastad ed914a03a4 Janitor : Rename variable and function names 2021-12-01 16:27:28 +01:00
Magne Sjaastad 9a85f2f0d7 #8294 Export Well Path: Error in MD description
For file well paths, always use text MDRKB
For modeled well paths use MDMSL if airgap is zero, otherwise MDRKB
2021-12-01 16:27:28 +01:00
Magne Sjaastad 44f588be27 #8312 2D/3D Intersections: Fix missing display of polyline 2021-12-01 16:27:28 +01:00
Magne Sjaastad 2e64d77538 #8314 Ensemble import: Perform file search only on "Find" button
Automatic search when input changes can be time consuming and confusing.
2021-12-01 16:27:28 +01:00
Magne Sjaastad e5874f08e8 #8237 Make sure fracture location is recomputed during copy/paste 2021-12-01 16:27:28 +01:00
Magne Sjaastad 8b36ec9925 #8313 Ensemble import: Avoid log message when no h5-file is found 2021-12-01 16:27:28 +01:00
Magne Sjaastad 5d96a98b06 #8316 Summary vector names: Use stripped quantity name to find category 2021-12-01 16:27:28 +01:00
Magne Sjaastad fe93d437ec #8316 Summary vector names: Fix wrong category for several keywords 2021-12-01 16:27:28 +01:00
Magne Sjaastad 0b327ca83b #8297 Python : Do not modify result container when reading grid result data
Avoid resize if data is already present
Improve functions for getting grid data and accessing single cell values
Add example for read and write of grid data
2021-12-01 16:27:28 +01:00
Magne Sjaastad d59584bd93 #8277 StimPlan : Use case insensitive string compare for facies and formations 2021-12-01 16:27:28 +01:00
Magne Sjaastad 5e2129a93b #8295 Guard null pointer access 2021-12-01 16:27:28 +01:00
Magne Sjaastad 95f1b63ddf Merge pull request #8332 from OPM/gha-improve-PR-names 2021-11-29 12:33:38 +01:00
Magne Sjaastad 64bb841d1c GHA: Use source branch name as branch-suffix for generated branches 2021-11-29 11:54:06 +01:00
Magne Sjaastad 6847e0573e #8316 Summary vector names: Use stripped quantity name to find category 2021-11-25 20:47:12 +01:00
Magne Sjaastad 6b7916be8a #8316 Summary vector names: Fix wrong category for several keywords 2021-11-25 20:47:12 +01:00
Magne Sjaastad 34ff98d2fa #8290 commandFile: Crash for scaleFractureTemplate
Make sure closeProject() is called before application exit. If not, some field editors will remain open an cause assert and crash on shutdown.
2021-11-25 09:24:19 +01:00
Magne Sjaastad 88ca478bab Janitor : Rename variable and function names 2021-11-24 09:24:35 +01:00
Magne Sjaastad 917748e1a4 #8294 Export Well Path: Error in MD description
For file well paths, always use text MDRKB
For modeled well paths use MDMSL if airgap is zero, otherwise MDRKB
2021-11-24 09:24:35 +01:00
Magne Sjaastad 2b6767c328 #8312 2D/3D Intersections: Fix missing display of polyline 2021-11-24 09:24:35 +01:00
Magne Sjaastad 9b42bf7cfc #8314 Ensemble import: Perform file search only on "Find" button
Automatic search when input changes can be time consuming and confusing.
2021-11-24 09:24:35 +01:00
Magne Sjaastad 14ae172647 #8237 Make sure fracture location is recomputed during copy/paste 2021-11-24 09:24:35 +01:00
Magne Sjaastad 79058fe122 #8313 Ensemble import: Avoid log message when no h5-file is found 2021-11-24 08:53:33 +01:00
Magne Sjaastad 5fcb81980d #8310 Summary Plot Manager : Add data source filtering 2021-11-19 15:42:26 +01:00
Magne Sjaastad c945166e81 Janitor : Remove obsolete code 2021-11-19 15:42:26 +01:00
Magne Sjaastad 4c2a70fa40 #8297 Python : Do not modify result container when reading grid result data
Avoid resize if data is already present
Improve functions for getting grid data and accessing single cell values
Add example for read and write of grid data
2021-11-18 13:45:55 +01:00
Magne Sjaastad 640b7406ec #8292 Add docking widget used to manage summary plots 2021-11-17 16:26:47 +01:00
Magne Sjaastad 7b1c780a77 AppFwk : Do not use deprecated feature in Qt 5.15 2021-11-17 16:26:47 +01:00
Magne Sjaastad 21fd4f74b5 Refactor code 2021-11-17 16:26:47 +01:00
Magne Sjaastad bc906f737c Variadic macro updates 2021-11-17 16:26:47 +01:00
Magne Sjaastad 7dfa84b0d9 AppFwk : Support notification when key is pressed in Line/ComboBox editors 2021-11-17 16:26:47 +01:00
Magne Sjaastad 89af752fa9 #8295 Guard null pointer access 2021-11-16 15:03:17 +01:00
Magne Sjaastad 2a65636ba3 #8250 Use variadic macros and remove obsolete parameters 2021-11-14 15:26:09 +01:00
Magne Sjaastad 1b869a9356 #8250 AppFwk : Introduce variadic macros
Use variadic macros to to support optional parameters in initialization macros
2021-11-14 15:26:09 +01:00
Magne Sjaastad 6940e588b6 #8277 StimPlan : Use case insensitive string compare for facies and formations 2021-11-12 13:03:36 +01:00
Magne Sjaastad a620ddb665 Update vcpkg to latest release (2021.05.12)
Use https://github.com/microsoft/vcpkg
2021-11-11 16:02:36 +01:00
Magne Sjaastad 9dad150e8c Set version to 2021.10.1-dev.01 2021-11-11 12:57:29 +01:00
Magne Sjaastad a7308127bb Set version to 2021.10.1 2021-11-11 12:25:21 +01:00
Magne Sjaastad 301ab40010 Set version to 2021.10.1-RC_01 2021-11-11 07:56:06 +01:00
Magne Sjaastad 56a456043b #8269 Show project name (without path) in application title for 3D and 2D window 2021-11-11 07:21:51 +01:00
Magne Sjaastad 07d6b90cb7 #8270 Python : Fix import_formation_names for project 2021-11-11 07:09:46 +01:00
Magne Sjaastad 316f43ab79 #8265 Python : Move append perforation interval to RimWellPath 2021-11-10 07:51:42 +01:00
Magne Sjaastad c8df7b4fdf #8240 Improve error message when well path is not crossing sea level 2021-11-09 09:27:55 +01:00