Commit Graph

3241 Commits

Author SHA1 Message Date
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
Rebecca Cox
ab67ddfecb #2348 Elm Props: Import command on case 2018-01-09 08:45:47 +01:00
Rebecca Cox
397168df17 #2347 Elm Props: Create new Result Position entry called Element 2018-01-09 07:37:07 +01:00
Bjørn Erik Jensen
69a18e1a11 #2329. Relocate summary cases 2018-01-08 14:03:27 +01:00
Magne Sjaastad
561e20a37e #2329 Add relocate of RimWellLogFile 2018-01-08 10:37:57 +01:00
Magne Sjaastad
a40a3578f2 #2329 Add relocate of well path formation file 2018-01-08 10:35:53 +01:00
Magne Sjaastad
b598bdf86c #2315 Add missing include of cmath 2018-01-05 11:38:58 +01:00
Rebecca Cox
9a41e1c134 #2321 Avoid crash when opening a project file with a PLT/RFT plot and where main plot window was closed before saving 2018-01-05 11:11:27 +01:00
Bjørn Erik Jensen
e0bc2c4046 Fracture colors. Fix default option 2018-01-05 11:09:33 +01:00
Magne Sjaastad
0939cff93a
Merge pull request #2320 from OPM/fabs
#2315. Replaced abs() by fabs() where relevant
2018-01-05 10:50:11 +01:00
Bjørn Erik Jensen
4cdc109ec3 #2315. Replaced abs() by fabs() where relevant 2018-01-05 09:29:53 +01:00
Rebecca Cox
074a8fc546 #2303 Formations: Remove well pick filter when depth type is PL 2018-01-05 08:36:59 +01:00
Rebecca Cox
cf12e5ae36 #2303 Formations: Update well path only when formation source changes 2018-01-05 08:36:59 +01:00
Rebecca Cox
fc2e638ba2 #2303 Formation: Make formations for RFT and PLT work 2018-01-05 08:36:59 +01:00
Magne Sjaastad
addf200a9e #2310 Fix boolean test in isProjectFileVersionEqualOrOlderThan 2018-01-04 15:24:35 +01:00
Magne Sjaastad
0647add116 #2302 Formations : Always show formations, and display above fracture templates 2018-01-04 15:04:58 +01:00
Magne Sjaastad
96a900fe0f #2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot 2018-01-04 13:12:07 +01:00
Rebecca Cox
50776f5819 Fix typo 2018-01-03 15:30:27 +01:00
Bjørn Erik Jensen
7a0b884e5d #2305. Fix initial icon state color for faults 2018-01-03 14:46:15 +01:00
sigurdp
5af63f7abd #2295 Guard against null pointer when setting fracture template 2018-01-03 11:50:34 +01:00
sigurdp
f940d0a3d5 #1753 Fracture: Reworked visualization of StimPlan fractures to limit surface tesselation to area with actual values instead of relying on transparency. Done to allow picking on items behind the fracture. Refactored and removed obsolete code related to StimPlan fracture visualization. 2018-01-03 11:13:15 +01:00
Bjørn Erik Jensen
79bcc2d727 #2296 Summary Plot Title. Fix region number bug 2018-01-03 07:10:23 +01:00
Bjørn Erik Jensen
fb0880aadb #2298 Fracture. Fix build error 2018-01-02 11:38:59 +01:00
Bjørn Erik Jensen
70a3df3b3c #2298 Fracture. Update fracture colors when changing stim plan legend settings 2018-01-02 11:21:59 +01:00
Bjørn Erik Jensen
44639ef529 #2291 Fishbones. Always two decimals on single depth value fields 2018-01-02 09:58:38 +01:00
Bjørn Erik Jensen
02fdddad7f Imported observed data. Hide child tree nodes 2017-12-22 10:32:19 +01:00
Bjørn Erik Jensen
862dc2e982 #2290 Summary plot. Full vector name in plot auto title 2017-12-22 10:16:15 +01:00
Bjørn Erik Jensen
1d3a31d61f #2279 Fishbones. Default spacing is now 12.5. Place fishbone near well path end if no coordinates are specified 2017-12-22 09:53:08 +01:00
Magne Sjaastad
171c065326 #2140 Set fracture color variable when result name is empty or "None" 2017-12-22 09:23:16 +01:00
Magne Sjaastad
5153f5b926 CppCheck : Use const reference 2017-12-22 08:19:49 +01:00
Magne Sjaastad
b768bf8b34 Summary Plot : Set default auto name to true 2017-12-21 21:11:18 +01:00
Magne Sjaastad
388d4196f1 #2283 Cross Plot : Improve curve title and plot title based on x-axis data 2017-12-21 21:03:23 +01:00
Magne Sjaastad
1583923ed1 #2287 Calculate Completion Type : Execute loadAndUpdate only when required 2017-12-21 18:57:30 +01:00
Magne Sjaastad
5fab8357ee #2289 Source Stepping : Rename to make it clear what summary case is used 2017-12-21 15:25:09 +01:00
Magne Sjaastad
f3975c8986 #2289 Source Stepping : Always return first case from visible curve cases 2017-12-21 15:25:09 +01:00
Magne Sjaastad
75c94cce7e #2283 Cross Plot : Use empty curve name instead of single pipe "|" 2017-12-21 15:25:09 +01:00
Magne Sjaastad
99893397ea Summary Address : Fixed invalid init of member variables 2017-12-21 15:25:09 +01:00
Bjørn Erik Jensen
dbbdcb904b #1632 Context menus. Reorganize, add sub menus 2017-12-21 14:35:38 +01:00
Bjørn Erik Jensen
6beb217882 #2282 RFT plot. Fix strange behavior 2017-12-21 09:39:26 +01:00
Bjørn Erik Jensen
ea362ad154 #2140 Fracture colors. Add ifdef around fracture defs 2017-12-20 14:24:20 +01:00
Bjørn Erik Jensen
5d69398caa Try fix Linux build error 2017-12-20 13:53:29 +01:00
Bjørn Erik Jensen
12e95c37a6 #2140 Fracture colors. Set default result to Conductivity when selecting template 2017-12-20 13:14:43 +01:00
Bjørn Erik Jensen
a05f357597 #1903 Export completions. Save dialog contents 2017-12-20 11:14:13 +01:00
sigurdp
dbd1265f31 #1873: Changed naming scheme when exporting laterals. Make sure fishbone name is exported and be more explicit in the enumeration of the subs and laterals.
Refactored RimFishbonesMultipleSubs so that it is clear that the fishbone instances only have auto generated names based on their current index.
2017-12-19 11:06:28 +01:00
Bjørn Erik Jensen
5c4a250c44 #1870, #1871 Fishbones. Switch PdmField type from size_t to int due to non existing size_t pdm editor 2017-12-19 10:54:39 +01:00
sigurdp
f74dc80838 #1870 For fishbones, clamp values so that start MD and end MD always consitutes a valid range where start MD <= end MD 2017-12-19 09:34:23 +01:00
Magne Sjaastad
e8200c41ac #2271 Cross Plot : Disable export of plot data 2017-12-18 14:50:08 +01:00
Magne Sjaastad
679e4c859f #2228 : Curve Creator : Use one group for curve types other han excplicitly handeled 2017-12-18 14:28:20 +01:00
Magne Sjaastad
bc12695af1 #2275 : Source Stepping : Trigger update of required UI when case changes 2017-12-18 09:53:32 +01:00
Magne Sjaastad
cd340f7713 #2273 Well Accocation Plot : Add flag to control branch detection 2017-12-18 09:34:28 +01:00
Magne Sjaastad
26f06daa0f Whitespace 2017-12-18 07:13:58 +01:00
Magne Sjaastad
55080245b2 #2265 Xml Keywords : Use postfix 'X' for duplicated cross plot field names 2017-12-18 07:13:58 +01:00
Magne Sjaastad
2e5ccb2598 #2265 Xml Keywords : Rename to uppercase 2017-12-18 07:13:58 +01:00
Magne Sjaastad
f8f30db5b3 #2265 Xml Keywords : Rename to uppercase and match field name 2017-12-18 07:13:58 +01:00
Magne Sjaastad
ed013c6eb9 #2265 Xml Keywords : Several rename to fracture template and fracture collection 2017-12-18 07:13:58 +01:00
Magne Sjaastad
56016ff23a #2265 Disable IO for ui only field 2017-12-18 07:13:58 +01:00
Magne Sjaastad
25979122d5 #2265 Disable IO for ui only field, start keywords with upper case 2017-12-18 07:13:58 +01:00
Magne Sjaastad
4a8d19c238 Guard null pointer access 2017-12-18 07:13:58 +01:00
Magne Sjaastad
78be5b351e Remove asserts from defineEditorAttribute 2017-12-18 07:13:58 +01:00
Magne Sjaastad
e10c7fd633 #2265 Xml Keywords : Remove fishbones prefix 2017-12-18 07:13:58 +01:00
sigurdp
96b5a02872 #1861 Set default build-angle to 1.83 deg/ft for models with FIELD units 2017-12-15 13:30:13 +01:00
Magne Sjaastad
bb1fe0354f #2248 Source Stepping : Always use visible curves as basis for stepping 2017-12-15 10:51:33 +01:00
Magne Sjaastad
79fea6d9f0 #2248 Source Stepping : Update toolbar when required 2017-12-15 10:37:55 +01:00
Magne Sjaastad
530b4d4073 #2248 Source Stepping : Compute visible fields once based on visible curves 2017-12-15 10:37:55 +01:00
Bjørn Erik Jensen
cd3523d91d #2269 Ascii summary curve. Fix property editor layout 2017-12-15 09:55:43 +01:00
Magne Sjaastad
3b9e7d0106 Avoid call to updateConnectedEditors from updatePlotTitle 2017-12-14 15:04:18 +01:00
Magne Sjaastad
603f63a773 #2267 Summary Plot : Remove wrong call to updatePlotTitle 2017-12-14 15:04:18 +01:00
Jacob Støren
a946797394 Adjusted Ui ordering in Summary plot 2017-12-14 14:44:12 +01:00
Bjørn Erik Jensen
448eefd0e8 RFT plot. Fix missing plot title 2017-12-14 14:22:21 +01:00
Bjørn Erik Jensen
fc2b6694ae #2263 PLT plot. Display warning dialog when selecting grid/rft case when no well path 2017-12-14 12:54:07 +01:00
Magne Sjaastad
dabdcd0aa4 Whitespace 2017-12-14 11:35:28 +01:00
Magne Sjaastad
71b7523e3c #2250 Summary Curve : Support aquifer auto name 2017-12-14 11:35:28 +01:00
Bjørn Erik Jensen
f84a535511 #2264 PLT plot. Filter wells list based on well geometry and production data 2017-12-14 11:23:04 +01:00
Magne Sjaastad
53d1c7ef66 #2262 Summary Curve Creator : Add support for auto plot title 2017-12-14 09:59:19 +01:00
Magne Sjaastad
fbee6e23a9 #2262 Curve Creator : Update curve collection when a curve is turned on/off 2017-12-14 09:59:19 +01:00
Magne Sjaastad
898c7a0483 #987 Curve Creator : Use auto-generated plot name as default plot name 2017-12-13 08:06:34 +01:00
Magne Sjaastad
5566acdcda #987 Summary Auto Title : Add support for auto plot title and improve curve names 2017-12-13 07:40:37 +01:00
Jacob Støren
7d39d29ca5 Merge fix of #1858 2017-12-12 17:41:45 +01:00
Jacob Støren
7e820cd251 #1858 General refactoring as preparations. Renaming Whitespace change. Remove obsolete code. 2017-12-12 16:32:57 +01:00
Rebecca Cox
2b0305fcc4 #2247 Add export FLIXNUM/MULTNUM to context menu on Cell Result item in tree view 2017-12-12 16:07:02 +01:00
Bjørn Erik Jensen
6ffcb703fd #2249 Summary Plot Editor. Support for plotting individual aquifers 2017-12-12 15:10:11 +01:00
Jacob Støren
b15664cfc5 #1858 Rename WellPathIntersectionInfo classes 2017-12-12 13:53:02 +01:00
Bjørn Erik Jensen
9769d391e1 #2199, #2245 Summary plots. Add paste commands for cross plot. Add duplicate summary plots and curves 2017-12-12 13:22:36 +01:00
Jacob Støren
3a1939d460 #1858 Renaming and whitespace as preparations 2017-12-12 12:47:05 +01:00
Magne Sjaastad
b7bdce1d9e Summary Plot Curve Editor : Use () instead of [] around acronyms as [] are used for unit text 2017-12-12 08:56:18 +01:00
Magne Sjaastad
ab53135f91 #2243 Summary Plot : Reorganize axis properties fields 2017-12-12 08:56:18 +01:00
Magne Sjaastad
96b1fc9160 Whitepace 2017-12-12 08:56:18 +01:00
Magne Sjaastad
e7c08223b6 #2243 Summary Plot : Add control flags for auto title for name, acronym and unit 2017-12-12 08:56:18 +01:00
Rebecca Cox
6e4449960f #2227 Well formatins: Clear well path if it does not have well picks 2017-12-12 08:38:04 +01:00
Rebecca Cox
fb876f8fdc #2227 Well formations: Remove fluid annotation duplicates 2017-12-11 15:12:12 +01:00
Rebecca Cox
c3cd0a650e #2227 Well formations: update ui. remove level from RigWellPathFormation 2017-12-11 15:12:12 +01:00
Rebecca Cox
406c371682 #2227 Well formation: Make level filter dynamic 2017-12-11 15:12:12 +01:00
Rebecca Cox
fa3d9c4fc2 #2227 Well Formation: Add filter. Filter options not dynamic 2017-12-11 15:12:12 +01:00
Magne Sjaastad
bc6a367635 #987 Summary Plot : Do not show default unit text if empty calculation unit text 2017-12-11 14:54:58 +01:00
Magne Sjaastad
ffbd4cda82 #2108 Summary Plot : Use calculation short name in axis title 2017-12-11 14:54:58 +01:00
Bjørn Erik Jensen
c1537664e3 Revert "2108 summary plot. Display short name in plot for calculated curves"
This reverts commit 83a272296c.
2017-12-11 14:54:58 +01:00
Bjørn Erik Jensen
574c5ec466 #1034. Separate font size setting for axis title and axis value labels 2017-12-11 13:42:54 +01:00
Bjørn Erik Jensen
b181d59ba9 1034 Summary plot legend. Support for setting legend font size 2017-12-11 13:10:09 +01:00
Magne Sjaastad
5641ecc1c2 Summary Curve : Move plot axis above vector selection, plus rename and reorder of Vector Selection 2017-12-11 12:15:57 +01:00
Bjørn Erik Jensen
ca91409002 #969, #2240 Summary curve axis. New fields, scaleFactor and numberOfDigits 2017-12-11 11:37:51 +01:00
Magne Sjaastad
8e344f3858 Summary Plot : Allow curves to be pasted onto RimSummaryCurveCollection 2017-12-11 10:44:17 +01:00
Magne Sjaastad
22e3575bc6 Summary Well Branches : Clamp branch index 2017-12-08 12:57:16 +01:00
Magne Sjaastad
e045a42131 #2127 Sim Well Branches : Remove unused includes, white space changes 2017-12-08 12:29:41 +01:00
Magne Sjaastad
186e050a41 #2127 Sim Well Branches : Use geometry cache from Intersection 2017-12-08 12:22:35 +01:00
Bjørn Erik Jensen
d3d2ccea20 PLT plot. Display unit int legend for observed curves 2017-12-08 11:07:36 +01:00
Magne Sjaastad
cda9d82971 Use int instead of size_t to represent time step 2017-12-08 10:49:32 +01:00
Magne Sjaastad
46bad03c4a #2127 Clamp sim well branch index to valid range 2017-12-08 10:24:14 +01:00
Magne Sjaastad
0e5e88008a #2127 Sim Well Branches : Move logic related to uiOrdering to RiaSimWellBranchTools 2017-12-08 10:24:14 +01:00
Magne Sjaastad
9c4077a040 #2127 Sim Well Branches : Move logic related to uiOrdering to RiaSimWellBranchTools 2017-12-08 10:24:14 +01:00
Magne Sjaastad
97743e6d70 #2127 Sim Well Branches : Use helper function instead of local function 2017-12-08 10:24:14 +01:00
Magne Sjaastad
9ef040d891 #2127 Sim Well Branches : Add branch detection and branc index to RtfCurve 2017-12-08 10:24:14 +01:00
Magne Sjaastad
1841379e64 #2127 Sim Well Branches : Major refactor of sim well branch computation
Remove local branch geometry caches
Add checkbox to control if branch detection should be used
Add RiaSimWllBranchTools and move helper functions from RimProject
2017-12-08 10:24:14 +01:00
Bjørn Erik Jensen
94a4bfeea5 PLT plot. Show plot title 2017-12-08 09:55:41 +01:00
Rebecca Cox
a2d2879bab #2227 Well formations: New Rig data stucture with top+base MD and level 2017-12-08 09:27:37 +01:00
Jacob Støren
f0ad02bc37 #2233, #2236 Fix some timestep related issues in RFT/PLT plot
Missing first grid timestep in RFT, and missing previous closest timestep if all available are before observed timesteps.
2017-12-07 16:24:53 +01:00
Rebecca Cox
4856c5ee30 #2202 Geomech: Avoid visibility calculation for unvalid property filters 2017-12-07 10:18:46 +01:00
Rebecca Cox
23844e3b78 Fix compile warning 2017-12-07 09:31:13 +01:00
Rebecca Cox
48f9769eb7 #2221 Well Path Formation names: Improve user feedback on import 2017-12-07 08:34:12 +01:00
Bjørn Erik Jensen
609963bb73 RFT plot. Mark wells that have an observed well path in wells list 2017-12-06 15:45:35 +01:00
Jacob Støren
03aaa47a60 #2177 Active property filters now considered when evaluation well visibility 2017-12-06 12:07:29 +01:00
Rebecca Cox
8608e00b35 #2224 Well Formations: Make Reloading the csv file work 2017-12-06 12:01:33 +01:00
Magne Sjaastad
3024b19b6f #2188 Missing fault faces : Set watertight flag only when needed 2017-12-06 08:38:37 +01:00
Magne Sjaastad
8e3f02879c Statistics : Do not assert on owner case being RimEclipseResultCase 2017-12-06 08:10:46 +01:00
Magne Sjaastad
3e844746eb #2188 Missing fault faces
Make sure all visible geometry is marked as watertight to avoid open grid sections in some cases, especially when loading file and regeneration of geometry
2017-12-05 18:20:35 +01:00
Rebecca Cox
5145d3f8a5 #2223 Well Formations: Rename to Well Picks where sensible 2017-12-05 14:14:53 +01:00
Jacob Støren
e344fcd47a #2156 Fixed crash when loading project with intersection referencing missing well path file 2017-12-05 14:03:40 +01:00
Rebecca Cox
899a226a38 #2226 Well Formations: Avoid adding "Top" to the formation names 2017-12-05 12:56:21 +01:00