Commit Graph

331 Commits

Author SHA1 Message Date
Rebecca Cox
44be1bfd6b #1996 Rename RigSingleWellResultsData -> RigSimWellData 2017-10-17 09:52:31 +02:00
Rebecca Cox
7d908394db #1996 Renaming. Remove unused includes and rename local variables 2017-10-17 09:52:31 +02:00
Rebecca Cox
d748803159 #1996 Rename RimEclipseWell -> RimSimWellInView 2017-10-17 09:52:31 +02:00
Arne Morten Kvarving
ab4619bf74 fixed: add missing cmath include statements
highlighted by building with gcc6
2017-09-29 18:24:28 +02:00
Jacob Støren
dc1844f5d5 #1901 Use the more robust WellLogExtraction system for perforation interval intersection calculations. 2017-09-19 17:20:49 +02:00
Magne Sjaastad
1ec9e72ce2 #1891 StimPlan : Add support for "Conductivity-propped" 2017-09-14 13:48:33 +02:00
Magne Sjaastad
cb7a5253ff #1708 Fishbones: Fix issue with random angle on Linux 2017-09-08 08:21:44 +02:00
Magne Sjaastad
fb1b6cc628 CppCheck : Remove unused variables 2017-09-07 22:05:20 +02:00
Magne Sjaastad
3192f8fef4 #1812 Fracture: Split label text in two lines for Azimuth Fracture 2017-08-30 08:34:42 +02:00
Magne Sjaastad
26149f1b5e #1794 Several fixes to make fracture configuration compile 2017-08-21 20:54:48 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
7dfcfde1d1 #1744 Load and update data for fractures when loading project file 2017-08-14 22:16:03 +02:00
Magne Sjaastad
3644f4eb76 Do not compare signed with unsigned 2017-08-11 16:17:40 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
a99eae7c24 Linux : Fix compiler issues 2017-08-11 15:22:40 +02:00
Magne Sjaastad
a3ba1991db #1739 Ellipse Fracture : Recompute the fracture grid when opening project 2017-08-04 14:35:16 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
astridkbjorke
50eb8b7225 #1617 Adding conductivity scaling factor to StimPlan fracture templates, and scaling the conductivity values in file with this value. 2017-08-03 13:40:35 +02:00
Magne Sjaastad
bf3636a9df #1732 Update path to StimPlan xml if required 2017-08-03 13:21:19 +02:00
astridkbjorke
d55c362bf0 #1714 Adding point at fracture position to the vector of wellPathPoints used in calculation of intersection between fracture and wellpath. 2017-08-02 11:37:46 +02:00
Bjørnar Grip Fjær
7e44fe185e #1704 Include top and base layers in fracture containment 2017-08-02 10:50:11 +02:00
Magne Sjaastad
ffdafcfb97 #1708 Fishbones : Fix use of rand() for orientation of subs on Linux 2017-08-01 14:36:13 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +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
astridkbjorke
45f47dac0c Changing name of parameter from "Start of History" to "All timesteps" 2017-07-07 14:05:20 +02:00
astridkbjorke
bf15e48b29 Changing name of fishbone-wellpath-collection from "Well path" to "Imported Laterals" 2017-07-05 10:32:02 +02:00
astridkbjorke
bcbb5202df #1678 Bugfix to set property for polygon for stimplan fractures, to avoid potentially confusing error messages for stimplan files without conductivity. 2017-07-03 11:36:58 +02:00
astridkbjorke
0dfc76dd3e #1678 Setting fracture template unit for stimplan based on unit on grid (ft or m) instead of unit for conductivity (which may be missing in the file). 2017-07-03 11:00:06 +02:00
astridkbjorke
032630f6e9 #1634 Calculating smallest positive value and using this value for the min range value when using logarithmic scale 2017-06-30 16:16:27 +02:00
astridkbjorke
b2b9d0a51e #1628 Turning off viaualization of polygon for fracture templates, and hiding all related parameters from UI. 2017-06-30 12:54:51 +02:00
astridkbjorke
c7d708e9d4 #1658 Setting azimuth angle from fracture template if orientation type is Azimuth. Changing updateAzimuthFromFractureTemplate to updateAzimuthBasedOnWellAzimuthAngle and only using this function to update azimuth angles if orientation type is not azimuth. 2017-06-29 15:06:44 +02:00
astridkbjorke
e7043db156 #1618 Changing proxy fields from double to QString to have more control over the output and limit accuracy of numbers printed. 2017-06-29 11:28:30 +02:00
astridkbjorke
dad066adf0 #1618 Using proxy-fields for wellpathazimuth and wellFractureAzimuthDifference 2017-06-29 10:34:20 +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
astridkbjorke
2625ce6ea9 #1618 Fixing bug in well path angle calculation + corresponding update to fracture azimuth angle. Calculating difference between well path and fracture angle and displaying warning if less than 10 deg. 2017-06-27 14:12:50 +02:00
astridkbjorke
2501264013 #1618 Showing well path direction in read only field. Also updating azimuth angle of wellpath / simwell to avoid negative angles and instead have angles 0-360deg. 2017-06-27 14:12:50 +02:00
Jacob Støren
fc05dd665f #1585 Add visualization (gray out) inactive parts of fractures based on containment. 2017-06-27 13:21:04 +02:00
astridkbjorke
e95966cfb8 #1598 Hiding wellDiamanter (not used) when using Infinite cond 2017-06-26 11:07:15 +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
Magne Sjaastad
37a04dd376 #1651 Set default value to 1.0 for Install Success Rate 2017-06-23 17:19:06 +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
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
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
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
Jacob Støren
551a3015ed Do minor cleanup in SimWellFractureAtPos Feature 2017-06-20 10:17:23 +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
Jacob Støren
a91a4d2285 #1585 corrected calculations of achor cell on fracture
Move IJK achor cell visualization to SimWellFracture
Remove unused IJK fields and IJK anchor cell from RimFracture, because they are ambigous for well path fractions.
Should be a list, but not implemented yet
2017-06-16 14:24:16 +02:00
Bjørnar Grip Fjær
95ef92a9af Fix Linux build issue 2017-06-16 13:50:08 +02:00
Bjørnar Grip Fjær
0266b385af #1620 Use same date format as import file when specifying perforation interval start date 2017-06-16 13:47:07 +02:00
Bjørnar Grip Fjær
fd6b491075 #1620 Use date editor when editing start date for perforation interval 2017-06-16 13:34:46 +02:00
Bjørnar Grip Fjær
31a64e50ac #1602 Completion Type : Add fracture category 2017-06-16 09:44:39 +02:00
Bjørnar Grip Fjær
9caf412b6c #1603 Adjust start MD when importing fishbones laterals 2017-06-15 12:48:22 +02:00
Bjørnar Grip Fjær
5365d92e66 #1603 Ensure start MD is recalculated when new fishbones subs are created 2017-06-15 12:08:15 +02:00
astridkbjorke
16a2c232c7 #1609 Setting default skin factor to 0 for fishbones 2017-06-15 11:54:22 +02:00
Bjørnar Grip Fjær
2da4952509 #1604 Ensure fishbones are shown when new subs are added 2017-06-15 11:53:11 +02:00
astridkbjorke
2e764b3fe5 #1609 Default skin factor is now 0 2017-06-15 11:23:25 +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
astridkbjorke
7d1dc5d9d6 #1608 - fixing update of wellDiameter and perforation length (in fracture unit system) from fracture template 2017-06-15 10:50:34 +02:00
Jacob Støren
1911092cb7 Merge dev into pre-proto 2017-06-14 23:25:55 +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
Jacob Støren
1d405384ee Remove obsolete code: StimPlaneUpscaling and Transmissibilities 2017-06-14 11:25:43 +02:00
Jacob Støren
f87a186648 #1585 Privatize data members in FractureDefinition 2017-06-14 09:28:56 +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
Jacob Støren
e9b9b17739 #1585 Move geometry generation code frm RimStimPlanTemplate to Rig 2017-06-13 15:07:16 +02:00
Jacob Støren
d8d2aaed5f #1585 More rename and code reordering of StimPlanFractureTemplate 2017-06-13 15:07:16 +02:00
Jacob Støren
f09374b12a #1585 Rename in StimPlanFractureTemplate. Move obsolete method to upscaling 2017-06-13 15:07:16 +02:00
Jacob Støren
11276d8b84 #1585 Move code from StimPlanTemplate to StimPlanXmlReader 2017-06-13 15:07:16 +02:00
Jacob Støren
bd03fa4791 #1585 Move more code away from StimPlanTemplate 2017-06-13 15:07:16 +02:00
Jacob Støren
681a3404b4 #1585 Move more code away from StimPlanTemplate 2017-06-13 15:07:16 +02:00
Jacob Støren
bd5b185260 #1585 Privatized fields in StimPlanTemplate 2017-06-13 15:07:16 +02:00
Jacob Støren
e159fa5bca #1585 Move code away from StimPlanTemplate, and prepare to move more 2017-06-13 15:07:16 +02:00
Jacob Støren
a2de4efb66 #1585 Remove RigFracture. No caching of transformed triangles related to each fracture instance 2017-06-12 12:52:39 +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
Bjørnar Grip Fjær
22165a003d #1588 Rename to Liner Inner Diameter and use proper default values 2017-06-12 08:48:17 +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
13a350f62a #1466 Fix spelling and set default Cv value to 1.5 2017-06-09 16:02:39 +02:00
Magne Sjaastad
674e27a4b3 Support FlyToObject for fractures 2017-06-09 13:05:59 +02:00
Bjørnar Grip Fjær
41e3980114 #1466 Default ICD flow coefficient to 1.0 2017-06-09 12:29:25 +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
395e232b77 #1568 Removed delete in destructor, handled by destructor in base class 2017-06-09 10:40:58 +02:00
Magne Sjaastad
5f20ef1a0a #1568 Add checkbox to well path fracture collection 2017-06-09 10:33:50 +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
Jacob Støren
8679af2dbc #1575 Add Fraction Truncation ui group to Fraction Template 2017-06-08 22:54:06 +02:00
Magne Sjaastad
dd912b4f97 Merge branch 'dev' into pre-proto 2017-06-08 14:09:03 +02:00
Magne Sjaastad
e1f4dbfcf8 Renamed to nameField() to avoid duplication of name() 2017-06-08 13:31:53 +02:00
Bjørnar Grip Fjær
0f188a2200 #1560 Add support for computing fishbones transmissibilities 2017-06-08 13:01:26 +02:00
astridkbjorke
57d12a3164 #1416 Adding unit and conversion for perforation length for fractures and fracture templates 2017-06-08 11:00:35 +02:00
Magne Sjaastad
9759354148 Made RimNamedObject more robust and made name field private 2017-06-08 10:09:39 +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
Magne Sjaastad
df57298d57 Use private function for update of field visibilities + removed empty function 2017-06-07 11:23:00 +02:00
Magne Sjaastad
34425ac36a Hide 'Show Polygon Outline' for ellipsis 2017-06-07 11:19:41 +02:00
Bjørnar Grip Fjær
a16e0803ca #1555 Add main bore and liner diameter to fishbones collection 2017-06-06 16:11:49 +02:00
astridkbjorke
e7e57e66c6 #1507 Setting up fracture grid when creating new EllipseFractureTemplate, using finer gridding for grid in ellipse fracture and fixing bug in setting of wellCenterCell for ellipse fracture grid 2017-06-06 11:24:50 +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
Bjørnar Grip Fjær
3bb0e84eb7 #1555 Add start measured depth to fishbones collection 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
Jacob Støren
54e8aea51a #1503 Use fracture layout icon, and improve icon a bit 2017-06-05 09:15:31 +02:00
astridkbjorke
ef64057990 #1542 Perforation legnth and efficiency are only visible in GUI for Along-Well-oriented fracture, since the values are not used in the calculations for transverse and azimuth fratures. 2017-06-02 15:34:37 +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
5d48389fb5 Ensure fly to object only uses installed fishbones 2017-06-02 11:23:33 +02:00
Bjørnar Grip Fjær
7d2c888bdc Remove unused function lateralCountPerSub 2017-06-02 10:51:17 +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
56579e7b3e #1487 Separated fracture files in Rim CMakeLists file 2017-06-02 09:23:24 +02:00
Jacob Støren
e649c3c5a3 Merged CMakeList preparations for fracture files 2017-06-02 08:36:28 +02:00
Jacob Støren
9482a0724f Call sourcegroup Completions. Set up space for Fracture files 2017-06-02 08:26:40 +02:00
Jacob Støren
e7244d0b0b Merge dev into pre-proto. 2017-06-02 08:05:07 +02:00
Bjørnar Grip Fjær
bb6604db3c #1545 Make sure visibility of date field is correct when loading project file 2017-06-01 14:47:21 +02:00
Bjørnar Grip Fjær
aa04d69cfd #1546 Set default diameter to 0.216m for perforation intervals 2017-06-01 14:43:20 +02:00
Bjørnar Grip Fjær
7a0d9957c4 #1547 Rename "ICD Count" to "ICDs per Sub" and default to 2 2017-06-01 14:41:21 +02:00
Bjørnar Grip Fjær
0318a8c455 Move fracture related models under completions folder 2017-06-01 14:25:38 +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
8a937116e5 Correct return type of lateral count for fishbones 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
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
ffb084a78b #1532 Move completion related data models into separate completions folder 2017-05-30 14:50:43 +02:00