OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,768 Commits 27 Branches 61 Tags 309 MiB
ef1cb3468b
Commit Graph

3437 Commits

Author SHA1 Message Date
Unknown
6bb06ce53c Tensor results: Add function to create arrow indices 2018-03-02 08:16:36 +01:00
Unknown
82a394d588 #2543 Tensor vectors: Use tensor value, not length, for color mapping 2018-03-01 16:01:19 +01:00
Bjørn Erik Jensen
2ac9aba485 #2494 Add height/width fracture scaling 2018-03-01 14:18:12 +01:00
Jacob Støren
5087085635 #2482 Add wellhead pipe piece to simulation wells. 2018-02-28 17:19:05 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Jacob Støren
267e3ef59d #2535 Use the MainWindowTools class instead of MainWindow directly (part 4) 2018-02-27 16:46:53 +01:00
Jacob Støren
72013f4ff8 #2535 Use the MainWindowTools class instead of MainWindow directly (part 2) 2018-02-27 16:46:53 +01:00
Jacob Støren
d74807d669 #2535 Use the MainWindowTools class instead of MainWindow directly (part 1) 2018-02-27 16:46:53 +01:00
Magne Sjaastad
10bc5c92ab #2532 Fracture : Create copy of fracture template if non-matching units is detected 2018-02-27 12:05:41 +01:00
Rebecca Cox
cbbc9c0f26 #2496 Tensor vectors: Two new paletts 2018-02-27 09:39:47 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Rebecca Cox
bed95a105e #2527 Mohr Circle: Use cohersion and friction angle from case 2018-02-26 13:39:26 +01:00
Rebecca Cox
f3859a6bee #2528 Tensor Vectors: Make tensor vectors for result "E" 2018-02-26 11:03:57 +01:00
Magne Sjaastad
80af97c1a8 #2521 Fishbones : Clamp MD ranges to max MD of well path 2018-02-22 14:48:24 +01:00
Magne Sjaastad
594be93883 Whitespace cleanup 2018-02-21 19:53:22 +01:00
Magne Sjaastad
69339ad141 #2507 Non-Dracy Flow : Add display of unit and handle unit conversion 2018-02-21 19:25:05 +01:00
Magne Sjaastad
8ad30d9350 #2509 Fracture : Disconnect fracture template when unit changes 2018-02-21 19:07:03 +01:00
Magne Sjaastad
1b7dabdc51 #2291 Fishbones : Use 6 decimals, as this is required when using MD above 1000 2018-02-21 13:06:03 +01:00
Magne Sjaastad
c6b12b85e0 Merge fracture unit refactoring into dev #2509 
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
 2018-02-21 10:15:56 +01:00
Magne Sjaastad
81bb4481ed #2509 Fracture : Rename 2018-02-21 10:10:22 +01:00
Magne Sjaastad
0acab5cd65 #2509 Fracture : Add copy / paste of StimPlan 2018-02-21 09:50:50 +01:00
Magne Sjaastad
0d7e4f460c #2509 Fracture : Find matching template when adding new fracture 2018-02-21 09:10:40 +01:00
Magne Sjaastad
28ab07b199 #2509 Fracture : Remove obsolete unit conversion 2018-02-21 09:10:08 +01:00
Magne Sjaastad
f67918eba3 #2509 Fracture : Improve UI 2018-02-21 08:36:18 +01:00
Magne Sjaastad
b0be540977 #2509 Fracture : Remove obsolete unit conversion code 2018-02-21 08:18:55 +01:00
Magne Sjaastad
35febab8db #2509 Fracture : Add support for unit conversion of stimplan grid coords 2018-02-20 15:15:06 +01:00
Rebecca Cox
81287ee7cc #2484 2D Intersection View: 3D Info text: Show only well name, well path name or intersection name 2018-02-20 14:40:47 +01:00
Rebecca Cox
4ca78ca833 #2460 Tensor Vectors: Use result as colormapping on the vectors 2018-02-20 13:47:47 +01:00
Magne Sjaastad
fb95d896ef #2509 Fracture : Add copy / paste of ellipse fracture template 2018-02-20 07:20:25 +01:00
Rebecca Cox
0cb14397ac #2503 2D intersection View: Add Z-scale as info in the 3d info box 2018-02-19 15:08:54 +01:00
Magne Sjaastad
0ef0f3b5b1 #2509 Fracture : Guard UI selection of fracture template of different unit 2018-02-19 14:32:33 +01:00
Rebecca Cox
7f246a032a Merge patch into dev with fixes for #2501 2018-02-19 14:16:22 +01:00
Rebecca Cox
119752bf04 #2501 Result Plot: Add "Show Plot Data" to context menu 2018-02-19 14:15:42 +01:00
Magne Sjaastad
de3aa9f975 #2509 Fracture : Add text to indicate unit of fracture template 2018-02-19 13:54:29 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Bjørn Erik Jensen
772ba788ad #2449 2d intersection view. Show UTM intersection point in result info window 2018-02-16 14:38:28 +01:00
Magne Sjaastad
917cae9e2d #2455 Non-Darcy Flow : Hide "From Fracture" if no width is available 2018-02-16 14:17:28 +01:00
Magne Sjaastad
b06d33c5e9 #2455 Non-Darcy Flow : Use DoubleValueEditor 2018-02-16 10:14:41 +01:00
Magne Sjaastad
ec70639a8f Remove obsolete code 2018-02-16 09:54:51 +01:00
Magne Sjaastad
7f5ff7be0f #2455 Non-Darcy Flow : Use double in fields to avoid many decimals when converting from float to double 2018-02-16 09:37:55 +01:00
Magne Sjaastad
ac96824640 #2455 Non-Darcy Flow : Add fields to fracture template 2018-02-16 09:37:55 +01:00
Magne Sjaastad
8dfe181cc3 #2455 Non-Darcy Flow : Add support for user defined D-factor 2018-02-16 09:37:55 +01:00
Magne Sjaastad
dda9bd11ea #2455 Non-Darcy Flow : Add fracture width 2018-02-16 09:37:55 +01:00
Magne Sjaastad
e1619d3d62 #2455 Non-Darcy Flow : Show user defined permeability and rename 2018-02-16 09:37:55 +01:00
Rebecca Cox
82343d6680 #2489 Geo mech cases: Hide legend when result is not valid 2018-02-16 09:11:45 +01:00
Rebecca Cox
67040d757f #2477 2D intersection view: add legend update 2018-02-15 15:10:59 +01:00
Magne Sjaastad
cdfe6e3000 #2475 Fractures: Use filename as default name when importing a StimPlan fracture 2018-02-15 15:00:09 +01:00
Rebecca Cox
0fece2447a #2470 2D Intersection Views: Hide the item when no intersections are present 2018-02-15 14:37:38 +01:00
Rebecca Cox
f909a7ea27 #2438 2d Intersection View: Update intersection view on 3dOverlayInfo update 2018-02-15 14:31:13 +01:00
Rebecca Cox
1076384ce0 #2438 2D Intersection View: 3D Info Box items must follow settings in the main view 2018-02-15 13:00:44 +01:00
Bjørn Erik Jensen
de498a71c2 #2474 fractures. Added plural form of fracture. Moved below sim wells 2018-02-15 12:34:34 +01:00
Bjørn Erik Jensen
3fd5d3a3a7 #2393 Reservoir compaction derived result 2018-02-15 11:01:55 +01:00
Magne Sjaastad
8e1a7b2bbb #2455 Non-Darcy Flow : Compute D-factor and show in UI 2018-02-14 13:35:35 +01:00
Magne Sjaastad
646eb8fee4 StimPlan Fracture : Make sure geometry is recomputed when required 2018-02-14 13:07:16 +01:00
Rebecca Cox
eedf182620 #2413 2D intersection view: Use correct cell result in infoText 2018-02-14 10:54:28 +01:00
Jacob Støren
cb38d435cd #2457 Make 2d intersection view length start at well start 2018-02-13 16:56:48 +01:00
Rebecca Cox
3b627ce1c4 #2413 2D Intersection View: Add geoMech result title to infoText 2018-02-13 14:01:37 +01:00
Rebecca Cox
4eb80e83bb #2465 Property panel: Update UI fields from selected result on tree view object changed 2018-02-13 13:29:47 +01:00
Rebecca Cox
c8182fbb2f Merge to fix #588 2018-02-13 10:50:18 +01:00
Rebecca Cox
b49396b88c #588 GeoMech Color result: Make active result visible in property editor when selecting a object ofType/containing Result definition 2018-02-13 10:49:26 +01:00
Rebecca Cox
fa4535a18e #2413 2D Intersection View: Create more space in info text 2018-02-13 08:48:15 +01:00
Rebecca Cox
5195ea502a #2413 2D Intersection View: Add Text info 2018-02-12 15:58:47 +01:00
Rebecca Cox
fb5055581d Merge to fix #2458 2018-02-12 09:41:14 +01:00
Rebecca Cox
b8c9989d0b #2458 Cell Result: Select chosen result type on load 2018-02-12 09:40:10 +01:00
Jacob Støren
c6846f0d57 Fix linux compile issues 2018-02-09 16:47:24 +01:00
Jacob Støren
d86b6f690e #2337 Place legends aware of the possible edge axis border and enable the border by default in Intersection views 2018-02-09 14:10:26 +01:00
Jacob Støren
911571e267 #2337 Window Edge axis overlay item working. 2018-02-09 14:08:55 +01:00
Magne Sjaastad
b068296afd #2455 Non-Darcy Flow: Add fields to fracture template 2018-02-09 07:26:51 +01:00
Rebecca Cox
bd0d23520b #2344 Tensor Vectors: Vector visualization code 2018-02-08 16:43:18 +01:00
Magne Sjaastad
778119bf62 #2442 Fracture Template : Move more fields from public to protected 2018-02-08 14:02:02 +01:00
Magne Sjaastad
80eefb3141 #2442 Fracture Template : Move several fields from public to protected 2018-02-08 13:17:31 +01:00
Magne Sjaastad
beb122c6d0 System : Fix compiler warning 2018-02-08 13:17:31 +01:00
Bjørn Erik Jensen
7ddfaeb234 #2388 fractures. Support for asymmetric stim plan 2018-02-08 11:05:55 +01:00
Jacob Støren
bd14c65678 #2334 Add visualization of well paths and simulation wells to Intersection Views. 2018-02-07 11:44:38 +01:00
Magne Sjaastad
519771cb38 #2447 Fracture : Rename to fractureColors 2018-02-06 12:57:50 +01:00
Magne Sjaastad
a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Magne Sjaastad
d420b74326 Remove unused function 2018-02-06 12:27:55 +01:00
Magne Sjaastad
9734774e21 #2439 Fracture : Set default permeability to 1e5 2018-02-05 20:39:42 +01:00
Magne Sjaastad
b69fc78361 #2431 : Remove Rim3dView from function parameters 2018-02-05 20:12:22 +01:00
Magne Sjaastad
df231ab50a #2431 : Remove RivWellPathPartMgr from RimWellPath 2018-02-05 20:12:22 +01:00
Magne Sjaastad
cd575ef9c1 #2431 : Use well path part manager in Rim3dView 2018-02-05 20:12:22 +01:00
Magne Sjaastad
5919cb20fb #2431 : Refactor of well part manager 2018-02-05 20:12:22 +01:00
Jacob Støren
e8b29f7279 #2334 Add polyline visualization to 2D intersection view as a preparation for showing the main well. 2018-02-05 17:57:20 +01:00
Bjørn Erik Jensen
8c4cad894f #2391 intersections. New copy to all views command feature 2018-02-05 13:24:17 +01:00
Rebecca Cox
c6f8c957de #2316 Tensor Vectors: Create Object in Project tree 2018-02-05 09:28:16 +01:00
Bjørn Erik Jensen
c09dd0522b Merge branch '2018.01.01-patch' into dev. #2086 2018-02-05 08:29:24 +01:00
Magne Sjaastad
bf0b4f68e1 Merge message box fixes into dev, #2443 2018-02-02 14:47:05 +01:00
Bjørn Erik Jensen
b0ca4f3199 #2086 Handle extended file name chars on Linux for eclipse cases and summary cases 2018-02-02 14:18:09 +01:00
Rebecca Cox
eef5fe6e55 #2428 Fracture: backwards compatibility of "Show mesh"-toggle 2018-02-02 10:27:58 +01:00
Magne Sjaastad
dc0c6d1b47 #2443 : Remove obsolete includes of QMessageBox 2018-02-02 09:37:00 +01:00
Jacob Støren
29ac24f3dd #2426 Add working legends to 2D intersection Views. Refactor to make legend update code work from a separate view with separate legend configs. Make sure legend and results are updated as the main view is updated. Adjust legendconfig->setTitle to use QString 2018-02-02 07:48:27 +01:00
Magne Sjaastad
a4eb16883b #2441: Fracture Colors : Make sure conductivity result is set on template for old project files 2018-02-01 15:37:05 +01:00
Rebecca Cox
aa18ee9aa4 Fix build 2018-01-31 16:37:43 +01:00
Rebecca Cox
5b083bf974 Remove unused include 2018-01-31 16:06:56 +01:00
Bjørn Erik Jensen
4d98ac04e8 Merged patch to dev. #2429, #2430 2018-01-31 15:53:02 +01:00
Bjørn Erik Jensen
60afae10ad #2429, #2430. Display perforations correctly 2018-01-31 15:34:50 +01:00
Rebecca Cox
e50f7bf66f #2428 Fracture: Reorganize Fracture Colors tree item 2018-01-31 15:11:46 +01:00
Magne Sjaastad
d7fa97f052 Fix wrong include path 2018-01-31 13:54:58 +01:00
Magne Sjaastad
33ef2948f4 Merge "Completion Export LGR" into dev 
#2425 #1758 #2423
 2018-01-31 13:38:05 +01:00
Rebecca Cox
61d8a76587 #2390 Fracture: Set minimum 10 m perf length 2018-01-31 12:43:42 +01:00
Rebecca Cox
b2bdd996d2 #2389 Fracture: Set perforation length and depth from file values 2018-01-31 12:25:58 +01:00
Magne Sjaastad
6f0f73a017 #1758 Add direct access to RigMainGrid from RimEclipseCase 2018-01-31 10:20:47 +01:00
Bjørn Erik Jensen
7779ff5ed0 Merge branch '2018.01.01-patch' into dev. #2229 2018-01-31 08:33:51 +01:00
Bjørn Erik Jensen
bc72c86497 #2229 curve creator. Update when adding/deleting observed summary cases 2018-01-30 15:51:48 +01:00
Bjørn Erik Jensen
b06c3b443b Merge patch to dev. #2277 2018-01-30 14:25:53 +01:00
Bjørn Erik Jensen
e417e3af76 #2277 external files. Improve robustness when importing 2018-01-30 13:48:57 +01:00
Jacob Støren
c9d6d60931 #2331 GeoMech fixes for intersection view. Paste view and animation of synthetic cases. 2018-01-29 16:16:11 +01:00
Jacob Støren
6dead054c4 #2331 Save the 2D Intersection views. Turn off unneccesary fields 2018-01-29 16:16:11 +01:00
Rebecca Cox
a5dd38969f Merge to fix #2417 2018-01-29 16:05:02 +01:00
Rebecca Cox
9f08f1264a #2417 Extraction Curves: Avoid clamping time step to -1 2018-01-29 16:04:21 +01:00
Rebecca Cox
bbcda37813 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 14:47:04 +01:00
Rebecca Cox
f598e6905c #2419 Do not make OpmFlowDiagStat if result is fracture (DUAL) 2018-01-29 14:41:07 +01:00
Bjørn Erik Jensen
065aa92d16 #2408 summary plot. Update qwt axis when duplicating curves 2018-01-29 12:49:32 +01:00
Rebecca Cox
20e5c27209 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 12:49:32 +01:00
Rebecca Cox
27192e8096 Rename variable 2018-01-29 12:49:32 +01:00
Rebecca Cox
17e38130fc #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 12:49:32 +01:00
Rebecca Cox
e416d6557a Add option to avoid updating parent plot 2018-01-29 12:49:32 +01:00
Bjørn Erik Jensen
4a4dab3f1c #2408 summary plot. Update qwt axis when duplicating curves 2018-01-29 12:46:34 +01:00
Rebecca Cox
d67e1a7d13 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 11:24:12 +01:00
Rebecca Cox
438ee340e3 Rename variable 2018-01-29 10:47:54 +01:00
Rebecca Cox
b7a316589a #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 10:17:42 +01:00
Rebecca Cox
0171589c72 Add option to avoid updating parent plot 2018-01-29 10:17:42 +01:00
Bjørn Erik Jensen
fbe9d2d73d Merge branch '2018.01.01-patch' into dev 2018-01-26 15:56:37 +01:00
Bjørn Erik Jensen
ca3bb02c57 #2356 grid statistics dialog. Display of Mobile Volume Weighted Mean controlled by info box property 2018-01-26 15:53:13 +01:00
Rebecca Cox
235b1a88fb Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 15:49:39 +01:00
Rebecca Cox
84725ced9b Make branch detection toggle hidden if show formations is toggled off 2018-01-26 15:49:18 +01:00
Jacob Støren
5640f91b68 #2412 2D Navigation only for Intersectino Views 2018-01-26 14:33:32 +01:00
Jacob Støren
1de088ccba #2333 Intersection View: Made default view and near/far clip planes behave 2018-01-26 11:19:17 +01:00
Jacob Støren
02f6b95959 #2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience 2018-01-26 11:19:15 +01:00
Rebecca Cox
47d8508196 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 10:29:01 +01:00
Rebecca Cox
007602dbf9 #2326 Well allocation plot: Remove formation options regarding well path 2018-01-26 10:28:24 +01:00
Magne Sjaastad
889f615d19 #2276 : Source Stepping : Improve region ordering 
Internally, region numbers are stored in a set and then ordered correctly. When converting to strings for UI, the sorting criteria changes, and the order is wrong. If a vector is used to represent the UI strings, the problem is solved.
 2018-01-26 08:16:07 +01:00
Magne Sjaastad
0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Rebecca Cox
4078002770 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 18:24:40 +01:00
Rebecca Cox
83ed95a311 #2328 Water flooded PV: Remove warning. Remove injection flooding option if no fluxes are available 2018-01-25 18:24:12 +01:00
Rebecca Cox
eb03096c1c Change "QMessageBox" to <QMessageBox> 2018-01-25 15:44:28 +01:00
Rebecca Cox
0bd3f4e74c #2328 Give warning when user tries to calculate injection flooding without available fluxes 2018-01-25 15:44:28 +01:00
Magne Sjaastad
aa6b657027 #2141 : Fracture : Show conductivity result name from file 2018-01-25 14:24:54 +01:00
Magne Sjaastad
6ce0037733 #2141 : Fracture : Make sure a new StimPlan fracture get valid defaults 2018-01-25 14:17:10 +01:00
Magne Sjaastad
430b193437 #2402 Fracture : Compute conductivity scaling for all conductivity variants 2018-01-25 14:17:10 +01:00
Magne Sjaastad
827468b764 #2402 Code cleanup 2018-01-25 14:17:10 +01:00
Magne Sjaastad
001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Rebecca Cox
64731fb242 Change "QMessageBox" to <QMessageBox> 2018-01-25 12:00:48 +01:00
Rebecca Cox
ab72981681 #2328 Give warning when user tries to calculate injection flooding without available fluxes 2018-01-25 11:59:49 +01:00
Magne Sjaastad
1e4b4dbf62 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 11:14:09 +01:00
Rebecca Cox
d3f1767ff9 #2362 Grdecl: Read input file only once 2018-01-24 15:01:19 +01:00
Bjørn Erik Jensen
3d2e5b6088 #2383 Eclipse cases import. New command feature using file hierarchy dialog 2018-01-24 14:39:06 +01:00
Bjørn Erik Jensen
5e46a378aa #2384 multi case import. New command feature for importing cases into group recursively 2018-01-24 13:18:47 +01:00