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
10,701 Commits 27 Branches 61 Tags 309 MiB
ff16156c2a
Commit Graph

433 Commits

Author SHA1 Message Date
Magne Sjaastad
93ec84efdd #2967 Fracture Truncation at Faults : Use combo box and obsolete checkbox 2018-05-25 11:31:21 +02:00
Magne Sjaastad
fec963931e #2967 Fracture Truncation at Faults : Code cleanup before adding trunction 2018-05-25 11:31:21 +02:00
Magne Sjaastad
fb7d24e99d #2734 Perforation Intervals: Add custom start date and custom end date 2018-05-24 20:02:01 +02:00
Magne Sjaastad
fc1f79a304 #2734 Perforation Intervals: Prepare for stop date 2018-05-23 15:28:54 +02:00
Gaute Lindkvist
c959db73a1 #2887 Tidy up 3D well log curve configuration to more obvious documentation. 2018-05-09 15:56:24 +02:00
Magne Sjaastad
43bb955ba2 #1777 Make access of data in RimStimPlanFractureTemplate robust 
This commit makes it possible to open a project with invalid path to StimPlan, only displaying an error in the message window.
 2018-05-09 15:43:07 +02:00
Magne Sjaastad
d6d894f631 #2868 Completion Type : Change priority order 2018-05-09 11:48:37 +02:00
Magne Sjaastad
4f4a12b636 #2868 Completion Type : Rename 2018-05-09 11:48:37 +02:00
Magne Sjaastad
e820bd44c7 #2868 Completion Type : Remove obsolete code 2018-05-09 11:48:37 +02:00
Magne Sjaastad
a986f3a4d2 #2868 Completion Type : Simplify update code paths 2018-05-09 11:48:37 +02:00
Magne Sjaastad
9bb8f36052 #2868 Completion Type : Compute completion type based on virtual connection factors 2018-05-09 11:48:37 +02:00
Gaute Lindkvist
f24fb4aaec Fix crash due to global/local grid index mixup when creating fractures on SimWellPaths. 
* Introduces a convenience method on the main grid
* Also converts some callers to use the convenience method.
 2018-05-09 10:44:29 +02:00
Gaute Lindkvist
1f44ea1ea3 Make draw plane selection for curves be unrelated to 3d Track (somewhat related to #2825). 
* Makes more sense user wise and makes for better code.
* Helps refactor code to relate grids to curves so the curves can have access to the grid
   it is being drawn on.
* This will help fix #2825 by being able to project curve points onto the exact triangle geometry.
 2018-05-02 11:51:22 +02:00
Gaute Lindkvist
04f793c19d #2782 Auto name for 3d Well Log Curves 2018-05-02 10:22:36 +02:00
Gaute Lindkvist
803b6b8179 3D Well Log Curves(#2676): Enable pick selection of the 3D Tracks and curves 2018-04-23 08:01:32 +02:00
Magne Sjaastad
ac10c4b9ac #2770 : Never compute completion type for simulation well fractures 2018-04-20 14:22:55 +02:00
Magne Sjaastad
95151193e9 #2770 Fracture : Only evaluate visibble geometry for completion types 2018-04-20 14:22:55 +02:00
Magne Sjaastad
69630211ca #2770 Fracture : Recompute completion type when required 2018-04-20 14:22:55 +02:00
Gaute Lindkvist
d7204363a0 3D Well Log Curves (#2673): Consolidate the draw plane position control. 2018-04-18 08:38:15 +02:00
Magne Sjaastad
ba3074ff08 #2748 Completion Type Calculations : Use findIntersectedGlobalCellIndices 2018-04-17 14:42:15 +02:00
Gaute Lindkvist
9da3f09782 3D Well Log Curves (#2668): Implement Draw-plane width control 
* Apply a factor between 0.25 and 2.5 times the characteristic cell size
* Make the offset from the pipe scale with the plane width up to a maximum offset.
* Organise the CurveCollection settings into two groups.
 2018-04-17 13:44:03 +02:00
Gaute Lindkvist
1180c199b4 3D Well Log Curves (#2669): Implement control of single color. 
* Set a cycled default whenever a curve is added to a collection.
 2018-04-17 13:44:03 +02:00
Gaute Lindkvist
501e80b1ad 3D Well Log Curves(#2671): Make curve draw plane background optional 2018-04-17 13:44:03 +02:00
Gaute Lindkvist
2cc93fb09d 3D Well Log Curves: Command to Delete curve #2667 
* Add delete command with explicit delete feature class.
 2018-04-10 10:57:04 +02:00
Rebecca Cox
7024ee045c #2591 3D well log curve: Add option to place at the side of the well 2018-03-22 12:54:31 +01:00
Rebecca Cox
ef1cb3468b 3D well log curves: Code cleanup 2018-03-22 11:45:11 +01:00
Magne Sjaastad
3cf7deea3a Hide next fracture ID from UI 2018-03-20 13:22:48 +01:00
Unknown
8766ea3057 #2591 3D well log curves: Option to turn grid on/off 2018-03-20 11:29:59 +01:00
Magne Sjaastad
4bb468b07a #2626 Fracture Adjustments : Shorter UI text 2018-03-20 10:58:06 +01:00
Magne Sjaastad
a108726f7a Fix missing include on Linux 2018-03-20 10:50:16 +01:00
Magne Sjaastad
39c8834181 #2627 Export CF : kh is reported as zero 2018-03-20 10:48:06 +01:00
Magne Sjaastad
cb6dbb1bee #2626 Fracture Adjustments 2018-03-20 10:42:53 +01:00
Magne Sjaastad
af677451c6 Refactor : Use const reference 2018-03-20 08:32:23 +01:00
Magne Sjaastad
0b123044a1 #2619 Fracture Sensitivity Support: Add conductivity scale for Ellipse fractures 2018-03-20 08:22:38 +01:00
Magne Sjaastad
08a978d0d7 #2621 Check valid date in perforation interval 2018-03-16 11:48:51 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Rebecca Cox
06504b6fef #2585 3D well log curves: Create visualization for a curve, random offsetted from a well path 2018-03-09 13:17:40 +01:00
Magne Sjaastad
9a7ca2d2a9 #2557 Non Darcy Flow : Fix inverted unit conversion 2018-03-09 09:40:10 +01:00
Magne Sjaastad
9de2f1ae52 Ellipse Fracture : Always set well intersection to center of ellipse 2018-03-09 09:00:44 +01:00
Magne Sjaastad
12b7ddf90b Ellipse Fracture : Rename to assignConductivityToCellsInsideEllipse 2018-03-09 09:00:44 +01:00
Magne Sjaastad
7c554b8ff8 Fracture : Fix typo when creating fracture cells for ellipse fracture 2018-03-09 09:00:44 +01:00
Bjørn Erik Jensen
6942a99406 #2569 Fracture containment. Fix fracture border polygon calculation 2018-03-08 11:06:17 +01:00
Rebecca Cox
09246b722a #2581 3D well log curve: Init after read 2018-03-08 08:07:13 +01:00
Rebecca Cox
831eac7fd5 #2584 3D well log curves: Create a collection object to hold curves 2018-03-07 15:12:27 +01:00
Magne Sjaastad
cbb25cb514 #2561 Fracture Template : Set Default Conductivity Result in loadDataAndUpdate() 2018-03-06 08:16:39 +01:00
Bjørn Erik Jensen
658e9e9f44 #2505 Add setFractureContainment batch command 2018-03-05 14:17:18 +01:00
Bjørn Erik Jensen
3a6de3cc56 #2505 Add conductivity scale factor batch command argument 2018-03-05 11:55:34 +01:00
Bjørn Erik Jensen
b371a94e91 #2495 Add batch command argument for D-factor scaling 2018-03-05 10:52:25 +01:00
Magne Sjaastad
454e0b31be #2559 Fracture Template : Fix unit conversion for width and conductivity 2018-03-05 09:43:06 +01:00
Magne Sjaastad
e386b031c1 #2567 Fracture : Fix display of result values for all result types 2018-03-04 10:36:39 +01:00
Bjørn Erik Jensen
48419480fa #2505 CommandFile. Add scaleFractureTemplate command. Currently accepting arguments width and height 2018-03-02 14:39:15 +01:00
Magne Sjaastad
ef2179f1ba #2545 Move fields from public to private 2018-03-02 14:27:52 +01:00
Magne Sjaastad
e39105503b #2483 Use update pattern of intersections when updating simwell fractures 2018-03-02 12:43:12 +01:00
Bjørn Erik Jensen
3fc99a73bc #2462 Add fracture template id 2018-03-02 09:33:38 +01:00
Bjørn Erik Jensen
2ac9aba485 #2494 Add height/width fracture scaling 2018-03-01 14:18:12 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Jacob Støren
d74807d669 #2535 Use the MainWindowTools class instead of MainWindow directly (part 1) 2018-02-27 16:46:53 +01:00
Magne Sjaastad
10bc5c92ab #2532 Fracture : Create copy of fracture template if non-matching units is detected 2018-02-27 12:05:41 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Magne Sjaastad
80af97c1a8 #2521 Fishbones : Clamp MD ranges to max MD of well path 2018-02-22 14:48:24 +01:00
Magne Sjaastad
594be93883 Whitespace cleanup 2018-02-21 19:53:22 +01:00
Magne Sjaastad
69339ad141 #2507 Non-Dracy Flow : Add display of unit and handle unit conversion 2018-02-21 19:25:05 +01:00
Magne Sjaastad
8ad30d9350 #2509 Fracture : Disconnect fracture template when unit changes 2018-02-21 19:07:03 +01:00
Magne Sjaastad
1b7dabdc51 #2291 Fishbones : Use 6 decimals, as this is required when using MD above 1000 2018-02-21 13:06:03 +01:00
Magne Sjaastad
81bb4481ed #2509 Fracture : Rename 2018-02-21 10:10:22 +01:00
Magne Sjaastad
0acab5cd65 #2509 Fracture : Add copy / paste of StimPlan 2018-02-21 09:50:50 +01:00
Magne Sjaastad
0d7e4f460c #2509 Fracture : Find matching template when adding new fracture 2018-02-21 09:10:40 +01:00
Magne Sjaastad
28ab07b199 #2509 Fracture : Remove obsolete unit conversion 2018-02-21 09:10:08 +01:00
Magne Sjaastad
f67918eba3 #2509 Fracture : Improve UI 2018-02-21 08:36:18 +01:00
Magne Sjaastad
b0be540977 #2509 Fracture : Remove obsolete unit conversion code 2018-02-21 08:18:55 +01:00
Magne Sjaastad
35febab8db #2509 Fracture : Add support for unit conversion of stimplan grid coords 2018-02-20 15:15:06 +01:00
Magne Sjaastad
0ef0f3b5b1 #2509 Fracture : Guard UI selection of fracture template of different unit 2018-02-19 14:32:33 +01:00
Magne Sjaastad
de3aa9f975 #2509 Fracture : Add text to indicate unit of fracture template 2018-02-19 13:54:29 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
917cae9e2d #2455 Non-Darcy Flow : Hide "From Fracture" if no width is available 2018-02-16 14:17:28 +01:00
Magne Sjaastad
b06d33c5e9 #2455 Non-Darcy Flow : Use DoubleValueEditor 2018-02-16 10:14:41 +01:00
Magne Sjaastad
ec70639a8f Remove obsolete code 2018-02-16 09:54:51 +01:00
Magne Sjaastad
7f5ff7be0f #2455 Non-Darcy Flow : Use double in fields to avoid many decimals when converting from float to double 2018-02-16 09:37:55 +01:00
Magne Sjaastad
ac96824640 #2455 Non-Darcy Flow : Add fields to fracture template 2018-02-16 09:37:55 +01:00
Magne Sjaastad
8dfe181cc3 #2455 Non-Darcy Flow : Add support for user defined D-factor 2018-02-16 09:37:55 +01:00
Magne Sjaastad
dda9bd11ea #2455 Non-Darcy Flow : Add fracture width 2018-02-16 09:37:55 +01:00
Magne Sjaastad
e1619d3d62 #2455 Non-Darcy Flow : Show user defined permeability and rename 2018-02-16 09:37:55 +01:00
Magne Sjaastad
cdfe6e3000 #2475 Fractures: Use filename as default name when importing a StimPlan fracture 2018-02-15 15:00:09 +01:00
Magne Sjaastad
8e1a7b2bbb #2455 Non-Darcy Flow : Compute D-factor and show in UI 2018-02-14 13:35:35 +01:00
Magne Sjaastad
646eb8fee4 StimPlan Fracture : Make sure geometry is recomputed when required 2018-02-14 13:07:16 +01:00
Magne Sjaastad
b068296afd #2455 Non-Darcy Flow: Add fields to fracture template 2018-02-09 07:26:51 +01:00
Magne Sjaastad
778119bf62 #2442 Fracture Template : Move more fields from public to protected 2018-02-08 14:02:02 +01:00
Magne Sjaastad
80eefb3141 #2442 Fracture Template : Move several fields from public to protected 2018-02-08 13:17:31 +01:00
Magne Sjaastad
beb122c6d0 System : Fix compiler warning 2018-02-08 13:17:31 +01:00
Bjørn Erik Jensen
7ddfaeb234 #2388 fractures. Support for asymmetric stim plan 2018-02-08 11:05:55 +01:00
Magne Sjaastad
519771cb38 #2447 Fracture : Rename to fractureColors 2018-02-06 12:57:50 +01:00
Magne Sjaastad
a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Magne Sjaastad
d420b74326 Remove unused function 2018-02-06 12:27:55 +01:00
Magne Sjaastad
9734774e21 #2439 Fracture : Set default permeability to 1e5 2018-02-05 20:39:42 +01:00
Magne Sjaastad
bf0b4f68e1 Merge message box fixes into dev, #2443 2018-02-02 14:47:05 +01:00
Rebecca Cox
eef5fe6e55 #2428 Fracture: backwards compatibility of "Show mesh"-toggle 2018-02-02 10:27:58 +01:00
Magne Sjaastad
dc0c6d1b47 #2443 : Remove obsolete includes of QMessageBox 2018-02-02 09:37:00 +01:00
Magne Sjaastad
a4eb16883b #2441: Fracture Colors : Make sure conductivity result is set on template for old project files 2018-02-01 15:37:05 +01:00
Rebecca Cox
5b083bf974 Remove unused include 2018-01-31 16:06:56 +01:00
Rebecca Cox
e50f7bf66f #2428 Fracture: Reorganize Fracture Colors tree item 2018-01-31 15:11:46 +01:00
Rebecca Cox
61d8a76587 #2390 Fracture: Set minimum 10 m perf length 2018-01-31 12:43:42 +01:00
Rebecca Cox
b2bdd996d2 #2389 Fracture: Set perforation length and depth from file values 2018-01-31 12:25:58 +01:00
Bjørn Erik Jensen
b06c3b443b Merge patch to dev. #2277 2018-01-30 14:25:53 +01:00
Bjørn Erik Jensen
e417e3af76 #2277 external files. Improve robustness when importing 2018-01-30 13:48:57 +01:00
Magne Sjaastad
aa6b657027 #2141 : Fracture : Show conductivity result name from file 2018-01-25 14:24:54 +01:00
Magne Sjaastad
6ce0037733 #2141 : Fracture : Make sure a new StimPlan fracture get valid defaults 2018-01-25 14:17:10 +01:00
Magne Sjaastad
430b193437 #2402 Fracture : Compute conductivity scaling for all conductivity variants 2018-01-25 14:17:10 +01:00
Magne Sjaastad
827468b764 #2402 Code cleanup 2018-01-25 14:17:10 +01:00
Magne Sjaastad
001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Magne Sjaastad
5c1f5326a0 #1544 Fracture : Show perforation length for along well path fractures 2018-01-19 15:08:31 +01:00
Magne Sjaastad
53418179ba #1544 Fracture : Add function used to compute perforation length coords 2018-01-19 15:08:31 +01:00
Magne Sjaastad
0674eaefbf #2141 Fracture Legend : Update model when ellipse conductivity changes 2018-01-19 15:08:31 +01:00
Magne Sjaastad
04a91b92f4 Remove unused function 2018-01-19 15:08:31 +01:00
Magne Sjaastad
2da5f8cf54 #2141 Use accumulators to compute min/max used to configure legend 2018-01-19 15:08:31 +01:00
Rebecca Cox
b84812616f Merged from patch-branch to dev-branch 2018-01-18 15:43:27 +01:00
Bjørn Erik Jensen
ac59050824 #2358 Ellipse fracture template. Extracted conductivity method 2018-01-15 13:32:47 +01:00
Magne Sjaastad
523c623d39 #2152 Fracture : Rename UI text 2018-01-15 09:41:00 +01:00
Magne Sjaastad
b2e0f3df31 #2371 Fracture : Update views after change of stimplan xml file name 2018-01-15 09:16:44 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad
9820cb45e4 #2371 Fracture Template : Avoid crash when StimPlan xml fails to load 2018-01-15 08:58:56 +01:00
Magne Sjaastad
5e3bc0e5ee #2152 Fracture : Add color interpolation mode 2018-01-12 14:56:05 +01:00
Magne Sjaastad
fe17d0edd4 Remove unused function 2018-01-12 12:12:03 +01:00
Jacob Støren
67bc555d49 #2367 Fix crash in completion type calculation for wellpaths without geometry 2018-01-12 11:36:41 +01:00
Magne Sjaastad
d25f9d4b67 Use const reference 2018-01-12 10:25:16 +01:00
Magne Sjaastad
9a2eebe8f5 Fracture : Move public fields to protected, and make RimFractureTemplate friend 2018-01-12 10:21:10 +01:00
Bjørn Erik Jensen
65d85b82f7 #2272 fracture. Disable IO for anchor position 2018-01-10 14:43:01 +01:00
Magne Sjaastad
30cbd8018f #2359 Move fields to private, whitespace cleanup 2018-01-10 07:44:53 +01:00
Magne Sjaastad
49eebd0c28 #2359 Fracture : Adjust default parameters for ellipse fracture 2018-01-10 07:44:53 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Magne Sjaastad
b598bdf86c #2315 Add missing include of cmath 2018-01-05 11:38:58 +01:00
Bjørn Erik Jensen
4cdc109ec3 #2315. Replaced abs() by fabs() where relevant 2018-01-05 09:29:53 +01:00
sigurdp
5af63f7abd #2295 Guard against null pointer when setting fracture template 2018-01-03 11:50:34 +01:00
sigurdp
f940d0a3d5 #1753 Fracture: Reworked visualization of StimPlan fractures to limit surface tesselation to area with actual values instead of relying on transparency. Done to allow picking on items behind the fracture. Refactored and removed obsolete code related to StimPlan fracture visualization. 2018-01-03 11:13:15 +01:00
Bjørn Erik Jensen
44639ef529 #2291 Fishbones. Always two decimals on single depth value fields 2018-01-02 09:58:38 +01:00
Bjørn Erik Jensen
1d3a31d61f #2279 Fishbones. Default spacing is now 12.5. Place fishbone near well path end if no coordinates are specified 2017-12-22 09:53:08 +01:00
Bjørn Erik Jensen
12e95c37a6 #2140 Fracture colors. Set default result to Conductivity when selecting template 2017-12-20 13:14:43 +01:00
sigurdp
dbd1265f31 #1873: Changed naming scheme when exporting laterals. Make sure fishbone name is exported and be more explicit in the enumeration of the subs and laterals. 
Refactored RimFishbonesMultipleSubs so that it is clear that the fishbone instances only have auto generated names based on their current index.
 2017-12-19 11:06:28 +01:00
Bjørn Erik Jensen
5c4a250c44 #1870, #1871 Fishbones. Switch PdmField type from size_t to int due to non existing size_t pdm editor 2017-12-19 10:54:39 +01:00
sigurdp
f74dc80838 #1870 For fishbones, clamp values so that start MD and end MD always consitutes a valid range where start MD <= end MD 2017-12-19 09:34:23 +01:00
Magne Sjaastad
ed013c6eb9 #2265 Xml Keywords : Several rename to fracture template and fracture collection 2017-12-18 07:13:58 +01:00
Magne Sjaastad
56016ff23a #2265 Disable IO for ui only field 2017-12-18 07:13:58 +01:00
Magne Sjaastad
25979122d5 #2265 Disable IO for ui only field, start keywords with upper case 2017-12-18 07:13:58 +01:00
Magne Sjaastad
4a8d19c238 Guard null pointer access 2017-12-18 07:13:58 +01:00
Magne Sjaastad
78be5b351e Remove asserts from defineEditorAttribute 2017-12-18 07:13:58 +01:00
Magne Sjaastad
e10c7fd633 #2265 Xml Keywords : Remove fishbones prefix 2017-12-18 07:13:58 +01:00
sigurdp
96b5a02872 #1861 Set default build-angle to 1.83 deg/ft for models with FIELD units 2017-12-15 13:30:13 +01:00
Jacob Støren
7e820cd251 #1858 General refactoring as preparations. Renaming Whitespace change. Remove obsolete code. 2017-12-12 16:32:57 +01:00
Jacob Støren
3a1939d460 #1858 Renaming and whitespace as preparations 2017-12-12 12:47:05 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Rebecca Cox
7da8e3091b #1996: Rename RimEclipseWellCollection -> RimSimWellInViewCollection 2017-10-17 09:52:31 +02:00
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