167 Commits

Author	SHA1	Message	Date
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