Commit Graph

910 Commits

Author SHA1 Message Date
Bjørnar Grip Fjær
2ec68d08fb #1690 Add import settings to pasting ASCII data to summary plot 2017-08-11 13:57:11 +02:00
Bjørnar Grip Fjær
a47c5b5d84 #1690 Summary: Import clipboard data from Excel as new curves 2017-08-11 13:57:11 +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
Bjørnar Grip Fjær
861aa292b2 #1706 Ensure new fractures are created with unique names 2017-08-04 15:47:47 +02:00
Bjørnar Grip Fjær
37456bfa9b #1730 Include more information in snapshot filenames 2017-08-04 11:25:42 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Bjørnar Grip Fjær
a59735de87 #1730 Move snapshot features to separate files 2017-08-03 16:22:02 +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
Magne Sjaastad
78a779424f #1677 Store dialog data in project file 2017-06-30 16:14:15 +02:00
Magne Sjaastad
f8f57d3184 #1670 Use PtrField instead of PdmPointer 2017-06-30 16:13:38 +02:00
Magne Sjaastad
917ee860d2 #1670 Minor UI adjustments 2017-06-30 12:49:12 +02:00
Magne Sjaastad
b2b4ab95ba #1670 Add command feature "Export CARFIN" 2017-06-29 22:37:00 +02:00
Magne Sjaastad
407547d454 #1670 Add cell range UI 2017-06-29 22:37:00 +02:00
Magne Sjaastad
15e805fba3 #1670 Move commands to ExportCommands folder 2017-06-29 22:37:00 +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
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
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
17593fba92 #1602 Include sim well fractures when calculating completion type results 2017-06-21 11:06:38 +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
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
d3f512f783 #1593 Use well path unit system for completions on well path 2017-06-20 10:51:01 +02:00
astridkbjorke
9ccd033c91 #1630 Calculate transmissibility for perforation intervals 2017-06-20 10:18:20 +02:00
Jacob Støren
551a3015ed Do minor cleanup in SimWellFractureAtPos Feature 2017-06-20 10:17:23 +02:00
astridkbjorke
7af233fba0 #1561 Update calculation of transmissibility for fish bones to only use number of laterals (not main bore) in adjustment of cell volume. 2017-06-20 09:47:16 +02:00
astridkbjorke
a6a1ad0f95 #1561 Replacing old combine function for RigCompletionData with new combineEclipseCellCompletions which can calculate WPImult. Assumes completions to always have calculated transmissibility. 2017-06-20 09:47:16 +02:00
Magne Sjaastad
31bde3eb9a #1599 Do not use file extention in getSaveFilename() as this causes issues on KDE desktop 2017-06-19 10:48:47 +02:00
Bjørnar Grip Fjær
d5d7625864 #1597 Hide completions for well paths that have none, and enable commands to add new ones on well path directly 2017-06-16 15:36:59 +02:00
Bjørnar Grip Fjær
6da356fa27 #1606 Add option to export completions for all wells or only checked wells 2017-06-15 11:37:00 +02:00
Bjørnar Grip Fjær
14f91736b7 #1607 Optionally split export of completions over several files 2017-06-15 11:21:37 +02:00
Bjørnar Grip Fjær
403bf1890c #1607 Record completion type of completion data and combine after all completions are calculated 2017-06-15 09:12:42 +02:00
Bjørnar Grip Fjær
771a47a287 #1607 Create option to export completions into separate files 2017-06-15 09:12:42 +02:00
Jacob Støren
1911092cb7 Merge dev into pre-proto 2017-06-14 23:25:55 +02:00
astridkbjorke
4e82dbfe7b #1561 Adding transmissibilities from main bore to fishbone transmissibilities. Not exporting any results for inactive cells. 2017-06-14 15:03:37 +02:00
Bjørnar Grip Fjær
27f4357988 #1605 Use Well Name for Completion Export as well name when exporting completions 2017-06-14 13:43:56 +02:00
Bjørnar Grip Fjær
8fceb8c74f #1605 Add Well Name for Completion Export field 2017-06-14 13:13:48 +02:00
Jacob Støren
bca96d31ad #1585 Adjustments to FractureContainment class 2017-06-14 12:44:08 +02:00
astridkbjorke
815c213140 Renaming arguments in functions used by fishbone trans calculations 2017-06-14 10:33:19 +02:00
astridkbjorke
28460030e5 #1561 Adding TODO/pseudo-code for handling main bore transmissibility in fishbone-trans-calc 2017-06-14 10:33:19 +02:00
astridkbjorke
fa549829b5 #1561 Separating finding wellBoreParts for fishbones and the calculation of transmissibilities. Transmissibilities are adjusted based on number of fishbones in each cell when they are calculated. 2017-06-14 10:33:19 +02:00
astridkbjorke
03a95857c8 Moving fishbones transmissibility calculation to a separate class 2017-06-14 10:33:19 +02:00
Magne Sjaastad
12bbaa898d Added several missing copyright headers 2017-06-14 07:53:28 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Magne Sjaastad
5fa2f6cfbe #1596 Rename to RiaEclipseUnitTools 2017-06-13 15:25:52 +02:00
Bjørnar Grip Fjær
2a4f05f995 #1559 Remove unused existing export completions commands 2017-06-12 12:53:48 +02:00
Bjørnar Grip Fjær
6391fad018 #1559 Use common export completions command for well paths and simulation wells 2017-06-12 12:41:14 +02:00
astridkbjorke
b12143c0a8 Renaming methods for calculating compdat for fishbones 2017-06-12 10:35:46 +02:00
Jacob Støren
dceae0581e #1585 Major renaming of fracture related methods and members 2017-06-09 17:21:59 +02:00
Magne Sjaastad
e09ab3c3da #1592 Remove duplicate code for new well path fracture features 2017-06-09 13:05:32 +02:00
Bjørnar Grip Fjær
2922a00fd6 #1586 Compute diameter and roughness for main bore and ICDs 2017-06-09 12:27:21 +02:00
Magne Sjaastad
8f003449b2 #1592 Move new well path fracture feature to WellPathFractureCollection 2017-06-09 12:19:14 +02:00
Bjørnar Grip Fjær
712cac9e9e #1586 Compute effective diameter of fishbones in WELSEGS 2017-06-09 12:08:15 +02:00
Magne Sjaastad
7d1deb319f Merge remote-tracking branch 'origin/pre-proto' into pre-proto 2017-06-09 09:35:59 +02:00
astridkbjorke
f46e31e673 #1554 Implementing handling of infinite/finite conductivity in fracture during transmissibility calculation. Setting default value to finite conductivity (in fracture templates). 2017-06-09 09:29:53 +02:00
Magne Sjaastad
dd912b4f97 Merge branch 'dev' into pre-proto 2017-06-08 14:09:03 +02:00
Bjørnar Grip Fjær
2833da34a1 #1560 Ensure eclipse case and well path uses same unit system when exporting 2017-06-08 13:01:26 +02:00
Bjørnar Grip Fjær
af95dacf03 #1560 Use radius, not diameter, when computing fishbones transmissibilities 2017-06-08 13:01:26 +02:00
Bjørnar Grip Fjær
0f188a2200 #1560 Add support for computing fishbones transmissibilities 2017-06-08 13:01:26 +02:00
Bjørnar Grip Fjær
fcf46b209c Use correct sub index when exporting laterals 2017-06-08 13:01:26 +02:00
astridkbjorke
a80660d756 #1553 Changing from wellRadius to wellDiameter for fractures and templates, and adding unit (m or inch) and conversion. wellRadius() still returns radius, in m or ft 2017-06-08 09:20:38 +02:00
Bjørnar Grip Fjær
b82bda5905 #1577 Improve RigWellPathIntersectionTools 2017-06-07 16:04:34 +02:00
Bjørnar Grip Fjær
960948e684 Move perforation commands to completion commands 2017-06-07 15:57:57 +02:00
Bjørnar Grip Fjær
1414751859 #1573 Set unit system on well path 2017-06-07 11:57:40 +02:00
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