Commit Graph

1383 Commits

Author SHA1 Message Date
Magne Sjaastad
20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e989b3afc9 #2423 Export Completions : Move Rig*-files to completion export folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f0f7c954cc #2423 Export Completions : Move files to separate folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e18a08a425 #1758 Use RigMainGrid in interface to CompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
54a7320b59 #1758 Export main grid data to one file and LGR data to one file 2018-01-31 10:20:47 +01:00
Magne Sjaastad
38f18dbecb #1758 Add support for export of WPIMULTL 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c7b5e091c6 #1758 Rename to gridName 2018-01-31 10:20:47 +01:00
Magne Sjaastad
5cc6877afa #1758 Use map to sort RigCompletionDataGridCell based on grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
4516941d2c #1758 Add RigCompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
028b5303a7 #1758 Add support for export of COMPDATL for LGR grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c0359f1776 #1758 Refactor IJKCellIndex 2018-01-31 10:20:47 +01:00
Magne Sjaastad
85d9d21bb6 #1758 Rename to globalCellIndex 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
fa66cf14cd #2229 curve creator. Update when adding/deleting calculated curves as well 2018-01-31 08:32:14 +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
287992df91 #2331 Update Intersection View List when copying and deleting views 2018-01-29 16:16:11 +01:00
Jacob Støren
f931b92341 #2412 Disable irrelevant toolbar commands 2018-01-29 16:16:11 +01:00
Rebecca Cox
885c03b9a4 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 11:24:56 +01:00
Rebecca Cox
d67e1a7d13 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 11:24:12 +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
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
Magne Sjaastad
0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Magne Sjaastad
6ce0037733 #2141 : Fracture : Make sure a new StimPlan fracture get valid defaults 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
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
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
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
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
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
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
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
Bjørn Erik Jensen
735165bb2b #2379 import summary cases. Fixed dialog issues 2018-01-16 13:40:38 +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
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 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
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Rebecca Cox
a97dd087d6 #2349 Elm Props: Use caf::FilePath instead of QString 2018-01-12 14:39:49 +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
Magne Sjaastad
7511e8a243 #2322 New View : Improve default values when creating view 2018-01-12 10:55:00 +01:00
Magne Sjaastad
9a2eebe8f5 Fracture : Move public fields to protected, and make RimFractureTemplate friend 2018-01-12 10:21:10 +01:00
Magne Sjaastad
f027027618 #1905 Perforation Intervals : Picking the well path pipe does not work at perforations
Forward all parts intersected to 3d viewer event handler
2018-01-12 07:56:35 +01:00
Rebecca Cox
81a7fb204d #2360 Elm Props: Correct UI text 2018-01-10 16:32:59 +01:00
Bjørn Erik Jensen
3f4489c45f #1752 Summary cases import. Minor refactoring 2018-01-10 14:11:57 +01:00
Bjørn Erik Jensen
e743a61d5b #1752. Import multiple summary cases from a directory structure. Take 1 2018-01-10 13:57:20 +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
Magne Sjaastad
49eebd0c28 #2359 Fracture : Adjust default parameters for ellipse fracture 2018-01-10 07:44:53 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Rebecca Cox
ab35d30ff5 #2348 Elm Props: "Import Element Property Table" command 2018-01-08 14:48:00 +01:00
Magne Sjaastad
a26f3b6907 #2340 Snapshot : Space in path is replaced with underscore 2018-01-08 11:46:51 +01:00
Bjørn Erik Jensen
4cdc109ec3 #2315. Replaced abs() by fabs() where relevant 2018-01-05 09:29:53 +01:00
Bjørn Erik Jensen
01faccee1c #2306 Export completions. Fix missing files for sim wells 2018-01-02 15:45:48 +01:00
Bjørn Erik Jensen
9d00648703 #1780 Export Completions. Add progress bar 2018-01-02 15:45:48 +01:00
Bjørn Erik Jensen
82d8b7c98a #2295. Guard for null frac template where it is being used 2018-01-02 12:54:10 +01:00
Magne Sjaastad
bdfd3d4e04 #2234 Completion Export : Do not include unticked perf intervals in project tree 2017-12-22 15:08:13 +01:00
Magne Sjaastad
173ef575fd #2234 Completion Export : Do not include unticked fishbones in project tree 2017-12-22 15:01:41 +01:00
Magne Sjaastad
500b298c26 #2293 Completion Export : Make sure one of the available combo box items are selected 2017-12-22 14:43:00 +01:00
Magne Sjaastad
d9e29b91cb #2234 Fractures : Export only sim well fractures ticked on in project tree 2017-12-22 14:43:00 +01:00
Magne Sjaastad
71c1267ab6 #2234 Fractures : Export only well path fractures ticked on in project tree 2017-12-22 14:43:00 +01:00
Bjørn Erik Jensen
4232ef2ffe #1726 Export completion dialog. Use previous case as default 2017-12-22 13:56:39 +01:00
Bjørn Erik Jensen
0869a8edf5 #2120 Perforations import. Lookup well path by fuzzy method instead of exact name match 2017-12-22 13:39:31 +01:00
Bjørn Erik Jensen
6d236c24de #2284 Completion export. Control inclusion of fracture debug info file from preferences 2017-12-22 13:10:35 +01:00
Bjørn Erik Jensen
fc6df4558f #2279 Fishbones. Guard against too small MD 2017-12-22 11:18:37 +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
5153f5b926 CppCheck : Use const reference 2017-12-22 08:19:49 +01:00
Bjørn Erik Jensen
a0cb42a93b RicWellPathImportPerforationIntervalsFeature. Rename method 2017-12-21 14:34:01 +01:00
Bjørn Erik Jensen
8dc47a84a2 Export Completions Dialog. Do not overwrite export folder setting 2017-12-21 12:39:17 +01:00
Bjørn Erik Jensen
a2a2427062 #1903 Export completions. Use project's export completion dialog settings everywhere it's being used 2017-12-20 11:14:13 +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
Magne Sjaastad
e8200c41ac #2271 Cross Plot : Disable export of plot data 2017-12-18 14:50:08 +01:00
Magne Sjaastad
57a691f8da Remove "ResInsight:" prefix 2017-12-18 14:30:19 +01:00
Magne Sjaastad
7e71f50581 #2248 Source Stepping : Update toolbar when required for cross plot curves 2017-12-15 12:16:47 +01:00
Magne Sjaastad
2771270d24 #2248 Source Stepping : Update toolbar on new / delete of summary curve 2017-12-15 10:37:55 +01:00
Magne Sjaastad
79fea6d9f0 #2248 Source Stepping : Update toolbar when required 2017-12-15 10:37:55 +01:00
Bjørn Erik Jensen
e35a448dae Summary Cross Plot. Hide Paste Excel data for cross plots 2017-12-15 10:10:21 +01:00
Bjørn Erik Jensen
0cce524af1 Summary plot. Fix paste excel data command name 2017-12-15 10:01:39 +01:00
Bjørn Erik Jensen
3034fdd289 #2268 Summary plot. Fix missing Switch Axis command 2017-12-15 09:19:22 +01:00
Magne Sjaastad
3b9e7d0106 Avoid call to updateConnectedEditors from updatePlotTitle 2017-12-14 15:04:18 +01:00
Rebecca Cox
0788cfe3db Remove *inc file format. 2017-12-14 14:26:10 +01:00
Jacob Støren
ebe60d8b16 Curve Creator Curve Name Configuration group name updated 2017-12-14 13:05:37 +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
Jacob Støren
8efcccf5c4 #1858 Guard against zero size laterals 2017-12-14 11:11:23 +01:00
Magne Sjaastad
9a805ac834 #2262 Curve Creator : Improved default collapsed state of UI groups 2017-12-14 10:14:22 +01:00
Magne Sjaastad
a37771e933 #2262 Curve Creator : Add support for creation of new auto titled plots 2017-12-14 10:13:53 +01:00
Magne Sjaastad
53d1c7ef66 #2262 Summary Curve Creator : Add support for auto plot title 2017-12-14 09:59:19 +01:00
sigurdp
99378cc23a #2194 RelPerm Plot: Added context menu to show ascii text version of current plot data. Refactor of existing RicTextWidget into RiuTextDialog. 2017-12-13 19:03:30 +01:00
Rebecca Cox
170c00c88a #2210 Add "Export Visible Cells as FLUXNUM/MULTNUM" to file->export 2017-12-13 15:24:40 +01:00
Bjørn Erik Jensen
607d9fff63 2260 Drag/drop LAS file channel. Fix invisible curve issue 2017-12-13 12:38:53 +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
Jacob Støren
7d39d29ca5 Merge fix of #1858 2017-12-12 17:41:45 +01:00
Jacob Støren
dfd25f7b63 #1858 Fix missing connections from fishbone laterals 2017-12-12 17:40:32 +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
Rebecca Cox
5a03783328 #2209 Use correct view in cmd "Export Visible Cells as FLUXNUM/MULTNUM" 2017-12-12 15:38:24 +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
6c3f569499 #1858 Align and remove near struct duplicates of WellPathCellIntersectionInfo 2017-12-12 14:49:10 +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
Rebecca Cox
03b03cd438 Update plots on well pick import 2017-12-11 15:12:12 +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
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
Jacob Støren
04e5ccfd7e #2238 Lift limitation of plotting Flooded PV as time history curve 2017-12-07 19:31:28 +01:00
Jacob Støren
cbeb248f6e Fix assert when canceling the Show Contributing Wells 2017-12-07 16:24:53 +01:00
Rebecca Cox
8608e00b35 #2224 Well Formations: Make Reloading the csv file work 2017-12-06 12:01:33 +01:00
Bjørn Erik Jensen
4bef3abda8 RicCellRangeUi. Fix build error. Calling constructor instead of using initializer 2017-12-06 11:47:28 +01:00
Rebecca Cox
5145d3f8a5 #2223 Well Formations: Rename to Well Picks where sensible 2017-12-05 14:14:53 +01:00
Bjørn Erik Jensen
77f4b4bb4b Grid statistics. Add argument to control the result text 2017-12-05 11:24:26 +01:00
Magne Sjaastad
93b69b807f #2198 Summary Plot : Set default curve selection 2017-12-04 14:36:17 +01:00
Magne Sjaastad
67fe2e268a #2211 Curve Calculator : Add default curve calculation before displaying dialog 2017-12-04 11:58:24 +01:00
Magne Sjaastad
f79e31be8f #2216 Disable creation of new calculation object as this causes crash
Introduced in  8281391fb9
2017-12-04 10:21:02 +01:00
Rebecca Cox
a5300032e9 #2213 Formations: Select formation on a case, only if a single file is imported 2017-12-01 15:39:54 +01:00
Bjørn Erik Jensen
8281391fb9 #2211 Curve calc. Create new calculation if empty 2017-12-01 15:36:46 +01:00
Bjørn Erik Jensen
83a272296c 2108 summary plot. Display short name in plot for calculated curves 2017-12-01 15:27:47 +01:00
Magne Sjaastad
6103f290bf #2170 Summary Case: Simplified access function to all cases, remove unused function 2017-12-01 13:55:39 +01:00
Rebecca Cox
a2a7155d1c #2213 Formations: On import, set formation on active case 2017-12-01 13:31:12 +01:00
Rebecca Cox
1c628fcf3e Change color in statistics dialog 2017-12-01 13:31:12 +01:00
Bjørn Erik Jensen
9eb85966ed CSV import. Reopen dialog on parse error 2017-12-01 12:41:44 +01:00
Bjørn Erik Jensen
a460124055 CSV import. Add tooltip to custom date time format field 2017-11-30 15:23:59 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Rebecca Cox
845373940f #2144 Context menu: Add Plot well allocation command to wellPath 2017-11-30 12:06:14 +01:00
Rebecca Cox
19e649a674 #2144 Context menu: Change name: New Property Filter -> Property Filter 2017-11-30 12:06:14 +01:00
Rebecca Cox
bb4390651d #2144 Context menu: Remove commands from well path and sim well 2017-11-30 12:06:14 +01:00
Rebecca Cox
503645e688 Add command to check if a well path or sim well is selected in 3d view 2017-11-30 12:06:14 +01:00
Bjørn Erik Jensen
1eb4c4d3e6 #1929. Remove all parts of summary curve filter which is not needed for backward compatibility 2017-11-30 11:05:30 +01:00
Bjørn Erik Jensen
c5cc7ed842 Fix crash on Linux when opening model 2017-11-30 09:33:03 +01:00
Rebecca Cox
b9ff4b743b #2162 Context menu: Move geomech new property filter to new feature 2017-11-29 16:25:54 +01:00
Rebecca Cox
aa318a5aaf #2162 Context menu: Use Qt typedef ulonglong, not size_t 2017-11-29 15:26:23 +01:00
Rebecca Cox
0a8b2111bc #2162 Context menu: Add hide intersection box feature 2017-11-29 14:57:04 +01:00
Rebecca Cox
838dc7ada6 #2162 Context manu: Add hide intersection feature 2017-11-29 14:57:04 +01:00