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
5,838 Commits 27 Branches 61 Tags 309 MiB
17e01cd11c
Commit Graph

910 Commits

Author SHA1 Message Date
astridkbjorke
689e62a22e #1542 Small fixes based on comments in review. 2017-06-06 11:53:48 +02:00
Bjørnar Grip Fjær
4d2cf774ed #1555 Use fishbones collection start measured depth to calculate MSWs 2017-06-06 09:50:07 +02:00
Jacob Støren
2d85f1f1c5 Merge branch 'dev' into pre-proto 2017-06-05 11:40:13 +02:00
Jacob Støren
c5264f56cb #1503 Added icons to fishbones and perforations 2017-06-05 11:12:13 +02:00
astridkbjorke
1f87681d7e #1542 Always using radial transmissibility calculation if the fracture is transverse to well or azimuth. If alog well: Perforation length for fracture limits the intersection fracture/well. 2017-06-02 15:04:32 +02:00
Bjørnar Grip Fjær
1a36e0334b #1466 Fishbones MSW : Export of WSEGVALV 2017-06-02 12:50:16 +02:00
Bjørnar Grip Fjær
58bcaf5224 #1549 Fix length and depth calculations for fishbones MSW 2017-06-02 11:43:03 +02:00
Bjørnar Grip Fjær
fe578e6f4a #1549 Compute end length and default directionality 2017-06-02 11:42:41 +02:00
Bjørnar Grip Fjær
f021ef9066 Remove unused function computeLateralsPerCell 2017-06-02 10:44:53 +02:00
Bjørnar Grip Fjær
53210f41f4 Remove unused variable in findIntersectingCells 2017-06-02 10:40:37 +02:00
Bjørnar Grip Fjær
962677d008 Initialize all variables in WellSegmentLateral constructor 2017-06-02 10:40:20 +02:00
Bjørnar Grip Fjær
b82aed4bfc #1543 Naming and fixes from review 2017-06-02 10:35:52 +02:00
Bjørnar Grip Fjær
a52d70c424 #1548 Remove fishbones laterals based on success rate 2017-06-02 10:16:41 +02:00
Jacob Støren
e7244d0b0b Merge dev into pre-proto. 2017-06-02 08:05:07 +02:00
Jacob Støren
ac5e43337c #1493 Accumulate completions for all wellpaths before combinig to make it possible to erro check unhandled overlaps 2017-06-01 17:21:46 +02:00
Jacob Støren
4c873b6925 #1493 Remove old export fracture on selected wellpaths feature 2017-06-01 17:09:04 +02:00
Jacob Støren
252defd96a #1493 Include fracture export in the Export Completions Command 2017-06-01 16:34:30 +02:00
Bjørnar Grip Fjær
b20a563517 #1520 Establish new result type 'Completion Type' 2017-06-01 12:36:54 +02:00
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +02:00
Bjørnar Grip Fjær
1aedf92efc Merge branch 'dev' into fishbones 2017-06-01 09:02:38 +02:00
Jacob Støren
23870cac1e #1535 Run flow diag for current timestep when invoking Flow Char Plot command 2017-05-31 09:33:02 +02:00
Bjørnar Grip Fjær
8fd50721cc #1534 Perforation Intervals : Do not include in export based on time step 2017-05-30 15:42:05 +02:00
Bjørnar Grip Fjær
1112f6a2e0 #1532 Rename RifEclipseOutputTableFormatter to RifEclipseDataTableFormatter 2017-05-30 15:00:14 +02:00
Bjørnar Grip Fjær
c55d381cbf #1532 Move export settings classes to commands folder 2017-05-30 14:37:51 +02:00
Bjørnar Grip Fjær
bd74a942fd #1532 Move completion related commands to own completion commands folder 2017-05-30 14:25:41 +02:00
Bjørnar Grip Fjær
e76d2a8980 #1532 Refactor RigCompletionData::combine to be a static method 2017-05-30 14:12:51 +02:00
Bjørnar Grip Fjær
5cafccdc80 #1523 Completions : Import perforation intervals from file 2017-05-30 11:56:18 +02:00
Bjørnar Grip Fjær
f25701ba98 #1530 Fishbones : Default values 2017-05-30 09:57:22 +02:00
Bjørnar Grip Fjær
8092eac2a6 #1529 Use diameter instead of radius in GUI 2017-05-30 09:49:58 +02:00
Bjørnar Grip Fjær
dc9c1a0b42 Build error fix 2017-05-30 09:31:37 +02:00
Bjørnar Grip Fjær
69e9b9701b #1512 Compute COMPDAT for imported well path branches 2017-05-30 09:26:45 +02:00
Magne Sjaastad
0c4dc6a087 #1525 Check if data is available before creating curve 2017-05-30 09:13:46 +02:00
Bjørnar Grip Fjær
6cb652630f #1519 Allow multiple well paths to export completion data simultaniously 2017-05-29 15:52:35 +02:00
Bjørnar Grip Fjær
87cfb22efe #1464 Move well segment export to own feature 2017-05-29 15:39:37 +02:00
Magne Sjaastad
07696e49cc (#1525) Use single curves to represent production rates 
Use colors from RimSummaryCurveAppearanceCalculator
 2017-05-29 14:52:19 +02:00
Bjørnar Grip Fjær
3dbc09b28d #1519 Compdat export for fishbones and perforations 2017-05-29 13:13:25 +02:00
Jacob Støren
e4abc737cd #1514, #1506 Fix several wellpath stimplan intersection bugs. 
First numbers to file achieved, but they are wrong and too few
 2017-05-26 17:37:48 +02:00
Bjørnar Grip Fjær
96760884d1 #1519 Export COMPDAT for all perforation intervals 2017-05-26 12:37:01 +02:00
Bjørnar Grip Fjær
bb8483a98b #1518 Add option to chose between absolute or incremental calculations of length and depth when exporting completion data 2017-05-23 15:51:07 +02:00
Bjørnar Grip Fjær
dbc775e6c2 #1518 Add UI for selecting pressure drop when exporting completion data 2017-05-23 15:38:10 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Bjørnar Grip Fjær
62209935a8 #1498 Fishbones : Assign individual colors to fishbones 2017-05-23 09:35:31 +02:00
Magne Sjaastad
2898884c0b #1513 Update point of interest 2017-05-23 09:24:03 +02:00
Bjørnar Grip Fjær
b8557c8132 #1505 Fishbones : Calculate direction of a completion 2017-05-22 13:24:07 +02:00
Bjørnar Grip Fjær
ee81f49ab1 #1465 Export location of completions, with necessary restructuring 2017-05-22 13:24:06 +02:00
Magne Sjaastad
276f81a20e #1513 Avoid double dynamic_cast 2017-05-22 08:08:45 +02:00
Magne Sjaastad
f05728e76d #1513 Improve placement of camera based on bb dir and extent 2017-05-22 07:59:49 +02:00
Magne Sjaastad
29bf25c56b #1513 Fishbones : Add 'Fly to Object' for fishbones and perforations 2017-05-21 09:15:54 +02:00
Magne Sjaastad
4c19123b2d #1495 Move feature to leaf object 2017-05-20 20:34:07 +02:00
Magne Sjaastad
1acc54d059 #1474 Ask user to automatically set scale to 1 for fishbones 2017-05-20 20:21:19 +02:00
Magne Sjaastad
123b404809 #1495 Move features from well path to sub objects 2017-05-20 14:47:13 +02:00
Magne Sjaastad
ecddaffeb4 #1495 Move features from well path to sub objects 2017-05-20 14:31:25 +02:00
Magne Sjaastad
5ec2764c16 #1495 Add 'Completions' folder to RimWellPath 
Move perforation intervals into folder
Move fishbone definitions and fishbone well paths into folder
 2017-05-19 15:44:32 +02:00
Magne Sjaastad
fd254565e6 #1495 Rename to FishboneWellPath and FishboneWellPathCollection 2017-05-19 13:47:44 +02:00
Magne Sjaastad
d8dc62c5a7 #1510 Remove invalid usage of namespace caf for features 
Also add override keyword
 2017-05-19 13:40:38 +02:00
Bjørnar Grip Fjær
d67d5ec330 Fix error assigning return value to reference 2017-05-19 11:43:47 +02:00
Bjørnar Grip Fjær
b23996a75f #1464 Fishbones MSW : Export well segments 2017-05-19 11:28:36 +02:00
Bjørnar Grip Fjær
a71eace124 #1462 Set first eclipse case in project to default selected eclipse case 2017-05-19 11:28:36 +02:00
Bjørnar Grip Fjær
f280835f9e #1462 Add checkbox to decide whether laterals in cells with the main well path are exported 2017-05-19 11:28:36 +02:00
Bjørnar Grip Fjær
f4223435f6 Clean up export completion data feature 2017-05-19 11:28:36 +02:00
Magne Sjaastad
829df457ff #1502 Fishbones : Add "New Perforation" to context menu when clicking on well path 2017-05-19 11:03:22 +02:00
Magne Sjaastad
2b8b703258 #1500 Fishbones : Use global index to subs when exporting lateral geometry 2017-05-19 09:51:19 +02:00
Magne Sjaastad
8dd0df7901 #1501 Fishbones : Increase number of coordinate digits when exporting laterals 2017-05-19 09:13:22 +02:00
Magne Sjaastad
ac6d9b9d55 #1494 Fishbones : When creating new fishbone, create only one sub 2017-05-19 08:38:55 +02:00
Jacob Støren
c914071d33 #1487 Rename export method 2017-05-18 14:50:28 +02:00
Jacob Støren
8365d3b0b3 #1487 Rename to RifFractureExportTools 2017-05-18 14:40:47 +02:00
Magne Sjaastad
c6202bb14e Use brace-init of vector 2017-05-16 13:51:10 +02:00
Magne Sjaastad
69116784ff Refactoring to be able to compile on Linux 2017-05-16 13:36:14 +02:00
Magne Sjaastad
7b4b13906f Remove obsolete include 2017-05-16 13:35:05 +02:00
Magne Sjaastad
43e50bd8d2 Updated copyright headers 2017-05-16 12:49:36 +02:00
Magne Sjaastad
d0ab854534 #1486 Add 'New Fishbone' to context menu when clicking on well path 2017-05-16 10:22:16 +02:00
Bjørnar Grip Fjær
0b872dbf3a #1462 Add support for exporting WPIMULT 2017-05-16 09:43:41 +02:00
Bjørnar Grip Fjær
46d8f83424 #1462 Export completion data for laterals 2017-05-15 16:04:53 +02:00
Magne Sjaastad
25e6aec94a Merge branch 'dev' into fishbones 2017-05-15 13:37:09 +02:00
Magne Sjaastad
7c1f9b90ba #1425 Do not show Time History Curve command for flow diag results 2017-05-15 07:56:11 +02:00
Bjørnar Grip Fjær
dc4e7e0773 #1451 Add table editor for perforation intervals 2017-05-12 10:02:00 +02:00
Bjørnar Grip Fjær
5a8a632082 #1451 Add command for adding new perforation interval 2017-05-12 10:01:59 +02:00
Bjørnar Grip Fjær
d1e25738d3 Make well path completions deleteable 2017-05-11 11:12:49 +02:00
Magne Sjaastad
84b922ba82 #1476 Include isFile() when checking if a file exists 2017-05-11 09:23:13 +02:00
Bjørnar Grip Fjær
15bac1b050 #1468 New feature 'Import Completions' 2017-05-10 17:09:54 +02:00
Magne Sjaastad
f26c5ce75d #1452 Use 'Export Laterals' as command name 2017-05-08 15:11:31 +02:00
Magne Sjaastad
7c7f8ef627 #1452 Use captal WELLHEAD and no space in names 2017-05-08 15:07:18 +02:00
Magne Sjaastad
47517d734b System : Add shortcut for Save, Save As, Exit and Open 2017-05-08 11:14:24 +02:00
Magne Sjaastad
53ba4967cc System : Add shortcut for Save, Save As, Exit and Open 2017-05-08 11:06:51 +02:00
Magne Sjaastad
342a58a0ae #1452 Fishbones : Export laterals to text file 2017-05-08 10:48:11 +02:00
Magne Sjaastad
414733899e Fishbones : Add model and visualization 2017-05-05 12:23:29 +02:00
Bjørnar Grip Fjær
06bd9659be Update icon for snapshot all plots to file 2017-05-02 09:35:36 +02:00
Magne Sjaastad
5e14e56609 #1062 Use minimalistic title flags for dialogs 2017-04-27 14:22:47 +02:00
Jacob Støren
67e652713f Moved debug output regarding Well Log Extraction Curves to the Log Message window. 
Also removed some debug output.
 2017-04-27 14:14:51 +02:00
Bjørnar Grip Fjær
0848e9f8eb #1433 Fix export property to file for flow diagnostics properties 2017-04-27 10:54:07 +02:00
Jacob Støren
129b07bf77 #1436 Rename to Advanced Snapshots Export 2017-04-27 10:22:14 +02:00
Jacob Støren
ff1b8c6db8 Fix assert in Show Contibuting Wells due to wrongful use of firstAnchestorOf 2017-04-27 10:22:14 +02:00
Jacob Støren
6f07a3698b #1427 Enable the new Well Log Curve command for Simulation Wells 2017-04-25 16:12:55 +02:00
Bjørnar Grip Fjær
63cd817b85 #964 Improve code robustness in defineEditorAttribute 2017-04-25 10:31:56 +02:00
Bjørnar Grip Fjær
05fb8b8da3 Better naming of eclipse reload data function 2017-04-24 12:10:18 +02:00
Jacob Støren
07b95da98f Show Plot Data: Add "Data" to "Show Total Allocation" 2017-04-24 11:24:36 +02:00
Bjørnar Grip Fjær
201ff5699d #1004 Add reload function to eclipse cases to reload all data from file 2017-04-21 12:03:04 +02:00
Bjørnar Grip Fjær
327fb31cb0 #1030 Don't automatically create summary plots of preference is turned off 2017-04-20 15:59:39 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
c587fd2400 #1401 Disable model change notification 2017-04-20 12:21:41 +02:00
Magne Sjaastad
4ec6dc3796 #1401 Move serialization of tree view state to a single location 2017-04-20 11:02:05 +02:00
Magne Sjaastad
31852ba94f #1401 Disable model change notification for several features 2017-04-20 10:38:58 +02:00
Magne Sjaastad
d7d80bc53e #1401 Ask user to save modified project before project close 2017-04-20 10:02:25 +02:00
Magne Sjaastad
9caaeac237 #1373 Add feature ShowTotalAllocationData 2017-04-19 13:48:15 +02:00
Bjørnar Grip Fjær
b7279cafd0 #1406 Automatically show process monitor when executing script for case 2017-04-07 09:57:34 +02:00
Bjørnar Grip Fjær
224211f765 #1406 Automatically show process monitor when executing script 2017-04-07 09:21:48 +02:00
Magne Sjaastad
6b78d98a74 #1379 Get active view window before displaying file selection dialog 2017-04-06 10:38:20 +02:00
Bjørnar Grip Fjær
380de17ae0 Handle error case properly, removes compiler warning. 2017-04-05 14:35:10 +02:00
Bjørnar Grip Fjær
050c4b8c28 #1026 Combine continuous fault cells to one line in export 
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Date:      Wed Apr 5 12:04:36 2017 +0200
#
# On branch dev
# Your branch is ahead of 'origin/dev' by 2 commits.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#	modified:   ApplicationCode/Commands/RicExportFaultsFeature.cpp
#	modified:   ApplicationCode/Commands/RicExportFaultsFeature.h
#
 2017-04-05 13:19:24 +02:00
Bjørnar Grip Fjær
dc1a207313 Fix crash when cancelling export faults 2017-04-05 13:19:24 +02:00
Bjørnar Grip Fjær
fb88c7e216 #1010 Make "Create Grid Case Group" always available 2017-04-04 15:45:52 +02:00
Bjørnar Grip Fjær
a49c830a0f #1394 Delete statistics cases when last source case is deleted 2017-04-04 14:46:18 +02:00
Magne Sjaastad
254d944b84 #1371 opm-parser : Removed command features 2017-04-04 13:53:44 +02:00
Jacob Støren
8af7702904 #1370 Fixed Ctrl+C copy to bypass Qt and use our own copy 2017-04-03 17:36:36 +02:00
Jacob Støren
5e6018acb7 #1385 Fixed copy view problem, when flow diagnostics result was used. 
Also fixed potential other problems due to same cause: resolve must be done before initAfterRead
 2017-04-03 12:36:28 +02:00
Bjørnar Grip Fjær
3cefc2f7a8 #1390 Ensure computed statistics view is added to statistics case 2017-04-03 12:35:19 +02:00
Bjørnar Grip Fjær
e4354a0891 Do not copy views when copy/pasting eclipse case 2017-04-03 10:50:52 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Bjørnar Grip Fjær
4900f50160 Fix crash when opening context menu with multiple selected views. 2017-03-31 17:14:49 +02:00
Jacob Støren
e679b551c9 Fixed crash in multi snapshots to file 2017-03-31 15:13:50 +02:00
Jacob Støren
442d9d2e41 #1380 Major refactor of the management of views to fix the active view problem. Expect some trouble following this. 2017-03-31 15:13:50 +02:00
Jacob Støren
ba60bf3c13 #1321 Added a comand to show Flow Characteristics plot. Added timestp colors, zoom, mouse tracking, and titles 2017-03-28 23:36:56 +02:00
Jacob Støren
960e6833c4 #1321 Made zoom all and snapshot work 2017-03-28 23:36:56 +02:00
Magne Sjaastad
40d5150b37 #1358 Added support for "Zoom All" of well alloc plots 2017-03-24 12:10:05 +01:00
Magne Sjaastad
8137955add #1322 Added copy/paste of time history curves 2017-03-24 08:36:58 +01:00
Magne Sjaastad
17dbb179d9 #1322 Improved UI texts and include result name in suggested plot name 2017-03-24 08:12:10 +01:00
Magne Sjaastad
9e813fa2c0 #1323 Use left axis as default axis, cache last used summary plot 2017-03-20 12:29:30 +01:00
Magne Sjaastad
9330a78fb3 #1323 Fixed update issue newly created plot 2017-03-20 11:59:26 +01:00
Magne Sjaastad
fdbefb787a #1323 User selects destination plot for time history curves 2017-03-19 21:41:13 +01:00
Magne Sjaastad
7565b8a15d #1323 "Switch plot Axis" supported for time history curves 2017-03-19 09:13:27 +01:00
Magne Sjaastad
bdf2ea4961 #1323 Added context menu in 3D "Plot Time History for Selected Cells" 2017-03-19 08:59:46 +01:00
Magne Sjaastad
be3ed0d934 #1319 Make sure clipboard text from plot data widget can be pasted into columns in Excel 2017-03-16 10:18:55 +01:00
Magne Sjaastad
d1ddc8f519 #1293 Use courier monospace font 2017-03-16 08:36:04 +01:00
Magne Sjaastad
141257c83e #1293 Added "Show Plot Data" to context menu of plots 2017-03-16 08:23:27 +01:00
Magne Sjaastad
19e988925a #1293 Rename 2017-03-16 08:22:09 +01:00
Magne Sjaastad
10edf44ee3 #1293 Show plot data in text widget 2017-03-15 20:15:04 +01:00
Magne Sjaastad
2bc9ba3e8e #1294 Added save icon 2017-03-15 13:30:16 +01:00
Magne Sjaastad
2758cd327e #1294 Rename and cleanup, use ascii as file extension 2017-03-15 13:28:25 +01:00
Magne Sjaastad
7a0f0d11fb #872 Rename and cleanup, use ascii as file extension 2017-03-15 12:27:40 +01:00
Magne Sjaastad
720310a843 Use "Export" instead of "Save" in features 2017-03-15 11:49:36 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Magne Sjaastad
6bcc385da5 #1297 Use firstAncestorOrThisOfTypeAsserted, comments and whitespace 2017-03-15 08:43:06 +01:00
Magne Sjaastad
4498e353df #1263 ShowWellAllocationPlot must be available when well is selected 2017-03-14 13:15:00 +01:00
Magne Sjaastad
4a66feae26 #1288 Use view icon instead of case icon when selecting view 2017-03-12 13:17:02 +01:00
astridkbjorke
98810527f8 Fixes after mix-up in merging 2017-03-10 15:12:01 +01:00
astridkbjorke
0a945155c5 #872 When exporting several summary plots the data from different plots are stored to different files, and adding extension .csv to files files exported for wellLogPlots and summaryPlots. 2017-03-10 15:12:01 +01:00
astridkbjorke
4ccdd51ea8 #1294 - When selecting multiple wellLogPlots, they will now be exported to separate files. 2017-03-10 15:12:01 +01:00
astridkbjorke
eb3283041f #1294 - Improving formatting of well log plot ascii export 2017-03-10 15:12:00 +01:00
astridkbjorke
b89efbf73e #1294 - Renaming and moving ascii export feature, now RicAsciiExportWellLogPlotFeature. Adding functionality for getting data to export (but formatting is still missing) 2017-03-10 15:12:00 +01:00
astridkbjorke
7f511f7004 #1294 - Added command feature for exporting well allocation plot data, and writing empty file 2017-03-10 15:12:00 +01:00
Magne Sjaastad
1e1c5b0398 #1288 Do not show command if no flow solution is available 2017-03-10 14:45:07 +01:00
Magne Sjaastad
a87ad2e56e Avoid use of CAF_ASSERT in application code 2017-03-10 14:44:00 +01:00
Magne Sjaastad
db56dd4bc9 #1288 Show view selection dialog also from 3D view 2017-03-10 13:13:31 +01:00
Magne Sjaastad
b60139c558 #1288 Remember last view modified by this command 2017-03-10 10:27:36 +01:00
Magne Sjaastad
2ed5ff7fb7 #1288 Added RicSelectViewUI and harmonized features 2017-03-09 23:01:58 +01:00
Magne Sjaastad
40a5f8dc02 #1288 Added defaultFlowDiagSolution to RimEclipseResultCase 2017-03-09 23:01:58 +01:00
Magne Sjaastad
7e4906fced #1288 Show contributing wells from 3D view without using well alloc plot 2017-03-09 23:01:58 +01:00
astridkbjorke
03af1d5e5f #872 - Fixes in export of multiple summary plots 2017-03-09 10:27:48 +01:00
astridkbjorke
080ca76dff #872 - Simplifying setting of file name for ascii export of summary plots 2017-03-09 10:27:48 +01:00
astridkbjorke
dd3b6101a2 #872 - Exporting data from summary plot 2017-03-09 10:27:47 +01:00
astridkbjorke
b888e933b5 #872 - Adding command feature for export of summary plots to ascii (and writing empty export file) 2017-03-09 10:27:47 +01:00
Magne Sjaastad
fc5a44bf3a #1305 Removed excess function 2017-03-09 08:11:01 +01:00
Magne Sjaastad
84f76e5242 #1306 Use general delete sub items for well path collection 2017-03-08 12:20:35 +01:00
Magne Sjaastad
d547079847 #1306 Added general "Delete Sub Items" feature 2017-03-08 12:06:05 +01:00
Magne Sjaastad
a81980c235 #1185 Added "Plot Production Rates" for sim well in 3D and project tree 2017-03-08 11:42:08 +01:00
astridkbjorke
81c243297a #1302 - pre-proto - Setting fracture unit system based on case when sim-well fracture is created. Unit-system for field is now read-only for simwell fractures. 2017-03-07 10:09:19 +01:00
Magne Sjaastad
d3faf4ef96 Fixed #1289 Well Alloc Plot: Rename command to "Plot Well Allocation" 2017-03-06 20:08:25 +01:00
Magne Sjaastad
b19fe2bc4b #1292 Fixed several style issues reported by CppCheck 2017-03-06 09:27:42 +01:00
Jacob Støren
f15d698342 #1174 Made 3D main window pop up, and set wether to show Max Fractrion Injectors or Producers. Set timestep in 3D view to match plot. 2017-03-02 16:10:18 +01:00
Magne Sjaastad
f7521ad12f Merged branch pre-proto into pre-proto 2017-03-02 11:48:35 +01:00
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ResInsightVersion.cmake
 2017-03-02 11:46:25 +01:00
astridkbjorke
6019ff4586 #1275 - pre-proto - Setting default values for stimplan fracture template polygon based on content in file 2017-03-02 11:43:42 +01:00
Magne Sjaastad
4559b9f31a #1263 Flow : Command : Show Contributing Wells command present when applicable 2017-03-01 13:23:16 +01:00
astridkbjorke
de8dc2db3c pre-proto - Reading XML when creating new StimPlan fracture template 2017-02-27 10:49:46 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
a29f6abc32 #1257 Added null pointer guarding based on reports from CppCheck 2017-02-24 16:00:56 +01:00
Magne Sjaastad
1af3df6c6c #1255 Removed includes from RimWellLogCurve 2017-02-24 14:14:29 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
855960287d #1240 Use last stimplan time step as default, improved UI updates 2017-02-23 09:22:19 +01:00
Magne Sjaastad
36b4238f13 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
 2017-02-23 08:44:53 +01:00
Magne Sjaastad
dc886b7e9c Well path delete command supports multi selection 2017-02-23 08:42:27 +01:00
Magne Sjaastad
47f207998a #1240 Adjustments to icons and command texts 2017-02-23 08:21:45 +01:00
Magne Sjaastad
5ba0a37f34 Added missing include 2017-02-22 15:08:26 +01:00
Magne Sjaastad
65d71f7106 #1250 Show fractures directly as child objects of wells / well path 2017-02-22 14:40:13 +01:00
Magne Sjaastad
ac48b31e24 #1239 Add checkbox to control visibility of fractures 2017-02-22 13:24:07 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-02-22 09:42:51 +01:00
Magne Sjaastad
03932f59c3 #1183 Property Filter: Context command : Apply As Cell Result - GeoMech 2017-02-21 15:37:56 +01:00
Magne Sjaastad
738e44ed46 #1183 Property Filter: Context command : Apply As Cell Result - Eclipse 2017-02-21 15:25:36 +01:00
Magne Sjaastad
c76078bd6b Select and expand stored well alloc plot 2017-02-21 12:52:33 +01:00
Magne Sjaastad
eb1d8fac1d #1227 Added delete to context menu for stored well alloc plots 2017-02-21 12:51:55 +01:00
Magne Sjaastad
0b0055b635 #1174 Added icon 2017-02-21 10:31:39 +01:00
Magne Sjaastad
b2ec4e055f #1174 Added Show contributing wells from 3D view 2017-02-21 09:49:27 +01:00
Magne Sjaastad
91a962ab21 #1174 Rename 2017-02-21 09:13:33 +01:00
astridkbjorke
9f156f9e5f pre-proto - Setting azimuth angle correctly when new fractures are created. 2017-02-20 14:44:03 +01:00
astridkbjorke
d2142c5724 #1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field) 2017-02-20 09:13:44 +01:00
astridkbjorke
fa638243ab #1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates). 2017-02-17 10:11:32 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
 2017-02-16 10:18:39 +01:00
Magne Sjaastad
b6b544f13f #1174 Rename to loadDataAndUpdate 2017-02-15 10:40:32 +01:00
Magne Sjaastad
e8c5a43e1a #1174 Update legend after result definition has changed 2017-02-15 10:26:52 +01:00
Magne Sjaastad
758ac9ef8c #1214 Generalized export of snapshot images for all plot window types 2017-02-14 15:03:54 +01:00
astridkbjorke
3023ddcd78 #1087 - pre-proto - Adding units to fracture template and adding command feature for converting length values in ellipseFractureDefinition. 2017-02-14 09:49:14 +01:00
Jacob Støren
61e82c37b5 #1210 Using defult flow diag results if available when creating Well Alloc Plots 2017-02-14 08:30:52 +01:00
Jacob Støren
a25bfd4513 #1213 Well allocation plot is now only created when requested. 
Also made the fields in FlowPlotCollection private.
 2017-02-14 08:10:39 +01:00
Magne Sjaastad
73053b0bb7 #1174 Create TOF property filter with selected tracer 2017-02-13 15:00:49 +01:00
Magne Sjaastad
45f3240932 #1174 Added context menu to WellAllocationPlot and added feature 2017-02-13 13:29:31 +01:00
Magne Sjaastad
9fa772a7bc Fixed #1177 Well Alloc plots: Store command does not add an actual window 2017-02-10 12:31:35 +01:00
astridkbjorke
517c53a069 (#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up) 2017-02-10 10:03:46 +01:00
astridkbjorke
22ee6250bd (#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection. 2017-02-10 09:54:37 +01:00
astridkbjorke
d52cfc0f0b (#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates. 2017-02-10 09:52:18 +01:00
Magne Sjaastad
652df8854d #1180 Use RiaColorTables for several features (well log, summary, flow rates) 2017-02-10 08:39:25 +01:00
Magne Sjaastad
5df94a1e18 #1181 Do not automatically update track names when adding new tracks 2017-02-09 08:35:33 +01:00
Magne Sjaastad
6e901cdb12 #1190 Do not show delete features for well allocation plot objects 2017-02-09 08:34:28 +01:00
Magne Sjaastad
c215bbcbbc Fixed missing include after merge 2017-02-08 07:35:48 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Jacob Støren
ec7e892395 Fixed #1175 schedule geometry regeneration when creating a property filter. 2017-02-07 15:11:47 +01:00
Magne Sjaastad
4313409c57 #1190 Make sure well log features are disabled for well allocation objects 2017-02-07 09:34:11 +01:00
Magne Sjaastad
b8e838614c #1190 Avoid delete action of RimWellFlowRateCurve 2017-02-07 09:28:43 +01:00
Magne Sjaastad
8bc1a3ee3d #1190 Improved copy command feature 2017-02-06 13:33:56 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
 2017-02-03 10:51:46 +01:00
Magne Sjaastad
e2e689e591 Fixed compile issue on Linux 2017-02-03 10:13:08 +01:00
Magne Sjaastad
e8ee077501 #1164 Added feature "Add Stored Well Allocation Plot" 2017-02-02 12:32:01 +01:00
astridkbjorke
64684f6bec #1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths) 2017-02-02 11:38:55 +01:00
astridkbjorke
30304a5f8a #1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures. 2017-02-02 08:50:54 +01:00
astridkbjorke
871146ba68 pre-proto - Updating fracture position from location when creating new fracture in project tree (bugfix) 2017-02-02 08:50:54 +01:00
Magne Sjaastad
57a1cd0c64 Fixed missing regeneration of geometry when deleting all well path fractures 2017-02-02 07:48:58 +01:00
Magne Sjaastad
6d95d00863 #1159 Fixed inaccurate position of new fracture when clicking in 3D view 2017-02-02 07:36:22 +01:00
Magne Sjaastad
bd732d9564 #1148 Always show context menus 2017-02-01 09:52:01 +01:00
astridkbjorke
4c1f7776b9 pre-proto - Sorting includes 2017-01-31 15:58:13 +01:00
astridkbjorke
3a5247e357 #1147 - pre-proto - Adding index number to names for new fractures 2017-01-31 15:54:04 +01:00
Magne Sjaastad
b75fdb4a6d #1152 Replace space in filenames with underscore 2017-01-31 09:58:11 +01:00
astridkbjorke
238b803dce #1145 - pre-proto - Adding command feature for export of fractures only from selected wells. So far only fractures from one well can be exported each time. 2017-01-31 09:56:49 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad
ccc7345706 #1078 Added context menu for well cells and well cell fence 2017-01-26 17:52:13 +01:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
 2017-01-26 14:30:13 +01:00
Magne Sjaastad
f9a9040ed5 #1078 Added show pipe and show spheres to well collection 2017-01-26 10:27:23 +01:00
Magne Sjaastad
6ee54733f4 #1078 Context menu commands for multi select of EclipseWell objects 2017-01-26 07:23:18 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
astridkbjorke
fbfffd4398 #1090 #1089 - pre-proto - Adding perforation length to fracture template and fracture, and azimuth angle to fracture template. 2017-01-24 09:16:51 +01:00
Jacob Støren
825c505443 #1112, #1106 Added and removed fields to make the allocation plot have the needed data to do its calculation. Refacord the CenterLine calculation interface yet again to make it usable. 2017-01-23 11:10:09 +01:00
Magne Sjaastad
cebe5428be #1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes 2017-01-20 16:25:05 +01:00
Jacob Støren
c025c2a3d7 Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well. 2017-01-20 11:38:18 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control 
of windows. This might introduce problems.
 2017-01-19 17:54:01 +01:00
Magne Sjaastad
93e9b04655 Cleanup includes 2017-01-19 13:35:07 +01:00
Magne Sjaastad
b25f630a7e Moved several fields to RimFracture 2017-01-19 10:43:23 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-01-18 12:19:07 +01:00
Magne Sjaastad
9c1e9f0970 #1080 Snapshot : Show parameter and case as default 2017-01-17 10:40:38 +01:00
Magne Sjaastad
22f870bff0 #1082 Snapshot : Added four empty rows 2017-01-16 23:21:28 +01:00
Magne Sjaastad
2292debc6b #1085 Snapshots : Added toggle to control if a snapshot definition is active 2017-01-16 22:55:22 +01:00
Magne Sjaastad
723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00