OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,751 Commits 27 Branches 61 Tags 309 MiB
6d5e303361
Commit Graph

226 Commits

Author SHA1 Message Date
Kristian Bendiksen
9678b80feb #7778 MainWindow: fix crash when reopening grid case 2022-05-20 14:51:01 +02:00
Magne Sjaastad
402f738abd Regression Test: Make sure all text is redirected to standard out 
Call RiaApplication::initialize() to recreate project and preferences. Do not call virtual method initialize(), as RiaGuiApplication::initialize() creates a new logger causing console text to disappear.
 2022-05-19 13:58:01 +02:00
Magne Sjaastad
fa8ad53981 Regression Test : Add memory usage to regression test logging 2022-05-19 12:48:54 +02:00
jonjenssen
828e8ec440
Show templates as separate project explorer tab. (#8902) 
Add templates as separate project explorer tab.
Add support for renaming and editing templates
 2022-05-11 19:46:17 +02:00
Magne Sjaastad
f52acd9a64 #8893 Rename quantity name -> vector name 2022-05-10 08:17:41 +02:00
Kristian Bendiksen
b761bb42af Grid Calculator: Fix view updates when calculation is changed or removed. 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
4304bbbc48 Grid Calculator: refactor summary curve calculator and add grid calculator. 2022-05-09 15:36:27 +02:00
magnesj
64c4adf5f0 Fixes by clang-tidy 2022-05-06 06:39:08 +02:00
Magne Sjaastad
cc397efe3e Performance : Simplify use of update schedulers 
Extract code to RiaScheduler
Add PlotCollectionScheduler
 2022-05-05 14:15:45 +02:00
Magne Sjaastad
8daf25ffb3 Performance : Cache result of some string manipulation functions 
These functions get called quite often, and popped up based on profiling.
 2022-05-05 14:15:45 +02:00
jonjenssen
296ddbde42
Merge pull request #8882 from OPM/append_curves 
Summary Multiplot: Source Stepping append curves with performance fixes
 2022-05-04 13:11:04 +02:00
jonjenssen
3de8010c2b
Source stepping and toolbar updates (#8866) 
* Move layout options to separate toolbar
* Enable stepping on quantities, remove special history curve stepping for now
* Allow stepping ensembles and cases
* Add step next/prev and add new sub plot
 2022-05-03 11:30:09 +02:00
Magne Sjaastad
46173af8c3
Merge pull request #8865 from OPM/8863-summary-issues 2022-05-03 08:51:26 +02:00
Magne Sjaastad
853b4a26d5 #8822 Summary Axis: Add tick mark count to y-axis 2022-04-22 23:14:48 +02:00
Magne Sjaastad
b6f7dd931e Add option to export to pdf without asking user 2022-04-22 23:14:48 +02:00
Magne Sjaastad
1840a95810 Preferences: Move colorCurvesByPhase and hide Qt Charts settings 2022-04-22 08:08:06 +02:00
Magne Sjaastad
caaca138c0
Curve Colors : Add support for color assignment based on summary phase (oil, gas or water) 2022-04-20 14:29:40 +02:00
Magne Sjaastad
93614ef272
Merge pull request #8791 from OPM/8790-rename-to-group 
Rename summary references to "Group"
 2022-04-07 21:06:40 +02:00
jonjenssen
3590c52cdc
Deprecate single summary plots and plot collections. (#8777) 
* Deprecate single summary plots and plot collections. Replace functionality using summary multi plots. Clean up some code. Fix crash when trying to normalize an empty curve
 2022-04-06 17:39:07 +02:00
Magne Sjaastad
6417daf167 #8773 Source Stepping : Realization cases are missing in some cases 2022-04-06 10:05:43 +02:00
jonjenssen
22d6e3f853
Merge pull request #8765 from OPM/summarymultiplot_performance2 
Summary Multiplot performance improvements and fixes
 2022-04-01 19:23:27 +02:00
Magne Sjaastad
15f17234c8 #8747 MultiPlot : Duplicate and append plots for selected objects 2022-03-31 14:04:33 +02:00
jonjenssen
ebba37a623
Merge pull request #8754 from OPM/multiplot_improvements 
Summary Multiplot: add new plot from a single curve in an ensemble plot and improve general plot performance
 2022-03-31 12:34:07 +02:00
Jon Jenssen
2eb1713866 Fix mouse wheel not working in 3D view if a plot window is created. 
Fix issue with multiplot sometimes being shown incorrectly when switching between fullscreen plots
 2022-03-30 16:19:16 +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
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
jonjenssen
8c27a0f656 Support pausing before running abaqus script to allow input file modifications. 
Add option in preferences to enable/disable pause.
 2022-03-28 08:46:10 +02:00
Kristian Bendiksen
86ea679871
#8652 Import Surface: Fix ts-file import with properties on Linux (#8730) 
The file had DOS line endings (\t\n) which where not properly trimmed on linux.

Fixes #8652.
 2022-03-25 14:16:25 +01:00
jonjenssen
8d3f41ded8
Merge pull request #8732 from OPM/summarymultiplot_updates2 
Summary Multiplot updates
 2022-03-25 11:39:12 +01:00
Jon Jenssen
560917a481 Rename NewSummaryPlot command to what it actually is - OpenSummaryPlotEditor command. Remove unused includes. 
Move Single Summary Plots to bottom of tree and show them as Single Summary Plots.
 2022-03-21 13:05:57 +01:00
Kristian Bendiksen
001e918238 #8637 3D-view legend: Make integer category for I-, J- and K-indexes 2022-03-17 08:19:16 +01:00
Magne Sjaastad
0ca70249ae
Move defines to RiaDateTimeDefines 2022-03-14 09:18: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
jonjenssen
c9b762fb16
Merge pull request #8654 from OPM/filter_wheelevents 
Summary Multiplot: page scroll and zoom fixes
 2022-03-10 13:13:44 +01:00
jonjenssen
abff06d2d5
Summary multiplot improvements (#8598) 
* Create multi summary plot from summary plot(s)
* Rearrange multi summary plot properties
* Enable source stepping toolbar for multi summary plot
* Automatically activate new summary plot when creating from data sources -> data vector tree
* Enable global key controls for switching data in summary and multi summary plots
* Update tooltip texts for summary plot toolbar
 2022-03-04 10:52:17 +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
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
jonjenssen
208ae7692b
Merge pull request #8578 from OPM/summaryplot_fromdatavector 
Summary Plot: create new plot from data vector tree nodes
 2022-02-22 11:32:35 +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
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
ef4eb63bb9 Janitor: Clean up includes 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
jonjenssen
a3ad9d2c1e
Merge pull request #8524 from OPM/tree_filter 
Add Project Tree filter support
 2022-02-04 15:49:22 +01:00
jonjenssen
66fd79175c
Project Tree updates (#8490) 
Split project tree into multiple dockable tree views for plots, keeping one for 3d views.
 2022-01-28 13:19:52 +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
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
Kristian Bendiksen
258fbddc10
Merge pull request #8387 from OPM/qtcharts-summary-plots 
Closes #8228 

Major refactoring of summary plotting. Now possible to create plots both with Qwt and QtChart as plotting tool.
 2022-01-17 13:14:21 +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
d578771a40 #8411 Flow Cell Results : Set useful default legend 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
3c35244809
#8420 Janitor: Remove empty parameters in initialization macros 2022-01-07 08:31:52 +01:00
Magne Sjaastad
442abfea05 Janitor : Guard empty string 2022-01-06 15:49:20 +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
4090e70507 #8356 Summary Data : Add support for use of summary summary data from Python 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
jonjenssen
9edb0385d5 Support pausing before running abaqus script to allow input file modifications. 
Add option in preferences to enable/disable pause.
 2021-12-06 21:52:42 +01:00
magnesj
fc7c935b06 Fixes by clang-format 2021-12-01 18:31:44 +01:00
Magne Sjaastad
0a8b52051d Merge remote-tracking branch 'origin/main' into dev 2021-12-01 16:29:57 +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
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
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
2a65636ba3 #8250 Use variadic macros and remove obsolete parameters 2021-11-14 15:26:09 +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
Kristian Bendiksen
53f102ee55 Stim Plan Model: Handle pressure values in field units. 2021-11-08 09:51:22 +01:00
Magne Sjaastad
361bf4090a #8246 Summary Curves : Use icons for summary categories 2021-11-08 09:50:09 +01:00
Magne Sjaastad
e95a6b0882 #8117 Ensemble Import: less company-specific "Group by Ensemble" 2021-11-01 15:13:38 +01:00
Magne Sjaastad
b3e0279f3a Merge remote-tracking branch 'origin/main' into dev 2021-11-01 15:08:12 +01:00
Magne Sjaastad
cb26131102 #8186 Add vec3 tools used to change sign of z component 2021-11-01 11:14:48 +01:00
Kristian Bendiksen
f8ab0b2197 #2029 Well Log Plot: Handle curves with different depth in 'Show Plot Data' 2021-10-29 15:00:46 +02:00
Kristian Bendiksen
c150f3a6f9 Remove strange repeated entry in cmake. 2021-10-29 15:00:46 +02:00
Magne Sjaastad
defccca4be #8210 Summary Import : Improve fallback strategy 2021-10-28 10:57:03 +02:00
Kristian Bendiksen
75fe73ee64 Refactor: Start using setUiTreeHidden where missing. 2021-10-24 09:11:20 +02:00
Magne Sjaastad
3fa59a9fc3 Use std::from_chars to convert to int 2021-10-19 21:31:34 +02:00
Magne Sjaastad
70a11e7fc3 Temporarily disable use of std::from_chars and <charconv> 
On CentOS7, the include of <charconv> seems not to be present. Use previous conversion method for now.
 2021-10-15 17:28:53 +02:00
Magne Sjaastad
afadaf27d5
Merge pull request #8159 from OPM/performance-surface 
Performance Surface import and resampling
 2021-10-15 16:55:58 +02:00
Magne Sjaastad
db45b47121 Janitor : Readability improvements 2021-10-14 19:50:29 +02:00
Magne Sjaastad
7c7be7a846 #8150 Python : Do not show widget in console mode 2021-10-14 10:25:13 +02:00
Magne Sjaastad
6bfdcebf0b #8143 Review feedback 2021-10-14 07:26:13 +02:00
Magne Sjaastad
d024f30a5b #8143 Preferences : Add file or memory mapped file for GRDECL import 2021-10-14 07:26:13 +02:00
Magne Sjaastad
54a4f35588 #8142 Preferences : Move system settings into separate file 2021-10-13 12:52:02 +02:00
Magne Sjaastad
a5be5b6b61 #8115 3D View : Add checkbox to GeoMech color result 2021-10-07 11:28:54 +02:00
Magne Sjaastad
bfd4457a6a #8113 LAS file import: Do not use message box for warning 2021-10-06 18:31:49 +02:00
Kristian Bendiksen
faba3a980d #8027 StimPlan Model Export: Add perforation, formation and facies info 2021-10-04 10:20:09 +02:00
Magne Sjaastad
0d4ab8b594
#8048 Everest Import: Group into separate ensembles 2021-09-30 09:08:09 +02:00
Kristian Bendiksen
ea3fdef281 Refactor: extract code for detecting logarithmic result 2021-09-29 14:16:43 +02:00
Kristian Bendiksen
f407acd5fa #8034 Pass reader settings to eclipse loading methods. 2021-09-29 09:40:27 +02:00
jonjenssen
66852c4dad
WellIA: Load results after external computations script has completed (#8062) 
* Load result after modeling has completed.
* Select new geomech view in project tree when importing a new geomech case
 2021-09-28 12:39:54 +02:00
Magne Sjaastad
33221e7e07 #8033 Ensemble Well Log: Allow import from grdecl files 2021-09-24 08:42:07 +02:00
Magne Sjaastad
515168600f
Improved UI for surface band and curves (#8026) 
* Add surface intersection bands and curves
* #8024 Ensemble Surface : Fix mix of files for a ensemble layer surface
 2021-09-23 09:59:29 +02:00
Kristian Bendiksen
4a6a1eed41 #7965 Import ensemble: Add option to group import of multiple ensembles 2021-09-22 08:56:32 +02:00
Kristian Bendiksen
b9767a35a4
#8019 StimPlan model: Apply default poro and perm as minimum values (#8023) 2021-09-20 12:30:01 +02:00
Magne Sjaastad
2480a782d1
Ensemble Surface improvements 
* Performance : Improve surface import
* Performance: Use opm when importing files
* Surface : Use the triangle size as basis for the maximum search distance
* Performance : Resample surfaces in parallell
* Performance: Import file surfaces in parallell
* Ensemble Surface : Create one ensemble per surface
 2021-09-16 14:28:19 +02:00
Kristian Bendiksen
1e83254e9e
Make P10/P90 calculation style more explicit 2021-09-16 10:38:27 +02:00
Magne Sjaastad
0bfa6ae2d1 #8009 Missing return values due to default function parameters 2021-09-15 14:58:54 +02:00