Commit Graph

5756 Commits

Author SHA1 Message Date
Jon Jenssen
c0c0c2c4b8 Make sure we don't override the color legend type chosen by the user when switching between results. 2020-08-28 08:48:02 +02:00
Kristian Bendiksen
2f2fb145ac #6296 Fix empty or duplicated fracture model menu items. 2020-08-27 09:06:16 +02:00
Kristian Bendiksen
100c1b9e14 Merge pull request #6372 from OPM/stimplan-detailed-fluid-loss-6364
Stimplan detailed fluid loss 6364
2020-08-26 12:50:43 +02:00
jonjenssen
cfe64f5706 Surface python interface (#6370)
* Add python interface for importing surfaces with example.
2020-08-26 12:31:23 +02:00
Kristian Bendiksen
e6d170a230 #6364 Fix incorrect spelling of coefficient everywhere. 2020-08-26 10:24:50 +02:00
Kristian Bendiksen
7daed80af7 #6364 Use SI unit for thermal expansion coefficient.
And convert from SI unit (1/degrees Celsius) to field units (1/degrees
Fahrenheit) for the export.
2020-08-26 10:23:03 +02:00
Kristian Bendiksen
78c3568ff7 #6364 Fracture model plot: use Celsius as unit for temperature in plot. 2020-08-26 09:25:04 +02:00
Kristian Bendiksen
202bcba93d #6364 Fix unit conversion for reservoir pressure in FRK export. 2020-08-26 09:03:25 +02:00
Gaute Lindkvist
daf24c773b #6359 Improve context menu creation of correlation plots 2020-08-26 08:19:49 +02:00
Kristian Bendiksen
d4d010c5d5 #6364 Add import, display and export of immobile fluid saturation.
Part of Stimplan "detailed fluid loss" format.
2020-08-26 07:01:16 +02:00
Kristian Bendiksen
1b5be32994 #6364 Add more default values and export for Stimplan detailed fluid loss.
Added in this commit:
* Relative Permeabilty factor
* Poro-Elastic Constant
* Thermal Expansion Coefficient.
2020-08-25 16:16:52 +02:00
Kristian Bendiksen
d0322a98ba #6364 Stimplan: add curve and export for reservoir temperature. 2020-08-25 16:16:52 +02:00
Kristian Bendiksen
ddc23fa5ea #6364 Add scaffolding for exporting detailed fluid loss for Stimplan. 2020-08-25 16:16:52 +02:00
Gaute Lindkvist
9eb79fbb0e #6304 Improve stacked curve interpolation
* We no longer require the depth data to be well ordered.
2020-08-25 15:49:59 +02:00
Magne Sjaastad
f96a597321 Guard nullpointer access
Seen when running regression test ProjectFiles\CommandFileTests\TestCase_Multiple_Fractures and rest of tests in this folder
2020-08-25 13:15:07 +02:00
github-actions[bot]
c4d2488d31 Fixes by clang-format (#6362)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2020-08-25 08:44:08 +02:00
Gaute Lindkvist
1a04794f7a Further crash fix in RimStimPlanColors 2020-08-25 08:33:47 +02:00
Gaute Lindkvist
f82b2f73ec #6320 Refactor of PdmScripting
* Make base class abstract
* Implement support for IOHandling for PdmChild and PdmChildArray fields
2020-08-25 08:33:47 +02:00
Kristian Bendiksen
2ec5f83dad Merge pull request #6344 from OPM/shear-slip-indicator-6308
#6308 GeoMech: Add shear slip indicator calculation.
2020-08-24 18:59:43 +02:00
Kristian Bendiksen
afce21ad1e #6308 Sync water density from Rim to Rig when opening GeoMech case 2020-08-24 18:36:08 +02:00
Kristian Bendiksen
b86720529b #6308 GeoMech: Add shear slip indicator calculation. 2020-08-24 14:39:10 +02:00
Magne Sjaastad
1f2f1bf14e #6314 Rename to RifSurfaceImporter
Co-authored-by: Ruben Manuel Thoms <ruben.thoms@ceetronsolutions.com>
2020-08-24 14:35:34 +02:00
Magne Sjaastad
4f68f2b11a #6314 Fix typo
Co-authored-by: Ruben Manuel Thoms <ruben.thoms@ceetronsolutions.com>
2020-08-24 14:35:34 +02:00
Magne Sjaastad
0bd328f4df #6314 PTL format from generated surface
Co-authored-by: Ruben Manuel Thoms <ruben.thoms@ceetronsolutions.com>
2020-08-24 14:35:34 +02:00
Kristian Bendiksen
14e0a9c2da Merge pull request #6332 from OPM/mud-weight-fracture-gradient-fix-6301
Mud weight fracture gradient fix 6301
2020-08-24 14:30:43 +02:00
Kristian Bendiksen
4049d5ca93 #6301 Make sure mud weight window parameters consistent.
The values are now propagated from rim to rig.
2020-08-24 12:45:04 +02:00
jonjenssen
7cb9a071c1 Surface: Support for folders, copy and drag'n'drop (#6335)
* Enable surface reordering support. Automatically update surface in view ordering based on surface collection ordering

* Remove obsolete code

* Enable drag'n'drop support for surfaces within a surface collection. Still missing the collection update part.

* Bring back code lost in prev. commit

* Add code to accept drops in surface collections. Keep view  in sync.

* Add command for adding additional surface folders.

* Make sure we use the current surface collection as our parent when importing

* Enable name editing.
Make sure we use the correct surface collection when importing/creating surfaces

* More work on getting surface collections working.

* Clean up naming

* Make sure name for surfaceinviewcollection is read only

* Support drawing surfaces from subcollections, too

* Allow deleting subfolders.
Fix legends in view

* Refactor topmost flag for surface collections.

* Fix reload surface to work in all subfolders, too
Add copy surface skeleton. Actual copy operation is still missing

* Add support for copying surfaces

* Remove possibility to choose I and J slice directions for grid case surfaces.

* Fix warnings.

* Make sure we create the surface folder at the correct level

* More warning fix

* Use XML serialization for copy operation

* Fix missing delete

* Fix typo

* Remove unnecessary method.
2020-08-24 11:09:22 +02:00
Magne Sjaastad
6655946be5 #6345 Remove obsolete include of QFileDialog 2020-08-24 08:26:32 +02:00
Magne Sjaastad
53f6471cd1 #6039 Well Allocation Plot: Update flow rate curves after change of visibility 2020-08-24 08:26:10 +02:00
Gaute Lindkvist
6bcf1b56fe Disallow dropping curves onto other curves
* Dropping curves between other curves works much better with this change.
2020-08-20 12:50:55 +02:00
Kristian Bendiksen
e1ba491a9a #6315 Remove biot factor corrections for calculated stresses. 2020-08-19 07:27:08 +02:00
Kristian Bendiksen
307639a7d1 #6232 Add python api for exporting fracture model plot to frk file. 2020-08-18 10:12:10 +02:00
Kristian Bendiksen
a79b794eab #6232 Add python api for creating fracture model. 2020-08-18 10:12:10 +02:00
Kristian Bendiksen
7c69fc61ef #6232 Make fracture model pdm objects scriptable. 2020-08-18 10:12:10 +02:00
Magne Sjaastad
523cdc2b7d Janitor : Use class enum 2020-08-14 11:00:36 +02:00
Magne Sjaastad
07c778280b #6252 Category Legend : Reverse the ordering in the category legend 2020-08-14 11:00:36 +02:00
Magne Sjaastad
bc47487d68 #6252 Formations : Use user-defined color legend 2020-08-14 11:00:36 +02:00
Magne Sjaastad
d276d0eefe #6252 Category Colors : Name and corresponding color do not match
Set category data directly to the category mapper with no reverse ordering
When drawing the color legend, always draw categories with lower index first
2020-08-14 11:00:36 +02:00
Magne Sjaastad
e61b97f836 Guard access of nullptr 2020-08-13 14:17:20 +02:00
Magne Sjaastad
40183ce640 Move function to private section 2020-08-13 14:17:13 +02:00
Kristian Bendiksen
96c7ac422f Merge pull request #6300 from OPM/mud-weight-window-improvements
Mud weight window improvements
2020-08-12 14:27:32 +02:00
jonjenssen
bbc659799e Surfaces: Improve UI and usability for surfaces (#6290)
* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Fixes by clang-format

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2020-08-11 11:34:34 +02:00
Kristian Bendiksen
02013f4816 #6284 Mud Weight Window: Improve handling of non-reservoir elements. 2020-08-11 11:14:58 +02:00
Gaute Lindkvist
af44659860 #6293 Make sure stacking is only available for some curv
* Well Log Curves and Summary Curves for now.
2020-08-11 09:57:56 +02:00
Gaute Lindkvist
e0cf133721 #6285 Add context menu stacking/unstacking of curves 2020-08-11 08:40:33 +02:00
Kristian Bendiksen
e93c4e75f2 #6284 Mud Weight Window: add option for non-reservoir pore pressure data. 2020-08-10 19:30:41 +02:00
Kristian Bendiksen
e3628906c8 #6286 Mud Weight Window: Use initial overburden gradient from grid. 2020-08-10 18:15:15 +02:00
Kristian Bendiksen
68ce7f590d #6286 Mud Weight Window: Improve fracture gradient calculation for shale. 2020-08-10 18:15:15 +02:00
Gaute Lindkvist
c3982a5782 Fix update problems with stacked curves 2020-08-10 12:58:53 +02:00
Gaute Lindkvist
86a4f5613c Major improvements to D&D of curves. 2020-08-10 12:58:53 +02:00