Commit Graph

5869 Commits

Author SHA1 Message Date
Kristian Bendiksen
69a1901904 #6491 Fix range iterators which was creating data copies (clang10 warnings). 2020-09-15 11:04:39 +02:00
Jon Jenssen
cbadfd456a Do not allow opening the same odb file twice. The odb reader does not support that. 2020-09-15 07:27:01 +02:00
Kristian Bendiksen
15b456b21f #6491 Simplify omp loop construct to compile with clang. 2020-09-14 21:46:27 +02:00
Kristian Bendiksen
02944f4eca Add ifdefs for OpenMP usage. 2020-09-14 21:46:27 +02:00
Kristian Bendiksen
81a93a80fd #6491 Remove unneccessary omp.h includes. 2020-09-14 21:46:27 +02:00
Kristian Bendiksen
f83ca79a87 #6134 Fracture Model: Add menu item to delete a fracture model. 2020-09-14 15:30:51 +02:00
Magne Sjaastad
b511f92ee2 #6388 Surface : Use bounding box of model to limit depth offset 2020-09-10 15:29:56 +02:00
Magne Sjaastad
7fba6f9171 #6388 Surface Import : Make import robust, add progress
Co-authored-by: Ruben <ruben.thoms@ceetronsolutions.com>

Fix issues with import
Add progress bar
Add Surface Import Coarsening to Preferences
Use preferredMinimumDistance between point to define how many rows/columns to skip to reduce data size required to represent a surface. Some files have small sampling distance.
2020-09-10 15:29:56 +02:00
Kristian Bendiksen
a02abcde14 #6426: Fracture Model: show default reference stress depth and stress with fewer decimals. 2020-09-10 13:02:49 +02:00
jonjenssen
bc82166151
Support for copying GeoMech case settings using new input (#6471)
* Support copy and replace geomech case, to support importing another data file, but keep the view setup

* Make sure surfaces and intersections get updated with the correct separate result, too

* Simplify/refactor code

* Better naming
2020-09-10 12:54:43 +02:00
Gaute Lindkvist
dbec9dd3a5 #6479 Fix saving derived ensemble analysis plots and improve delta labels 2020-09-10 10:49:30 +02:00
Gaute Lindkvist
02b193af43 Remove wrong signal connection in Analysis Plot 2020-09-10 10:49:30 +02:00
Gaute Lindkvist
2cee179e79 Make sure all parameters are added for Correlation plots 2020-09-09 20:13:02 +02:00
Gaute Lindkvist
3a25ef0ec5 #6440 Use field quantities as default for new correlation plots 2020-09-09 20:13:02 +02:00
Gaute Lindkvist
7afbae6597 #6460 Improve consistency of icons on high-DPI displays 2020-09-09 09:13:04 +02:00
Kristian Bendiksen
839a049804 #6175 Fracture Model: Remove hard-coded reference to Norne. 2020-09-09 08:42:19 +02:00
jonjenssen
c0c9fcfe55 Drop inline 2020-09-08 16:58:47 +02:00
jonjenssen
44bfb79469 Refactor 2020-09-08 16:58:47 +02:00
Jon Jenssen
64e4ce3ab9 Only show histogram statistics in info overlay box if the histogram has valid data. 2020-09-08 16:58:47 +02:00
jonjenssen
49a1c94364 Remove 2020-09-08 15:30:21 +02:00
Jon Jenssen
5f10732d1e Remove uncessary method call that causes crash during copy.
Add some more safeguards in code.
2020-09-08 15:30:21 +02:00
Magne Sjaastad
9ef37aca98 #5315 Category Cell Results: Rename to Exclusively Category Colors 2020-09-08 14:37:19 +02:00
Magne Sjaastad
07db5098dd #5315 Category Cell Results: Add color legend edit button 2020-09-08 14:37:19 +02:00
Magne Sjaastad
22c098368d #5315 Category Cell Results: Use color legend values 2020-09-08 14:37:19 +02:00
Gaute Lindkvist
63803eeebd Make modeled well paths scriptable 2020-09-08 13:44:55 +02:00
Gaute Lindkvist
2e1bf89bff #6417 Fix update of cvf::Vec3d from Python 2020-09-08 13:44:55 +02:00
Gaute Lindkvist
a4cd754fd3 Revert "Make Vec3d fields non-scriptable to work around #6417."
This reverts commit 185bf31228.
2020-09-08 13:44:55 +02:00
Gaute Lindkvist
d3fc5e7942 Remove use of QStringList::toStdVector and fromStdVector 2020-09-08 13:44:40 +02:00
Kristian Bendiksen
eb532f0872 #6425 Fracture Model: Export Asymmetric.frk file. 2020-09-08 13:09:19 +02:00
Magne Sjaastad
cbce19bb65 #6462 Add reordering to color legend items 2020-09-08 10:18:16 +02:00
Kristian Bendiksen
85ba3a3bc9 #6424 Fracture Model: Export Perfs.frk file. 2020-09-08 07:27:21 +02:00
Gaute Lindkvist
f6613a072d Changing Ensemble naming suggestion to be the iteration 2020-09-07 14:08:23 +02:00
Gaute Lindkvist
5f6dce5059 Analysis Plots: make it clearer what Summary Item is 2020-09-07 14:08:23 +02:00
Gaute Lindkvist
7cf24d02ff #6367 Improve the way we automatically name ensembles and cases 2020-09-07 14:08:23 +02:00
jonjenssen
f38d119cc8
Add reordering to some more collections (#6430)
* Add reordering to some more collections

* Fix unused vars
2020-09-07 13:48:42 +02:00
Gaute Lindkvist
b64cad8bef #6447 Reduce decimals for correlation sorted parameter list 2020-09-07 09:14:13 +02:00
Ruben Manuel Thoms
8290f3e293 Added function for importing surfaces from OpenWorks XYZ files.
Added helper function for fuzzy comparing vectors.
Adjusted (old) code to avoid warnings.
2020-09-05 13:24:57 +02:00
Gaute Lindkvist
baaa18bdd5 Sort Ensemble curve filters by correlation 2020-09-04 08:31:50 +02:00
Gaute Lindkvist
d882911b25 Sort correlations by absolute value in Ensemble Parameters 2020-09-04 08:31:50 +02:00
Kristian Bendiksen
0415f25d0a #6422 Detailed Fluid Loss: hide curves when disabled. 2020-09-03 16:35:03 +02:00
Jon Jenssen
c2ae283445 Fix unused vars 2020-09-03 16:09:43 +02:00
Kristian Bendiksen
452d50df8f #6421 Fracture Model: better reference temperature 2020-09-03 15:20:22 +02:00
Jon Jenssen
3bb833e103 Add reordering to some more collections 2020-09-03 15:19:18 +02:00
Kristian Bendiksen
7aef42a70e #6422 Fracture Model: enable/disable detailed fluid loss correctly. 2020-09-03 15:18:00 +02:00
Kristian Bendiksen
6458837f78 Fracture Model: Group fields. 2020-09-03 14:50:42 +02:00
Gaute Lindkvist
bb7f7ff54e #6402 Reduce axis label overlap in Analysis plots 2020-09-03 09:52:38 +02:00
Kristian Bendiksen
2e88b9ba88
Merge pull request #6415 from OPM/stimplan-sprint8-fixes
Stimplan sprint8 fixes
2020-09-02 18:56:11 +02:00
Kristian Bendiksen
185bf31228 Make Vec3d fields non-scriptable to work around #6417. 2020-09-02 16:23:31 +02:00
Kristian Bendiksen
1e5bc2ee64 #6363 FractureModel: Compute default value for vertical stress. 2020-09-02 15:13:21 +02:00
Kristian Bendiksen
c7a694f9b2 Minor refactoring: Extract duplicated code. 2020-09-02 15:05:04 +02:00
Kristian Bendiksen
ae18dc8898 #6412 Hide experimental Stimplan features behind RESINSIGHT_DEVEL env var. 2020-09-02 10:40:39 +02:00
Gaute Lindkvist
27ee22f420 Fix error in Tornado plots 2020-09-01 11:57:38 +02:00
Gaute Lindkvist
ae28fe412f #6368 Minor time step improvements to Analysis and Correlation plots
* Change clears selected time step when filter is changed
* Changes string 'Time step filter' to 'Available Time steps'
* Now only shows clock time if we're showing all time steps or skip by days
  and the time isn't 00:00.
2020-09-01 11:24:15 +02:00
Kristian Bendiksen
dd1b5fa7f1
Merge pull request #6405 from OPM/mud-weight-window-fixes
Mud weight window fixes
2020-09-01 08:57:09 +02:00
Kristian Bendiksen
a6ddf7e6c4 #2763 Use std::min and std::max instead of CVF_MAX and CVF_MIN 2020-09-01 08:12:44 +02:00
Kristian Bendiksen
ca0a596817 #6369 Mud Weight Window: Update well log extraction curves WBS plot when MWW parameters change. 2020-08-31 15:31:52 +02:00
Kristian Bendiksen
97c1bf5f0d #6387 Move parameters from node in project tree to property editor of geomech case 2020-08-31 14:37:06 +02:00
Magne Sjaastad
7e097a7364 Remove invalid assert 2020-08-31 08:38:37 +02:00
Gaute Lindkvist
69f13b1015 #6360 Fix stacking issues 2020-08-31 08:33:55 +02:00
Gaute Lindkvist
3269537f25 Ensure default analysis filter works and changes are propagated properly 2020-08-28 14:38:29 +02:00
Gaute Lindkvist
c5255b4008 Create default analysis plot filter 2020-08-28 14:38:29 +02:00
Gaute Lindkvist
81f16cb7cb Fix crash when creating plot data filters 2020-08-28 14:38:29 +02:00
Gaute Lindkvist
2da678802b #4064 Support sorting by correlation in Ensemble Curve coloring 2020-08-28 14:38:29 +02:00
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