Commit Graph

197 Commits

Author SHA1 Message Date
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
Kristian Bendiksen
cd91a96871
#7953 StimPlan Model: always recompute anchor position and thickness direction. (#8004)
This is to support manually changing the MD directly in the project file.

Fixes #7953.
2021-09-14 10:46:12 +02:00
Kristian Bendiksen
1df25ed71c
#7966 Ensemble Well Log: depth equalization and filter by curve set options in well log plot (#8001) 2021-09-14 10:44:52 +02:00
Bård Skaflestad
785ee51099
Include <cctype> for std::toupper (#8003)
Restores build on VS 2017.
2021-09-13 18:20:44 +02:00
Magne Sjaastad
9838f766cb Performance : Use std::string when parsing address strings 2021-09-13 14:08:50 +02:00
Magne Sjaastad
41f80e7d89 #7912 Summary Data Import : Review feedback 2021-09-13 10:00:45 +02:00
Magne Sjaastad
f699f5f6b8 #7912 Summary Data Import : Update to ESMRY format 2021-09-13 10:00:45 +02:00
jonjenssen
a5b80c649b
Merge pull request #7960 from OPM/geomech_WIA4
GeoMech: Well Integrity Analysis
2021-09-09 17:34:27 +02:00
Magne Sjaastad
7f460b2958 #7957 Move progressdialog control to General tab
The freeze bug in Qt is triggered when the progress bar is displayed for long-running processes. A temporary workaround for freeze issues is to disable the progress bar. Move the setting into General tab to make it easily available for all users.
2021-09-08 11:51:20 +02:00
Magne Sjaastad
640c59d682 #7942 Summary Plot: Make reading of summary data file more robust
- remove the gsl::not_null for pointer to curve data
- For summary cases linked to a grid model case, do not try to read the original location of file if grid file location is not valid (will happen when a project file is moved)
2021-09-02 15:55:43 +02:00
Kristian Bendiksen
16ec5f793a
Fix incorrect argument order when loading eclipse grid. (#7937) 2021-09-01 07:34:40 +00:00
Magne Sjaastad
be29b278f2
#7929 Python : Avoid creation of new view when opening case 2021-09-01 08:25:22 +02:00
Magne Sjaastad
638f926429
cmake-format: Allow dangling parenthesis 2021-09-01 08:13:16 +02:00
Magne Sjaastad
b78cf3a4bb
Use cmake-format on all cmake files 2021-08-26 19:46:38 +02:00
Magne Sjaastad
49fa169db8
##7903: Improve ensemble surface names
Update the name of statistics surface when created
Regenerate surface geo only when required
Create statistics surfaces when importing surface ensemble
2021-08-26 15:12:27 +02:00
Magne Sjaastad
3a94078867
Support optimized surface export from grid model layers
* #7885 Update opm-common with optimized coordinate import
* #7885 Allow null as default result from a script method
* #7885 Propagate default parameter values to generated Python code
* #7885 Add CommandRouter as hub for worker methods
* #7885 Add support for use of CommadRouter from Python
2021-08-23 11:58:32 +02:00
Magne Sjaastad
8dbb1d5ccd
Improve well path modeling
* Improve handling of MD at first target
* When sea level well target is disabled, update MD of first target
* Show well target spheres by default, allow toggling of spheres
* Activate well target modifiers when clicking on well targets
* Remove selection update causing an unstable 3D view
* Improve display and handling of multiple locations
* Add special 3D target for tie in well target
* Add slider to tie in MD input field
* Show MD in well path target table
* Delete all well path laterals when deleting a well path

* Python : Add lateral to parent well
* Python : Add perforation interval
2021-08-13 16:48:33 +02:00
Magne Sjaastad
40fc7dacd0 #7856 Default settings for H5 summary file handling 2021-08-03 13:39:36 +02:00
Kristian Bendiksen
4bd2a7b6fd #7716 Ensemble Well Logs: load data when project is opened. 2021-06-30 10:43:11 +02:00
Magne Sjaastad
eb3c52aeb1 Python adjustments (#7809)
* #7797 Well Targets: Add scripting capability
* #7794 Python : Do not update childField or childFieldArray
* #7797: Python - Add scripting to well path collection
- Extend the pdmobject.py with method add_object()
- allow objects to be created from Python in well path collections
- add well targets to modelled well path

* #7795 Python : Make sure referenced generated classes are defined
* #7810 StimPlanModel: clean-up python generation
* Python : Always use empty string as default value for ptrFieldValue
It can happen that a ptrField is assigned to a pointer on object construction. (FaciesProperties) Make sure that constructor always assigns an empty string.

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2021-06-25 14:44:52 +02:00
Magne Sjaastad
273e416b40 Python adjustments (#7809)
* #7797 Well Targets: Add scripting capability
* #7794 Python : Do not update childField or childFieldArray
* #7797: Python - Add scripting to well path collection
- Extend the pdmobject.py with method add_object()
- allow objects to be created from Python in well path collections
- add well targets to modelled well path

* #7795 Python : Make sure referenced generated classes are defined
* #7810 StimPlanModel: clean-up python generation
* Python : Always use empty string as default value for ptrFieldValue
It can happen that a ptrField is assigned to a pointer on object construction. (FaciesProperties) Make sure that constructor always assigns an empty string.

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2021-06-25 14:28:41 +02:00
Magne Sjaastad
27b1d6ebfb Octave : Always execute command objects in queue before return 2021-06-25 14:28:34 +02:00
Kristian Bendiksen
56b80b8a02 #7804 Compute static result for IJK indexes. 2021-06-23 15:34:40 +02:00
Magne Sjaastad
d7113a528c #7786 Get version from command line 2021-06-16 13:14:07 +02:00
Magne Sjaastad
216126033e Octave : Always execute command objects in queue before return 2021-06-15 16:00:47 +02:00
Magne Sjaastad
2e5953216f #7438 Project File: Simulation name is hard coded in plots 2021-06-11 08:06:46 +02:00
Magne Sjaastad
889231755d Janitor : Move geomech tab to the right of scripting tab 2021-06-10 14:09:52 +02:00
Magne Sjaastad
ea9e3f7a52 Janitor : Hide undo stack behind environmentvariable DEVEL
Move geomech tab after scripting
2021-06-10 14:04:55 +02:00
Kristian Bendiksen
1ebe4ec2a1 #7763 Improve extrapolation for when points are too close. 2021-06-09 21:23:50 +02:00
Magne Sjaastad
8259220abd #7765 Well Log Curves : Improve handling of units 2021-06-09 21:18:42 +02:00