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

3267 Commits

Author SHA1 Message Date
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
Rebecca Cox
5d840368b1 #2390 Intersections: Move paste command to the top in the context menus 2018-01-24 13:10:17 +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
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
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
Magne Sjaastad
bc5139257f #2141 Fracture : Remove Stimplan from UI text 2018-01-22 15:10:49 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +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
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
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
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
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
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Jacob Støren
d616548cd0 #2331 Shell of 2dIntersectionView shell added. Fixed access to views on a case including the intersection views also. 2018-01-17 08:10:05 +01:00
Jacob Støren
d283f2c733 Fix linux compile issue 2018-01-16 11:22:48 +01:00
Rebecca Cox
305e2aee38 #2372 Elm Props: Add unit [GPA] to Modulus 2018-01-16 10:56:41 +01:00
Jacob Støren
c3c2f3b75a Fix missing include 2018-01-16 10:36:41 +01:00
Jacob Støren
0debeafd68 #2331 Move RimGridView to separate files 2018-01-16 09:37:08 +01:00
Jacob Støren
b1cf7f6674 #2331 Cleaned up whitespace. Made crossectionCollection protected 2018-01-16 08:44:37 +01:00
Rebecca Cox
96bff27519 #2372 Elm props: Map modulus and ratio ui names 2018-01-15 17:40:39 +01:00
Rebecca Cox
58123f4a49 #2369 Elm props: Only delete results from the closed files 2018-01-15 16:09:52 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
1bbd3ade7b #2331 WIP: Creating new RimGridView base class 2018-01-15 14:53:48 +01:00
Rebecca Cox
4bf8de2787 #2369 Elm props: Clear cell results on deletion 2018-01-15 14:48:05 +01:00
Rebecca Cox
277bd496f1 Add override keyword 2018-01-15 14:48:05 +01:00
Bjørn Erik Jensen
ac59050824 #2358 Ellipse fracture template. Extracted conductivity method 2018-01-15 13:32:47 +01:00
Magne Sjaastad
523c623d39 #2152 Fracture : Rename UI text 2018-01-15 09:41:00 +01:00
Magne Sjaastad
b2e0f3df31 #2371 Fracture : Update views after change of stimplan xml file name 2018-01-15 09:16:44 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad
9820cb45e4 #2371 Fracture Template : Avoid crash when StimPlan xml fails to load 2018-01-15 08:58:56 +01:00
Rebecca Cox
47e154bf53 #2370 Elm props: Update prop filters + intersections on reload 2018-01-15 08:52:00 +01:00
Rebecca Cox
673ad12dee #2370 Elm Props: Reload selected files. Prop filters etc not updated 2018-01-14 09:10:23 +01:00
Rebecca Cox
27901f426c #2369 Elm Props: Close selected files 2018-01-12 16:18:54 +01:00
Magne Sjaastad
5e3bc0e5ee #2152 Fracture : Add color interpolation mode 2018-01-12 14:56:05 +01:00
Rebecca Cox
a97dd087d6 #2349 Elm Props: Use caf::FilePath instead of QString 2018-01-12 14:39:49 +01:00
Rebecca Cox
6aa2d99587 #2349 Elm Props: Only add files which are not already added 2018-01-12 12:43:39 +01:00
Magne Sjaastad
fe17d0edd4 Remove unused function 2018-01-12 12:12:03 +01:00
Jacob Støren
0bba60f22f Remove RimView.cpp due to some git strangeness 2018-01-12 12:01:04 +01:00
Jacob Støren
4b26354b30 #2331 Moved redraw scheduling and completion type recalc out of RiaApplication 2018-01-12 12:01:04 +01:00
Jacob Støren
591b72901f #2331 Reordered Rim3dView header to pave way for Rim2dIntersectionView 2018-01-12 12:01:04 +01:00
Jacob Støren
5644684606 #2331 Refactor the viewer-view communication to pave way for 2dIntersection Views 2018-01-12 12:01:04 +01:00
Magne Sjaastad
ded9cc6708 #2322 Check define before using stimPlanColors 2018-01-12 11:56:33 +01:00
Jacob Støren
67bc555d49 #2367 Fix crash in completion type calculation for wellpaths without geometry 2018-01-12 11:36:41 +01:00
Magne Sjaastad
7511e8a243 #2322 New View : Improve default values when creating view 2018-01-12 10:55:00 +01:00
Magne Sjaastad
d25f9d4b67 Use const reference 2018-01-12 10:25:16 +01:00
Magne Sjaastad
9a2eebe8f5 Fracture : Move public fields to protected, and make RimFractureTemplate friend 2018-01-12 10:21:10 +01:00
Rebecca Cox
cede66c8c0 #2360 Elm Props: Correct UI text in 3d overlay info 2018-01-11 10:19:22 +01:00
Rebecca Cox
81a7fb204d #2360 Elm Props: Correct UI text 2018-01-10 16:32:59 +01:00
Bjørn Erik Jensen
65d85b82f7 #2272 fracture. Disable IO for anchor position 2018-01-10 14:43:01 +01:00
Rebecca Cox
118980d568 #2360 Elm Props: read metadata on project load 2018-01-10 12:55:36 +01:00
Rebecca Cox
2cd006882f #2360 Elm Props: Wire up reading of elm prop data into data structures 2018-01-10 10:43:33 +01:00
Rebecca Cox
e22ceb5cc2 add override keyword 2018-01-10 10:33:33 +01:00
Magne Sjaastad
30cbd8018f #2359 Move fields to private, whitespace cleanup 2018-01-10 07:44:53 +01:00
Magne Sjaastad
49eebd0c28 #2359 Fracture : Adjust default parameters for ellipse fracture 2018-01-10 07:44:53 +01:00
Jacob Støren
2dbc907934 Merge renaming of RimView into dev 2018-01-09 10:48:09 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Magne Sjaastad
68b5a0e019 Merge branch '2018.01.01-patch' into dev 2018-01-09 09:58:39 +01:00
Magne Sjaastad
472aa87265 System : Postfix with _OBSOLETE 2018-01-09 09:57:54 +01:00
Rebecca Cox
57ae195372 #2349 Elm Props: Create list of imported files in Geomech Case prop pan 2018-01-09 09:50:13 +01:00
Magne Sjaastad
09d776dd73 #2353 Empty function caseName() shadows base class field with same signature 2018-01-09 09:16:06 +01:00