Commit Graph

11178 Commits

Author SHA1 Message Date
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
Magne Sjaastad
6dec2aa1ef #6308 Shear slip indicator : Fix logic in isMatching
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2020-08-25 09:27:44 +02:00
Kristian Bendiksen
88c25631d1 #6302 PORO-PERM: Calculate initial porosity. 2020-08-25 09:22:48 +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
3d6d8d3220 Fix crash in RiuMainWindow when closing project 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
5ecee650f0 #6308 Move shear slip indicator to result to ST.DPN. 2020-08-24 14:49: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
6d84c667c3 Fix formatting. 2020-08-24 14:14:25 +02:00
Kristian Bendiksen
b4007d4b0d #6301 Fix warnings on windows. 2020-08-24 14:06:23 +02:00
Kristian Bendiksen
fe6ece0df7 #6301 Minor tweak to match SFG calculation in WBS plot. 2020-08-24 13:51:03 +02:00
Kristian Bendiksen
5cd94eed47 #6301 Use water density of 1.0 for hydrostatic pressure normalization. 2020-08-24 13:38:53 +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
Kristian Bendiksen
6e4bfaf2c3 #6301 Normalize results for FG calculation based on stress 2020-08-24 12:45:04 +02:00
Kristian Bendiksen
57ad0020cb #6301 Use RIG_ELEMENT_NODAL version of POR-Bar data.
This gives correct handling of elements without POR results for more of the model.
2020-08-24 12:45:04 +02:00
Kristian Bendiksen
4efc0c89ec #6301 Mud weight window: reorder code to guard against division by zero. 2020-08-24 12:45:03 +02:00
Kristian Bendiksen
491dedaf74 Janitor: Move RigFemPart implementation out of header file. 2020-08-24 12:45:03 +02:00
Kristian Bendiksen
33493773ae #6301 Add utility method to check if FEM element is a hexahedron. 2020-08-24 12:45:03 +02:00
Magne Sjaastad
3b366221eb #6345 Use native file dialog on Windows
Fix typo in getSaveFileName
2020-08-24 12:38:29 +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
Kristian Bendiksen
a659d065ad #6322 Fix stringification of pointers to objects on python side. 2020-08-24 09:41:06 +02:00
Gaute Lindkvist
4a8c4fd68f Revert docs/rips/project.py and fix uncommented code 2020-08-24 09:40:36 +02:00
Gaute Lindkvist
30fa232c25 #6320 Rename generated/pdm_objects.py to generated/resinsight_classes.py
* This is to avoid confusion with pdmobject.py
2020-08-24 09:40:36 +02:00
Gaute Lindkvist
454e7f17a0 #6322 Fix Python 3.8 problems
* Change base PdmObject class name to PdmObjectBase to avoid name conflicts
* Make all import paths relative
2020-08-24 09:40:36 +02:00
Magne Sjaastad
6bd99fcbea Merge remote-tracking branch 'origin/2020.04-patch-02' into dev 2020-08-24 08:33:16 +02:00
Magne Sjaastad
d9ba1a2575 #6345 Fix missing QFileDialog prefix 2020-08-24 08:26:46 +02:00
Magne Sjaastad
afa8804e5b #6345 Use wrapper class instead of QFileDialog 2020-08-24 08:26:39 +02:00
Magne Sjaastad
6655946be5 #6345 Remove obsolete include of QFileDialog 2020-08-24 08:26:32 +02:00
Magne Sjaastad
568053375c #6345 Add wrapper class for QFileDialog 2020-08-24 08:26:27 +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
Magne Sjaastad
ff202014d7 #6345 Fix missing QFileDialog prefix 2020-08-24 08:10:49 +02:00
Magne Sjaastad
665b475e9f #6345 Use wrapper class instead of QFileDialog 2020-08-24 08:10:49 +02:00
Magne Sjaastad
1adf97b075 #6345 Remove obsolete include of QFileDialog 2020-08-24 08:10:49 +02:00
Magne Sjaastad
6a0a6e9836 #6345 Add wrapper class for QFileDialog 2020-08-24 08:10:49 +02:00
Gaute Lindkvist
e19cb1a45b Fix build issues due to unused variables 2020-08-21 17:23:53 +02:00
Magne Sjaastad
c3829da41b #6156 Handle gaps and inactive cells in MSW valve accumulation 2020-08-21 17:23:40 +02:00
Gaute Lindkvist
2188a33d4e #6157 Move splitting of MSW segments to just before WELSEGS output
* this is to avoid it impacting on COMPSEGS and other output
2020-08-21 17:22:17 +02:00
Kristian Bendiksen
16663ed47a Fix windows warnings. 2020-08-21 16:17:59 +02:00
Kristian Bendiksen
e5cdbfced6 Initialize variables related to plot titles.
Was triggering valgrind "jump depends on uninitialized values" warnings.
2020-08-21 16:17:59 +02:00
Kristian Bendiksen
4e7541513e #1582 Remove last reference to caf::FixedArray. 2020-08-21 16:17:59 +02:00