OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,251 Commits 59 Branches 85 Tags
15f17234c80a499ba688cfb0475c2f0a7168fcb3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 15f17234c8 #8747 MultiPlot : Duplicate and append plots for selected objects 2022-03-31 14:04:33 +02:00
Magne Sjaastad 64d35859a7 Merge pull request #8746 from OPM/patch-fixes 
Merge fixes from patch branch
 2022-03-28 11:07:47 +02:00
Magne Sjaastad 9c987855f2 Merge remote-tracking branch 'origin/patch_2021.10.3' into dev 2022-03-28 09:06:38 +02:00
Magne Sjaastad 7c4e81f59f Adaption of #8356 Summary Data : Add support for use of summary summary data from Python 2022-03-28 08:46:10 +02:00
Magne Sjaastad a08014e018 Remove obsolete test 2022-03-28 08:46:10 +02:00
Magne Sjaastad 751bf22a6b Python : Make sure an empty list will be received as empty list 
See https://github.com/OPM/ResInsight/issues/8508
Python code linting changes detected by black
 2022-03-28 08:46:10 +02:00
Magne Sjaastad ef842e7f27 #8416 VFP Plot : Support import of all units (Field, PVT, ..) 2022-03-28 08:46:10 +02:00
Magne Sjaastad 2b45892098 #8513 Use cell face when leaving cell when well path starts inside cell 2022-03-28 08:46:10 +02:00
Magne Sjaastad cbaaabf67e #8558 Use both conditions to disable use of start of simulation 
GeoMech cases require this test condition
 2022-03-28 08:46:10 +02:00
Magne Sjaastad ee888237f3 #8558 Fix reading of simulation dates for restart case 
The date import was wrong for some restart cases.
 2022-03-28 08:46:10 +02:00
Magne Sjaastad c48451a532 Summary Import : Support cases with one file per time step (#8493) 2022-03-28 08:46:10 +02:00
Magne Sjaastad cf4d2c9ad2 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.
 2022-03-28 08:46:10 +02:00
Magne Sjaastad 2800f1f189 #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.
 2022-03-28 08:46:10 +02:00
Magne Sjaastad f028491bb9 #8409 NNC : Make sure user defined legend ranges work 2022-03-28 08:46:10 +02:00
Magne Sjaastad f99bfb04b9 Janitor: Make sure NNC connections are computed before visibility is evaluated 2022-03-28 08:46:10 +02:00
Magne Sjaastad 87780b2b8a #8403 Ensure the NNC connection polygon is created before computing area 2022-03-28 08:46:10 +02:00
Magne Sjaastad e09a839228 Merge pull request #8402 from OPM/8401-flow-vector-result 
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-03-28 08:46:10 +02:00
Magne Sjaastad 8fea45c267 #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()
 2022-03-28 08:46:10 +02:00
Magne Sjaastad 869921d300 #8375 Flow Vectors : Avoid recomputing NNCs when accessing flow data 
Avoid include of RigNNCData.h in header files.
 2022-03-28 08:46:10 +02:00
Magne Sjaastad 4cf0efad61 Janitor : Show warning when generated NNCs count is larger than 5M 2022-03-28 08:46:10 +02:00
Magne Sjaastad 985a2c8f30 Merge pull request #8376 from OPM/fault_visibilityupdates 
Faults: Add Visibiliy mode for overlapping area
 2022-03-28 08:46:10 +02:00
Magne Sjaastad 8ad2ffa471 #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)
 2022-03-28 08:46:10 +02:00
Magne Sjaastad ff0b09d1c2 #8250 AppFwk : Introduce variadic macros 
Use variadic macros to to support optional parameters in initialization macros
 2022-03-28 08:46:10 +02:00
Magne Sjaastad 6a7e729886 Python : Split parameters into list of strings 
Avoid space in parameters to be sent to ResInsight, always use list of strings
 2022-03-28 08:46:10 +02:00
Magne Sjaastad 8b01a7c7f9 Merge pull request #8691 from OPM/platform-offscreen 
Add example for headless plot export using Python
Fix childPtrArray issue
 2022-03-28 08:46:10 +02:00
Magne Sjaastad 888243db8e Janitor : Add offscreen dynamic library when bundling Qt 2022-03-28 08:46:10 +02:00
Magne Sjaastad 7cd917e0d8 #8307 Input Eclipse Case: Handle trailing line comment 2022-03-28 08:46:10 +02:00
Magne Sjaastad 4366e53733 #8728 Help Menu : Add search issues and create new issue 2022-03-25 12:14:19 +01:00
Magne Sjaastad 8feb0c363b #8307 Input Eclipse Case: Handle trailing line comment 2022-03-24 15:22:07 +01:00
Magne Sjaastad 696c6a15fa #8676 QtChart : Create curve legend widget for multiplot 2022-03-23 14:28:56 +01:00
Magne Sjaastad f45637b7f0 #8715 Fix multi summary title and legend updates 2022-03-23 13:35:47 +01:00
Magne Sjaastad 2aec91e66d Janitor : Add offscreen dynamic library when bundling Qt 2022-03-23 12:42:40 +01:00
Magne Sjaastad 2f2933174b Python : Split parameters into list of strings 
Avoid space in parameters to be sent to ResInsight, always use list of strings
 2022-03-22 10:18:20 +01:00
Magne Sjaastad c03252a581 #8662 QtCharts: Snap tooltip to closest curve point. 2022-03-21 14:56:23 +01:00
Magne Sjaastad ffc1769a5f Pdf export : Remove theme change before export to PDF 
Crash seen on Windows related to theme change as part of export to PDF. This is related to export of plots to PDF in dark mode. Investigate other solution.
 2022-03-21 14:00:16 +01:00
Magne Sjaastad 8d3f381b4f Janitor: Update qwt to 6.2.0 2022-03-18 13:16:07 +01:00
Magne Sjaastad 72ff44071d Merge pull request #8691 from OPM/platform-offscreen 
Add example for headless plot export using Python
Fix childPtrArray issue
 2022-03-15 15:32:48 +01:00
Magne Sjaastad b98bd579d7 Janitor: Silence deprecation warnings for Qwt and nightcharts 2022-03-15 08:27:07 +01:00
Magne Sjaastad ab9e8646db Update vcpkg and GitHub Actions (#8682) 
* Update vcpkg to latest release (2021.05.12) Use https://github.com/microsoft/vcpkg
* Update all GHA to latest from dev
* Python code linting changes detected by black
 2022-03-15 08:19:44 +01:00
Magne Sjaastad 0ca70249ae Move defines to RiaDateTimeDefines 2022-03-14 09:18:48 +01:00
Magne Sjaastad e435e28e7d #8660 Axis range: If water cut is assigned, use 0..1 as axis value range 2022-03-14 08:24:49 +01:00
Magne Sjaastad 5b819b7635 Update clang-tidy.yml 2022-03-14 07:19:05 +01:00
Magne Sjaastad 88ed302dc3 Update clang-tidy.yml 2022-03-14 07:17:04 +01:00
Magne Sjaastad 7238894bf6 Janitor: Set minimum Qt version to 5.12 2022-03-12 16:43:48 +01:00
Magne Sjaastad 806a149809 Fix several deprecation warnings (#8657) 
* Use constructor instead of nullptr for WindowFlags
* Use constructor instead of nullptr for Alignment
* Disable deprecation warning for QProcess
* Add string split method to RaTextStringTools
* Add caf.cpp used to manage Qt function deprecations
* Use position()
 2022-03-11 13:24:01 +01:00
Magne Sjaastad 0bab8a9834 Fix update issues when switching from axis side (#8664) 
* #8610 Ensemble import : Set default axis
* Summary Axis : Delete previous axis when switching side
* Janitor: Use auto and empty()
 2022-03-11 13:11:24 +01:00
Magne Sjaastad 262aed3c8d #8663 QtCharts: Update labels when date format changes 2022-03-11 11:39:51 +01:00
Magne Sjaastad ceecf2e54c #8611 QtChart : Improve time axis grid intervals 
Use QCatetoryAxis to display date labels
Use Qwt label formatting and scale dividing tools to produce text labels
 2022-03-11 10:35:08 +01:00
Magne Sjaastad 721ba508de Axis sync: Reset zoom to make sure the complete range for min/max is available 2022-03-11 08:41:53 +01:00
Magne Sjaastad 728885a6c8 Janitor : Fix invalid rename introduce by horizontal/vertical depth log plots 
Fix deprecated
 2022-03-09 08:33:56 +01:00
Magne Sjaastad 6700c21086 Janitor : Use RimWellLogTrack in RimDepthTrackPlot 2022-03-09 08:33:56 +01:00
Magne Sjaastad 7494751bec Pdf export : Remove theme change before export to PDF 
Crash seen on Windows related to theme change as part of export to PDF. This is related to export of plots to PDF in dark mode. Investigate other solution.
 2022-03-04 14:44:25 +01:00
Magne Sjaastad 1563ae7b58 Merge pull request #8614 from OPM/minor-adjustments 2022-03-04 12:24:15 +01:00
Magne Sjaastad 84694cdbc3 Memory Management : Fix memory leak in FaultRASettings 2022-03-03 14:39:41 +01:00
Magne Sjaastad 32614152a6 Memory Management : Fix memory leak in bounding box tree 2022-03-03 14:39:41 +01:00
Magne Sjaastad 0e57cfe201 Memory Management : Adjustment and fixes 
Add release of several static singleton objects
Fix several minor memory leaks
 2022-03-03 14:39:41 +01:00
Magne Sjaastad 7a2a297648 #8592: Temporary workaround for crash seen on RHEL7 2022-03-02 17:32:39 +01:00
Magne Sjaastad 9826d94e9a Make sure a signal is connected only once 2022-02-28 10:52:05 +01:00
Magne Sjaastad cc52508970 #8494 Icons : Add icons for toolbars and docking widgets 2022-02-28 08:40:14 +01:00
Magne Sjaastad 5c0082f20b Avoid setting signal multiple times 2022-02-26 16:35:59 +01:00
Magne Sjaastad 5706c433d0 #8580 cafSignal : Assert if signal is connected twice to the same object 2022-02-26 16:35:59 +01:00
Magne Sjaastad 4693dc44ef Memory Management : Fixes related to plot objects and curves 2022-02-26 16:35:27 +01:00
Magne Sjaastad 47a44a79df Axis assignment : Use axis with same unit by default 2022-02-26 16:35:27 +01:00
Magne Sjaastad d5b108d2ef QtChart : Avoid zoom on right mouse button release 2022-02-26 16:35:27 +01:00
Magne Sjaastad 10a01972f3 #8583 RFT Plots : Add support for data source management to well log plots 2022-02-24 13:03:15 +01:00
Magne Sjaastad 7f41349b5c #8582 Eclipse Case : Make it possible to access RFT data without grid data 2022-02-24 13:03:15 +01:00
Magne Sjaastad f154f8c500 Import RFT segment data as well log curve (#8449) 
Add reader for RFT data using opm-common
Extend RFT curve with support for RFT segment data
Adjustments related to horizontal well log plots

8581 Well Log Plot : Update of curve appearance does not update plot
 2022-02-23 13:57:02 +01:00
Magne Sjaastad bb7f61ea56 Janitor : Remove obsolete override comment 2022-02-23 08:01:28 +01:00
Magne Sjaastad 4ed5250d3b Support horizontally stacked curves (#8553) 
* #8548 Horizontal track : Improve stacked curves
* Add horizontal track bar
* Show relevant scroll bar for horizontal and vertical plots
* Show max property value at top for horizontal plots
 2022-02-21 07:15:56 +01:00
Magne Sjaastad 5c72d31cc9 Improve well path target configuration (#8570) 
Improve the scripting possibilities for well targets
Added tests and examples
 2022-02-19 13:18:49 +01:00
Magne Sjaastad 0879f3748b #8558 Use both conditions to disable use of start of simulation 
GeoMech cases require this test condition
 2022-02-17 08:53:11 +01:00
Magne Sjaastad 79f427f64b #8558 Fix reading of simulation dates for restart case 
The date import was wrong for some restart cases.
 2022-02-16 19:38:57 +01:00
Magne Sjaastad 79614e09e9 #8555 Well Log Extraction : Fix missing curve data for no console 2022-02-15 15:43:44 +01:00
Magne Sjaastad 477ae02382 Logarithmic curve support and renaming (#8546) 
* Add test for both positive and negative numbers
* Remove redundant sample count from parameter list
* Propagate useLogarithmicScale
* Renaming
 2022-02-14 11:49:37 +01:00
Magne Sjaastad 3d6b7bdb0e Janitor: Roll back to 5.9.7 for centos7 2022-02-12 18:07:56 +01:00
Magne Sjaastad 4d0b94570e Qt : Bump build version to 5.12.12 (#8544) 
* Qt : Bump build version to 5.12.12

* Bump cache key
 2022-02-12 17:54:38 +01:00
Magne Sjaastad 64bb5c3351 Merge pull request #8527 from OPM/horizontal-well-log-plot 
Horizontal well log plot
 2022-02-12 16:14:13 +01:00
Magne Sjaastad 1488eec855 Rename to isLogCurve 2022-02-12 14:23:06 +01:00
Magne Sjaastadandmagnesj 6c92206893 Make curve drawing more robust (#8537) 
* Janitor : Improve robustness

* Guard nullptr access

* Limit the curve points to incoming from/to curve point index range

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
 2022-02-11 13:18:36 +01:00
Magne Sjaastad 3e9d2a0af0 Intersection Python API: Fix typo 2022-02-10 08:06:32 +01:00
Magne Sjaastad 43d890697d Multiaxis: Avoid transformation of the right axis to a left axis 2022-02-09 12:26:42 +01:00
Magne Sjaastadandmagnesj 64bed86f8f Intersection : Add Python support for triangle and result values (#8505) 
#8508 Python : Make sure an empty list will be received as empty list in Python

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
 2022-02-07 17:38:19 +00:00
Magne Sjaastad f2b6291a6b Refactor RimSummaryCurvesData 2022-02-07 09:55:11 +01:00
Magne Sjaastad 4ea4479a34 Move code to RimSummaryCurvesData 2022-02-07 09:55:11 +01:00
Magne Sjaastad ef4eb63bb9 Janitor: Clean up includes 2022-02-07 09:55:11 +01:00
Magne Sjaastad 2b39b95011 Add new axis object the side with least axes 2022-02-07 09:55:11 +01:00
Magne Sjaastad 15797bd739 Preferences : Add flag for default plot type QtCharts or Qwt 2022-02-07 09:55:11 +01:00
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