OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,282 Commits 53 Branches 83 Tags
26b68f97fb6c49f7d0f5854ba4941832496c9e4f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Bendiksen 26b68f97fb Janitor: Fix broken build on centos 7. 2021-02-26 16:03:17 +01:00
Kristian Bendiksen 8ca43bce63 #7392 Extract geometry methods from RimStimPlanModel. 2021-02-26 16:03:17 +01:00
Kristian Bendiksen 9373326281 #7400 StimPlanModel: Bin pressure by depth and use mean value. 2021-02-26 14:03:30 +01:00
Kristian Bendiksen 023bb062b5 #7400 Make proper methods of helper functions. 2021-02-26 14:03:30 +01:00
Kristian Bendiksen 36b9f084c0 #7400 Minor refactoring: remove duplication. 2021-02-26 14:03:30 +01:00
Kristian Bendiksen 5c5b9e7f34 #7400 StimPlanModel: Search vertically for EQLNUM for inactive regions. 2021-02-26 14:03:30 +01:00
Kristian Bendiksen 8ce620323e #7400 Refactor: Extract methods for replacing values. 2021-02-26 14:03:30 +01:00
Kristian Bendiksen f6fe69ba45 #7400 StimPlanModel: Add support for multiple missing value strategies. 2021-02-26 14:03:30 +01:00
Kristian Bendiksen 35525eeedf #7400 StimPlanModel: Cache calculated results. 2021-02-26 14:03:30 +01:00
Kristian Bendiksen 762e36ae9d #7400 Interpolate initial pressure per EQLNUM region 2021-02-26 14:03:30 +01:00
Kristian Bendiksen f0c70a0fd2 #7400 StimPlanModel: Add EQLNUM result to calculator. 
Take results from EQLNUM_1 input properties for missing values in
static eclipse case.
 2021-02-26 14:03:30 +01:00
Kristian Bendiksen 9077031535 Janitor: Fix crash when case is not set in eclipse result def. 2021-02-22 13:08:55 +01:00
Kristian Bendiksen 8ce01c098a #7117 Fix stale data when reimporting elastic properties 2021-02-22 13:08:55 +01:00
Kristian Bendiksen 1b91e4d344 #7365 StimPlanModel: Sort pressure table items by depth 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 5d331656cd #7365 StimPlanModelTemplate: make it clearer when pressure table is used. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen bb961ab460 #7339 StimPlanModelTemplate: Hide some levels in the project tree. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 394da90f1c #7339 StimPlanModelTemplate: Auto-select facies for initial pressure. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 530c6d3e85 #7339 StimPlanModel: Update python api changes in pdm objects. 
The eclipse cases are now set on the StimPlanModelTemplate, not on the
StimPlanModel.
 2021-02-19 12:18:30 +01:00
Kristian Bendiksen dc4e372fc2 Janitor: Remove "Interpolating missing values" info logging. 
This is expected behavior.
 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 8e29c2eb66 #7339 StimPlanModel: Add case for initial pressure data. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 77d02e67da #7365 StimPlanModel: Add optional table for inital and current pressure data. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen e7d7a40251 Fix problem in RigWellPathGeometry::interpolateMdFromTvd starting at 0.0 MD. 
The spline has to be extended to 0.0 regardless of the value of TVD.
 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 3e43ca2b65 #7339 StimPlanModel: handle facies without pressure depletion. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen ad0e07a540 #7339 Move dynamic and static case from instance to template. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen b68d3a5336 Janitor: Remove unused includes. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen e72cec3c62 #7339 StimPlanModel: Interpolate pressure data from dynamic eclipse case 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 54cdb6e8ef #7339 Refactoring: extract two methods. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen e695b62db1 Janitor: add missing override keyword 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 13130ae268 #7339 StimPlanModel: Handle incomplete formation names data. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen c6f35cbe1f #7339 StimPlanFracture: Add methods to use two grids for data extraction. 2021-02-19 12:18:30 +01:00
Kristian Bendiksen 448a263bec #7364 Stimplan XML: report TVD values from XML in UI. 2021-02-17 22:30:37 +01:00
Kristian Bendiksen 4bf0e8e493 #7364 Extract method for appending string. 2021-02-17 22:30:37 +01:00
Kristian Bendiksen 4d49302e82 #7329 Report MD and formation dip from StimPlan template XML. 2021-02-05 09:22:05 +01:00
Kristian Bendiksen f2c25a5f13 #7143 StimPlanModel: Compute formation dip in fracture plane. 2021-02-05 08:31:49 +01:00
Kristian Bendiksen 201955c4a9 #7140 StimPlanModel: Fix direction to barrier calculation. 2021-02-03 13:41:17 +01:00
Kristian BendiksenandMagne Sjaastad 751ebf7eb6 6365 additional stimplan xml parameters (#7318) 
* #6365 StimPlan XML: Parse formation dip and fracture orientation.
* #6365 Fracture: Use formation dip and fracture orientation from XML.
* #6365 Fracture: Compare case insensitive, use enum class

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
 2021-02-02 14:29:17 +01:00
Kristian Bendiksen 88b7a5807d #7298 Fracture: generate fracture grid for 'create at depth' 2021-02-01 18:39:58 +01:00
Kristian Bendiksen e2fc4e3de6 Janitor: Use RimProject::current() more in fracture code. 2021-02-01 13:02:06 +01:00
Kristian Bendiksen d941ff58d0 Improve name of User-Defined Well/Fracture Intersection Depth 2021-02-01 13:02:06 +01:00
Kristian Bendiksen e2c7d11049 #7309 Fracture: Add option to auto-update well/fracture intersection from template. 2021-02-01 13:02:06 +01:00
Kristian Bendiksen 6fad32e734 #7026 Use better name for well/fracture intersection for ellipsis fracture. 2021-02-01 11:07:12 +01:00
Kristian Bendiksen 94dfec1c9d #7026 Handle backward compatibility for ellipsis templates 2021-02-01 11:07:12 +01:00
Kristian Bendiksen 58f6619b2c #7026 Improve well/fracture intersection for elliptical template. 
- Make range go from 0 to height.
- Fix default to be 1/3 of height.
- Handle unit change.
 2021-02-01 11:07:12 +01:00
Kristian Bendiksen 635ada7297 #7026 Make well path/fracture intersection available for ellipse. 2021-02-01 11:07:12 +01:00
Kristian Bendiksen 7ebca64050 #7026 Set correct well center fracture cell for ellipse fracture grid 2021-02-01 11:07:12 +01:00
Kristian Bendiksen 18f9007a06 #7026 Ellipse Fracture Template : Add well/template intersection depth 2021-02-01 11:07:12 +01:00
Kristian Bendiksen 4759b72b98 Github actions: Fix failing pylint on pull requests. 2021-01-28 21:09:14 +01:00
Kristian Bendiksen acd78daa3f #6877 Fix backwards compatibility for well path/fracture intersection depth. 
The value needs to be copied from the template to the fracture instance for old
projects. This fixes assert seen in regression tests.
 2021-01-27 11:41:25 +01:00
Kristian Bendiksen f8aae6691d 6877 well fracture intersection per fracture (#7251) 
* #6877 Move well/fracture intersection to fracture (from template).
* #6877 Read stimplan xml without scaling and well/fracture intersection offset
* #6877 Move fracture grid to RimFracture from template.
* #6877 Use RiaDefines::conductivityResultName() where applicable.
* #6877 Reintroduce fracture template scaling.
* #6877 Hide well/fracture intersection option for elliptical template
* #7280: Fix crash when picking in first time step of StimPlan fracture
* #7279 Redraw after deleting fracture to make it disappear.
 2021-01-26 15:32:18 +01:00
Kristian Bendiksen d5b24f180e #7283 Fix crash on exit on centos 7. 
Occasionally QGuiApplication::lastWindowClosed() signal could be sent
more than once.
 2021-01-26 09:50:28 +01:00
Kristian Bendiksen d072138484 Janitor: Remove disabling of clang-format for fracture-related files. 2021-01-20 12:45:31 +01:00
Kristian Bendiksen 1d0705de46 #7158 Add option to introduce extra well path point at sea level. 2021-01-19 15:41:39 +01:00
Kristian Bendiksen 18b145268e #7207 Fix flow diagnostics cell color when property filtering. 
Split RimEclipseView::updateVisibleGeometriesAndCellColors() into two methods,
and make sure the visible geometries are recreated before updating the legends.
 2021-01-18 15:56:19 +01:00
Kristian Bendiksen ad07b18781 #6227 Filter out zero values in logarithmic plot. 2021-01-18 14:41:53 +01:00
Kristian Bendiksen 0a6c9143c8 #7111 Remember last file path for StimPlan XML. 2021-01-15 19:16:47 +01:00
Kristian Bendiksen 784f3069f0 #7148 StimPlanModel: provide better default for por/perm. 2021-01-15 12:06:39 +01:00
Kristian Bendiksen d73bd60825 #7158 Fix water depth calculation for WBS plot. 
The first intersection between the well path and the GeoMech model
is the correct water depth only when well path starts outside the model.

Top of the bounding box is used as an estimated water depth when
there is no intersection. WBS curves are now disabled for this case.
 2021-01-15 12:05:27 +01:00
Kristian Bendiksen 70a96c21de #7151 Flow Diagnostics: Filter legend based on visible wells/regions. (#7182) 
* #7151 Flow Diagnostics: Filter legend based on visible wells/regions.
* #7151 Flow Diagnostics: Show only visible tracers by default.
 2021-01-12 20:55:20 +01:00
Kristian Bendiksen 3e7412802e #7172 Fix updating well/fracture intersection of StimPlan fracture template. 2021-01-12 20:53:43 +01:00
Kristian Bendiksen 05048fe79b #7166 Use common delete functionality for PLT and RFT plots. 2021-01-12 20:53:20 +01:00
Kristian BendiksenandMagne Sjaastad 1f7cb2b973 7147 vfp show plot data (#7154) 
* #7147 VFP plots: refactor to separate data extraction and display.
* #7147 VFP Plots: Add "Show Plot Data" functionality.
* #7147 VFP plots: Move defines to separate file
* #7147 VFP plots: Minor adjustments
* #7147 VFP Plot: Show table number in title and auto-generated name.
* #7147 VFP Plot: Add "Show Plot Data" to context menu.
* Remove unused member.
* #7147 VFP Plot: Disable broken curve selection.
* Revert "#7147 VFP Plot: Add "Show Plot Data" to context menu."
This reverts commit 5f3b2f362fcea7fc6de5fd2c614919079629bf1c.
* #7147 VFP Plot: Use event filter to show context menu
* Janitor : Use context menu launcher for WellAllocationPlot and CrossPlot

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
 2021-01-12 20:51:57 +01:00
Kristian Bendiksen 39e678ae81 Remove target_link_directories calls. 
The link directories are handled by target_link_libraries.
 2021-01-12 11:05:53 +01:00
Kristian Bendiksen 3112f61890 Configure RESINSIGHT_USE_ODB_API in root CMakeLists.txt 2021-01-12 11:05:53 +01:00
Kristian Bendiksen 21b5cfe470 VFP Plot: Improve autogenerated plot title. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen afacc0968e Load VFP plots on project reload. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen 49e0c38e40 #7130 Fix unit conversion for liquid flow rate. 
And fix bug where conversion was applied multiple times.
 2020-12-22 14:52:05 +01:00
Kristian Bendiksen 870ba116a6 #7017 VFP Plots: Add UI for FLO, GFR and WFR types. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen ba372f7fbe #7128 VFP Plot: fix delete functionality. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen 4414b61efd #7018 VFP plots: Remove brackets for empty unit labels. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen 1724451c45 #7052 Add colors and names for VPF curves. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen c51b4ff7cd #7018 Improve VFP plots. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen dc651b1db4 #7052 Improve VFP tables display. 2020-12-22 14:52:05 +01:00
Kristian Bendiksen 1b41d266eb #7144 Fix "QwtLinearScaleEngine::divideScale: overflow" warning. 
Introduced in 7120b9ad7e.
 2020-12-21 16:09:23 +01:00
Kristian Bendiksen 79b9134c40 Extract method for checking connection and version from python. 2020-12-21 14:09:25 +01:00
Kristian Bendiksen d1c0226fd2 #7075 Retry grpc commands on "connection reset by peer" errors. 
Grpc connection is sometimes reset on flaky networks, and this is not
handled by the python grpc library. Solved by intercepting UNAVAILABLE
responses and retrying the command.

Adapted from this issue in python grpc repo:
https://github.com/grpc/grpc/issues/19514
 2020-12-21 14:09:25 +01:00
Kristian Bendiksen 401389bd80 Avoid calling exit on non-existing Rips instance. 
Can happen if test configuration fails.
 2020-12-21 14:09:25 +01:00
Kristian Bendiksen 0d51cfc3d8 #7136 Increase time out when launching from python. 
Added truncated exponential backoff policy to have shorter delays
initially, and longer delay after repeated failures.
 2020-12-21 14:09:25 +01:00
Kristian Bendiksen 956448bd18 #7136 Add more reconfigurable retry policy for initial connection. 2020-12-21 14:09:25 +01:00
Kristian Bendiksen b2ec95fba4 Github Actions: Reintroduce python tests for linux. 
Also unify "unit test" step since it was the same for both platforms.
 2020-12-21 14:09:25 +01:00
Kristian Bendiksen dbc2899f46 #6941 Rename and move RimHistogramData to RigHistogramData. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen 90aad9533d #6941 Remove unnecessary destructor. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen 7120b9ad7e #6941 Use std::limits<double>::max() instead of HUGE_VAL for histogram data. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen 95f6626480 #6941 Remove unused code. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen d9fc389abf #6941 Use property and time step from grid statistics plot (instead of view) 2020-12-10 10:00:50 +01:00
Kristian Bendiksen e02fb1135e #6941 Improve font handling in in GridStatisticsPlot. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen a707ff213e #6941 Add UI and create histogram 2020-12-10 10:00:50 +01:00
Kristian Bendiksen fbc03a2edf #6941 Extract histogram calculation for easier reuse. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen 772e9cf02d #6941 Move HistogramData into separate file for easier reuse. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen c21f243895 #6941 Github actions: build QtCharts from source for Centos 7. 2020-12-10 10:00:50 +01:00
Kristian Bendiksen e9d734f660 #6941 Add Grid Statistics plot using QtCharts. 
The feature is only enabled if QtCharts is installed.
 2020-12-10 10:00:50 +01:00
Kristian Bendiksen 193b1e4826 #7088 Add option to reread "Well/Fracture Intersection Depth" from XML. 
Default is now to read the contour xml file and update the parameter,
but older projects are left unchanged.

Closes #7088.
 2020-12-09 15:30:29 +01:00
Kristian Bendiksen 470111606b #7087 Allow creating StimPlanModelPlot without an active 3d view. 2020-12-07 16:14:02 +01:00
Kristian Bendiksen 2e113414e1 #6920 StimPlanModelPlot: show fewer curves by default. 2020-12-07 16:14:02 +01:00
Kristian Bendiksen 4711901d6b #7020 Avoid generating warnings for small adjustments in well log extraction. 2020-12-07 16:13:11 +01:00
Kristian Bendiksen c61329bf9a #7072 Warn when geological frk export produces NaN or inf. 
This can happen when the elastic properties are not defined for the
entire range of porosity in the grid.
 2020-12-07 14:06:35 +01:00
Kristian Bendiksen 7d3bb68b28 #7021 StimPlanModel export: Set default values for invalid stress gradients. 2020-11-20 15:09:52 +01:00
Kristian Bendiksen a4d60a630c #7024 Fix crash when closing comparison view on linux. 
The state of caf::Viewer::isComparisonViewActive() and Rim3dView::activeComparisonView()
can be out-of-sync until all events have been processed by the Qt event loop.
The caf::Viewer state is updated as part of an scheduled display update, but the
update to Rim3dView is a direct call.

Fix crash by checking for nullptr from Rim3dView::activeComparisonView().

Closes #7024.
 2020-11-20 14:25:29 +01:00
Kristian Bendiksen 9175806e6b #6930 StimPlanModel: Warn when exporting models with more than 100 layers. 2020-11-20 12:29:25 +01:00
Kristian Bendiksen 9ecbce4491 #7022 Set NTG as default Non-Net Layers result. 
Also set default cut-off to 0.0.
 2020-11-20 12:28:34 +01:00
Kristian Bendiksen 8e7913dbd3 #7022 Provide better default for Well Penetration Layer. 2020-11-20 12:28:34 +01:00