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,328 Commits 27 Branches 61 Tags 309 MiB
aa18ee9aa4
Commit Graph

6049 Commits

Author SHA1 Message Date
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
Magne Sjaastad
71deeb8954 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 10:09:54 +01:00
Magne Sjaastad
41506afe06 #2241 : Workaround for report numbers : Convert to upper case befor calling libecl 2018-01-29 10:09:30 +01:00
Magne Sjaastad
ff0599df04 Guard for access of dynamic data with no time steps 2018-01-29 10:04:33 +01:00
Magne Sjaastad
27ee70f90e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 08:48:27 +01:00
Magne Sjaastad
b59734160c Use range based for 2018-01-29 08:47:23 +01:00
Magne Sjaastad
9cc090256d #2241 : Do not skip report numbers with -1 2018-01-29 08:46:28 +01:00
Magne Sjaastad
c8546eb7e7 #2241 : Improve robustness when reading report numbers from libecl 2018-01-29 08:44:30 +01:00
Magne Sjaastad
33901a115e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-28 21:31:36 +01:00
Magne Sjaastad
aa12ac743a #2418 : Import of text grid model fails when comments is on same line as keyword 2018-01-28 21:29:40 +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
Magne Sjaastad
4d5503afb4 #2385 Main Window: More flexible docking restrictions 2018-01-26 15:44:25 +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
d8d2076dea #2333 New Intersection View: Update vertical warningtext. Avoid selecting view in tree. 2018-01-26 11:19:16 +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
78068e547d Fix compiler warnings related to converting time_t to double 2018-01-26 08:25:50 +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
b1bf970ff8 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 17:04:59 +01:00
Rebecca Cox
5273ace5e6 #2301 Rel.perm Plot: Add tooltip for cell value 2018-01-25 17:04:20 +01:00
Bjørn Erik Jensen
868e1ef075 #2406 delete plot crash. Guard pointer to view 2018-01-25 15:44:28 +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
Bjørn Erik Jensen
3a1c6406ff #2406 delete plot crash. Guard pointer to view 2018-01-25 14:53:51 +01:00
Magne Sjaastad
aa6b657027 #2141 : Fracture : Show conductivity result name from file 2018-01-25 14:24:54 +01:00
Magne Sjaastad
6ff354c7ec Fix signed/insigned compare 2018-01-25 14:17:10 +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
Bjørn Erik Jensen
95db322f57 #2384 multi case import. Fix path filtering. Display relative file names 2018-01-25 13:57:09 +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
a6333128e3 #2328 Fix crash when calculating "Water Flooded PV" 2018-01-24 16:32:48 +01:00
Rebecca Cox
d3f1767ff9 #2362 Grdecl: Read input file only once 2018-01-24 15:01:19 +01:00
Rebecca Cox
0ea10a45eb #2362 Grdecl SegFault: Guard for empty vectors 2018-01-24 14:58:21 +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
3f96ad7ad9 File hierarchy dialog. Trim extensions 2018-01-24 14:37:52 +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
Bjørn Erik Jensen
a039bcd0a9 File hierarchy dialog. Stop if no root dir 2018-01-24 13:18:47 +01:00
Rebecca Cox
5d840368b1 #2390 Intersections: Move paste command to the top in the context menus 2018-01-24 13:10:17 +01:00
Bjørn Erik Jensen
d646af8514 #2384 multi case import. Context menu for on/off/toggle files 2018-01-24 12:36:06 +01:00
Rebecca Cox
8b4a1f05bc #2390 Intersections: Add Copy/Paste 2018-01-24 11:44:20 +01:00
Rebecca Cox
140b75df88 #2390 Intersections: Add noUpdate-version of appendIntersection and appendIntersectionBox 2018-01-24 11:30:39 +01:00
Rebecca Cox
97aab5bda5 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-24 10:56:10 +01:00
Rebecca Cox
650fc2147d #2404 Intersection: Update 3d view when creating new Intersection Box 2018-01-24 10:48:23 +01:00
Bjørn Erik Jensen
7c47783e3a #2384 multi case import. Add check box for each file 2018-01-24 10:43:56 +01:00
Rebecca Cox
e68f0e2be8 Merge branch '2018.01.01-patch' into dev 2018-01-24 08:33:47 +01:00
Rebecca Cox
9617481406 #2327 Formation RFT Plot: Read tvdss from well pick files 2018-01-24 08:21:22 +01:00
Bjørn Erik Jensen
e98d969e62 #2358 fracture. Fix linker errors by adding fracture support ifdefs 2018-01-23 20:58:39 +01:00
Jacob Støren
d34b3a7c74 #2331 Add 2d Intersection View collection with automatic views. The create command is adjusted into a "Show" command. 2018-01-23 14:37:52 +01:00
Bjørn Erik Jensen
9cfd2ff3cf #2358 fracture. When clicking on an ellipse fracture, display info in result into panel 2018-01-23 14:30:58 +01:00
Bjørn Erik Jensen
1c668ce3b4 #2358 fracture. Display values in resultInfo panel when clicking on stim plan fracture cell 2018-01-23 14:14:40 +01:00
Magne Sjaastad
7dbd6c1027 #2398 Fracture : Hide "New Fracture" in context menu when no Fracture Template is defined 2018-01-23 07:28:32 +01:00
Magne Sjaastad
bc5139257f #2141 Fracture : Remove Stimplan from UI text 2018-01-22 15:10:49 +01:00
Magne Sjaastad
f0554d85af #2402 Fracture Conductivity : Add result name define 2018-01-22 15:07:59 +01:00
Magne Sjaastad
759d46813d #1544 Fracture Perforation Length : Set color to deep green 2018-01-22 13:00:11 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Magne Sjaastad
9a420183e1 Remove unused code 2018-01-22 11:09:37 +01:00
Magne Sjaastad
245d10c5c1 Fix compiler warnings related to converting time_t to double 2018-01-19 16:55:16 +01:00
Jacob Støren
5855e412e7 #2375 Fix missing catch of exeptions from pvt/relperm curve generation 2018-01-19 15:21:17 +01:00
Magne Sjaastad
5c1f5326a0 #1544 Fracture : Show perforation length for along well path fractures 2018-01-19 15:08:31 +01:00
Magne Sjaastad
53418179ba #1544 Fracture : Add function used to compute perforation length coords 2018-01-19 15:08:31 +01:00
Magne Sjaastad
c7d61ed7f4 #1544 : Move well path radius to RimWellPath 2018-01-19 15:08:31 +01:00
Magne Sjaastad
8e5bcef7c7 #1544 Removed unused functions and other minor improvements 2018-01-19 15:08:31 +01:00
Magne Sjaastad
ba437c605d #2385 Main Window: More flexible docking restrictions 2018-01-19 15:08:31 +01:00
Magne Sjaastad
ef3d9f1095 #2141 Fracture Legend : If conductivity, use legend to set ellipse fracture color 2018-01-19 15:08:31 +01:00
Magne Sjaastad
0674eaefbf #2141 Fracture Legend : Update model when ellipse conductivity changes 2018-01-19 15:08:31 +01:00
Magne Sjaastad
04a91b92f4 Remove unused function 2018-01-19 15:08:31 +01:00
Magne Sjaastad
2da5f8cf54 #2141 Use accumulators to compute min/max used to configure legend 2018-01-19 15:08:31 +01:00
Magne Sjaastad
b4b1dfa0f9 #2141 Fixed wrong default values for MinMaxAccumulator 2018-01-19 15:08:31 +01:00
Rebecca Cox
fbb6f56bd3 #2382 Elm props: Update Result Info to show relevant Element Result info 2018-01-19 13:36:51 +01:00
Rebecca Cox
7726ed1610 #2366 AppFwk: Use caf::FilePath for odb-file 2018-01-19 12:53:37 +01:00
Rebecca Cox
56188c8f3f #2380 AppFwk: Move fieldsByType to RimProject 2018-01-19 12:52:50 +01:00
Jacob Støren
6adcbd9c56 #2375 Fix missing catch of exceptions from opm-flowdiagnostics libraries 2018-01-19 12:46:53 +01:00
Rebecca Cox
ed930da11d #2380 AppFwk: Take vector<T*>* as argument, not vector<PdmField<T*>>* 2018-01-19 08:02:09 +01:00
Rebecca Cox
b84812616f Merged from patch-branch to dev-branch 2018-01-18 15:43:27 +01:00
Rebecca Cox
79539c1c99 #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 15:04:04 +01:00
Bjørn Erik Jensen
28ea6f054c #2377 summary plot. Add missing curve update 2018-01-18 13:50:39 +01:00
Bjørn Erik Jensen
cdfe7f51d3 #2377 summary plot. Add missing curve update 2018-01-18 13:24:21 +01:00
Rebecca Cox
39cf8e8b0d #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 11:42:29 +01:00
Rebecca Cox
bbda7f30a2 NULL -> nullptr 2018-01-18 08:11:26 +01:00
Bjørn Erik Jensen
50c3e5f0d2 #2379 import summary cases. Minor refactoring 2018-01-17 13:15:04 +01:00
Bjørn Erik Jensen
8f384c9752 #2379 import summary cases. Dialog improvements, find button, grouping widgets 2018-01-17 13:05:05 +01:00
Bjørn Erik Jensen
b74dca8de8 #2379 import summary cases. Fix path filtering 2018-01-17 13:05:05 +01:00
Magne Sjaastad
3bcfc09baf #2332 2D Intersection View: Show warning if intersection is not vertical 2018-01-17 11:29:06 +01:00
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00