Commit Graph

105 Commits

Author SHA1 Message Date
Magne Sjaastad
362eb249b5 #1756 Allow 'Include Fractures' to be un-checked 2017-08-14 22:30:22 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
f096f78a55 Linux : Fix compile issue 2017-08-11 15:18:20 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad
624f14da46 Prefix enum values with RIF_
FLOAT causes Cotire compile to fail
2017-08-11 14:24:54 +02:00
Bjørnar Grip Fjær
eee4a65497 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-08 14:24:42 +02:00
Bjørnar Grip Fjær
6c5f974d8e #1743 Use well name for completion export for fractures as well 2017-08-08 14:11:05 +02:00
Bjørnar Grip Fjær
39c3338024 #1742 Allow different wells in same grid when exporting completions to different files per well 2017-08-08 13:56:07 +02:00
Bjørnar Grip Fjær
6ce36b666c #1723 Do not create completions file for wells and completion types that have no data 2017-08-04 16:42:35 +02:00
astridkbjorke
f2c20db534 #1707 Removing check on wheter fracture cell is in contained area or not when calculating flow in fracture and into well. This will allow flow in the fracture and into the well also in eclipse layers excluded by the fracture containment feature, and in areas without any eclipse cells (gaps in grid). 2017-08-03 11:10:07 +02:00
Bjørnar Grip Fjær
aa1d7775a4 #1709 Be more explicit when an error occurs when combining completion data 2017-08-01 14:31:47 +02:00
Bjørnar Grip Fjær
63c58d0481 #1705 Export fractures to own file when exporting completions to separate files based on completion type 2017-08-01 13:09:42 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
astridkbjorke
5b34414977 #1713 Using time step from view instead of that from export-setting when exporting connection factors for simWell-fracture 2017-07-31 15:10:07 +02:00
astridkbjorke
29e40b6dbb #1655 Adding skin factor for main bore for fishbone calculations, and using this value in transmissibility calculations. 2017-07-31 11:49:52 +02:00
Bjørnar Grip Fjær
da4f6d72be #1665 Add exportMsw command to command file interface 2017-07-27 10:29:45 +02:00
Bjørnar Grip Fjær
8e444d5cbe #1665 Add exportWellPathComplections command to command file interface 2017-07-27 10:28:41 +02:00
astridkbjorke
68ec65602a #1687 Updating default file name for export of fishbone laterals. 2017-07-05 09:59:19 +02:00
astridkbjorke
546a6457cc #1652 Creating export folder if it does not already exist. 2017-07-03 15:02:24 +02:00
astridkbjorke
5b62184e2f #1678 Giving an error message and not calculating transmissibiliities if using a stimPlan file without conductivity and finite conductivity in fracture. 2017-07-03 13:55:59 +02:00
Bjørnar Grip Fjær
03aa6c8eb7 #1667 MSW Export : Move parameters from export dialog to project 2017-06-28 20:51:16 +02:00
Magne Sjaastad
70d3c501a4 #1668 Use "Export" instead of "OK" in export dialogs 2017-06-28 10:13:59 +02:00
Magne Sjaastad
286ec08b05 #1668 Use title "Export Well Segments" 2017-06-28 10:11:56 +02:00
astridkbjorke
63b478b18d #1650 Only use linear transmissibility for fractures along well pipe (and no radial transmissibility to end points). 2017-06-26 14:12:17 +02:00
astridkbjorke
9f3dad9465 #1654 In WELSEGS export, using liner diameter as diameter for main bore and ICD, computed effective diameter for laterals. 2017-06-26 11:45:20 +02:00
astridkbjorke
50a0dcd499 #1589 Setting includeFractures to false and read-only when using setting "Use Default Connection Factors and WPImult (excludes fractures)" 2017-06-23 15:45:22 +02:00
astridkbjorke
6febf1dfbf Additional fix after merge 2017-06-23 13:21:47 +02:00
astridkbjorke
ea08cc58fb Merge from dev 2017-06-23 13:21:34 +02:00
astridkbjorke
3960c9db90 #1550 Making separate group for MSW parameter in FishbonesCollection to avoid confusion about what parameters are used for. 2017-06-23 10:15:34 +02:00
astridkbjorke
42e41355c1 Fixing printing endMD in perforation interval metadata when exporting compdat values. 2017-06-22 15:20:16 +02:00
astridkbjorke
c8e5e327d9 #1550 Only including contributions for main bore with fishbones if there actually are fishbones on this well. 2017-06-22 15:19:03 +02:00
astridkbjorke
df8f45c649 #1633 Removing option for selected and checked wells, now only option is selected wells if selecting well paths. 2017-06-22 14:35:28 +02:00
astridkbjorke
53917c6195 #1633 Updating options for which wells to include in export to depend on whether a wellPathCollection or WellPaths have been chosen. Also fixing last-save directory to remain at the directory last used. 2017-06-22 14:35:28 +02:00
Jacob Støren
33b037a80b #1440 Merge dev into pre-proto (WellPath viz restructure and constness)
Had to do quite a bit constness fiddeling to make the merge work
2017-06-22 10:42:07 +02:00
Jacob Støren
845b1acbbd Merge branch 'dev' into well-path-restructure 2017-06-21 17:16:17 +02:00
Jacob Støren
b2a1f5690b #1440 Remove all real caching in the well path geometry system
Had no effect anyway.
Rename method to scheduleRedrawAffectedViews()
2017-06-21 17:13:19 +02:00
Bjørnar Grip Fjær
8f06115730 Merge branch 'dev' into pre-proto 2017-06-21 16:38:57 +02:00
Bjørnar Grip Fjær
53ee396c03 #1635 Use scientific numbers for transmissibility in completion data export 2017-06-21 16:25:41 +02:00
astridkbjorke
8d28981664 #1589 Remove option removeLateralsInMainBoreCells, instead implement option for "Exclude main bore" for fishbone export. Also grouping export options. 2017-06-21 15:55:35 +02:00
astridkbjorke
21f0857791 #1589 Replace bools "Calculate Trans" and "Include WPImult" with choice of calc trans or use wpimult and default connection factors 2017-06-21 15:55:35 +02:00
Bjørnar Grip Fjær
4f8f77945c Add method for checking if fracture has non-zero conductivity 2017-06-20 16:40:51 +02:00
Jacob Støren
5a02cf1498 #1574 Make export of fractures to compdat now respects the containment settings 2017-06-20 16:37:25 +02:00
Bjørnar Grip Fjær
d63fdf0c80 #1593 Use well path unit type on fractures 2017-06-20 14:46:58 +02:00
astridkbjorke
5a466db9af #1630 Update metadata for completions 2017-06-20 13:49:33 +02:00
astridkbjorke
5bcc226aba #1561 Setting wpimult in RigCompletionData to double, setting celldirection in completionData for implicit trans and wpi mult calculation 2017-06-20 13:49:33 +02:00
astridkbjorke
ade665e5b4 #1561 Setting isMainBore for main bore fishbone completions 2017-06-20 13:49:33 +02:00
Bjørnar Grip Fjær
7c99a2573a Merge branch 'dev' into pre-proto 2017-06-20 13:26:52 +02:00
Bjørnar Grip Fjær
d3f512f783 #1593 Use well path unit system for completions on well path 2017-06-20 10:51:01 +02:00