Commit Graph

5322 Commits

Author SHA1 Message Date
astridkbjorke
e95966cfb8 #1598 Hiding wellDiamanter (not used) when using Infinite cond 2017-06-26 11:07:15 +02:00
Jacob Støren
6610977c9f Linux compile fixes 2017-06-26 11:05:46 +02:00
Jacob Støren
9d1cc2eb19 #1653 Make fracture mesh visualization independent of active view.
Removed use of timestep index in rimfracture (use template timestep)

Remove display value from fracture cell
2017-06-26 10:28:23 +02:00
Jacob Støren
febdabc6c6 Minor whitespace adjustments 2017-06-25 10:42:53 +02:00
Jacob Støren
cbb0a58673 #1648 Remove dependency on active view from color generation.
Separate the fracture geometry generation methods from the wellpath methods. Use eclipse View as argument.
Fixed some constness stuff in View
2017-06-25 10:42:53 +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
5899c56b82 Updating number of cells used when setting up fracture grid based on ellipse 2017-06-23 10:41:31 +02:00
Jacob Støren
7d7172f811 #1646 Fix disappearing mesh lines by using double transformation calculations 2017-06-23 10:16:39 +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
Jacob Støren
63cf1e91b3 #1440 Split fracture coloring from geometry generation 2017-06-22 14:55:16 +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
deedb6a90e #1440 Merge dev into pre-proto More cleanup of WellPathPartMgr 2017-06-22 11:21:50 +02:00
Jacob Støren
591e10ee65 #1440 RivWellPathPartMgr Rename and argument alignment 2017-06-22 11:01:44 +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
Magne Sjaastad
4c7f9d4d31 Merge branch 'master' into dev 2017-06-21 17:42:28 +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
581adbc588 Merge branch 'dev' into pre-proto 2017-06-21 16:41:33 +02:00
Bjørnar Grip Fjær
db65917822 #1635 Use capital 'E' in scientific notation 2017-06-21 16:41:07 +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
Jacob Støren
3193127e32 #1440 Remove RivWellPathCollectionPartMgr as it did not manage any parts
This is a step to make it easier to make the interface from the views to get the well path related geometry parts more "static".
2017-06-21 15:39:59 +02:00
Magne Sjaastad
7dd0360284 Merge pull request #1639 from OPM/release-2017.05-patch
Set version number to 2017.05.2
2017-06-21 13:49:05 +02:00
Magne Sjaastad
9f76f851b8 Set version number to 2017.05.2 2017-06-21 13:48:08 +02:00
Magne Sjaastad
2778c1d22c Merge pull request #1638 from OPM/release-2017.05-patch
Release 2017.05.2
2017-06-21 13:45:58 +02:00
Bjørnar Grip Fjær
17593fba92 #1602 Include sim well fractures when calculating completion type results 2017-06-21 11:06:38 +02:00
Bjørnar Grip Fjær
7d5157b3b3 Recalculate completions when completion collections are toggled 2017-06-20 17:22:14 +02:00
Bjørnar Grip Fjær
18b26aaf3a #1625 Completion type should only use checked fractures, perforations and fishbones. 2017-06-20 16:56:10 +02:00
Jacob Støren
0826db99f8 Merge branch 'dev' into well-path-restructure 2017-06-20 16:49:28 +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
Bjørnar Grip Fjær
78c948ea89 #1623 Schedule invalidation of completion type results instead of immediate calculation 2017-06-20 16:40:50 +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
Jacob Støren
47869b4728 Avoid copy of eclipse results arrays in RimReservoirCellResultsStorage::isDataPresent 2017-06-20 16:29:56 +02:00
Magne Sjaastad
8e47d82038 Improve layout in header file 2017-06-20 15:01:30 +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
05d210df93 #1597 Enable New fracture command on well path and show fracture collection only when fractures are present 2017-06-20 13:38:27 +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
088617ea5c #1629 Set default values on completions dependent on selected unit system 2017-06-20 12:36:12 +02:00
Jacob Støren
5721dcdb7c #1574 Add method: isEclipseCellWithinContainment 2017-06-20 11:18:19 +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