OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 01:13:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,347 Commits 28 Branches 61 Tags 291 MiB
f1d017f1a4
Commit Graph

985 Commits

Author SHA1 Message Date
Rebecca Cox
7222a6ba46 Fix colors on tensor glyphs 2018-02-12 13:06:56 +01:00
Jacob Støren
c3c2dfc678 #2337 Made EdgeAxis overly item more robust. Some cleanup and renaming. 2018-02-12 10:07:07 +01:00
Jacob Støren
c6846f0d57 Fix linux compile issues 2018-02-09 16:47:24 +01:00
Jacob Støren
068adf6aa2 #2337 Fix crash when having too few tickmarks. Some rename 2018-02-09 14:09:41 +01:00
Jacob Støren
911571e267 #2337 Window Edge axis overlay item working. 2018-02-09 14:08:55 +01:00
Rebecca Cox
c3ea8f3415 2344 Tensor vectors: Code cleanup 2018-02-09 11:44:42 +01:00
Rebecca Cox
f747c22fd3 #2344 Tensor vectors: Avoid creating vectors of Infinity result values 2018-02-09 10:10:09 +01:00
Rebecca Cox
bd0d23520b #2344 Tensor Vectors: Vector visualization code 2018-02-08 16:43:18 +01:00
Bjørn Erik Jensen
7ddfaeb234 #2388 fractures. Support for asymmetric stim plan 2018-02-08 11:05:55 +01:00
Jacob Støren
bd14c65678 #2334 Add visualization of well paths and simulation wells to Intersection Views. 2018-02-07 11:44:38 +01:00
Jacob Støren
59b0a4bd1e Remove obsolete code 2018-02-06 14:55:55 +01:00
Magne Sjaastad
519771cb38 #2447 Fracture : Rename to fractureColors 2018-02-06 12:57:50 +01:00
Magne Sjaastad
4fdb7671a8 #2431 : Removed obsolete struct 2018-02-06 11:09:22 +01:00
Magne Sjaastad
67da4af831 #2431 : Use const ref and nullptr 2018-02-05 20:12:22 +01:00
Magne Sjaastad
b69fc78361 #2431 : Remove Rim3dView from function parameters 2018-02-05 20:12:22 +01:00
Magne Sjaastad
cd575ef9c1 #2431 : Use well path part manager in Rim3dView 2018-02-05 20:12:22 +01:00
Magne Sjaastad
5919cb20fb #2431 : Refactor of well part manager 2018-02-05 20:12:22 +01:00
Magne Sjaastad
0679ec4ba5 #2431 : Add part manager for all well paths WIP 2018-02-05 20:12:22 +01:00
Jacob Støren
e8b29f7279 #2334 Add polyline visualization to 2D intersection view as a preparation for showing the main well. 2018-02-05 17:57:20 +01:00
Jacob Støren
29ac24f3dd #2426 Add working legends to 2D intersection Views. Refactor to make legend update code work from a separate view with separate legend configs. Make sure legend and results are updated as the main view is updated. Adjust legendconfig->setTitle to use QString 2018-02-02 07:48:27 +01:00
Rebecca Cox
e50f7bf66f #2428 Fracture: Reorganize Fracture Colors tree item 2018-01-31 15:11:46 +01:00
Jacob Støren
02f6b95959 #2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience 2018-01-26 11:19:15 +01:00
Magne Sjaastad
aa6b657027 #2141 : Fracture : Show conductivity result name from file 2018-01-25 14:24:54 +01:00
Magne Sjaastad
6ff354c7ec Fix signed/insigned compare 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
001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Bjørn Erik Jensen
9cfd2ff3cf #2358 fracture. When clicking on an ellipse fracture, display info in result into panel 2018-01-23 14:30:58 +01:00
Bjørn Erik Jensen
1c668ce3b4 #2358 fracture. Display values in resultInfo panel when clicking on stim plan fracture cell 2018-01-23 14:14:40 +01:00
Magne Sjaastad
759d46813d #1544 Fracture Perforation Length : Set color to deep green 2018-01-22 13:00:11 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Magne Sjaastad
9a420183e1 Remove unused code 2018-01-22 11:09:37 +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
c7d61ed7f4 #1544 : Move well path radius to RimWellPath 2018-01-19 15:08:31 +01:00
Magne Sjaastad
8e5bcef7c7 #1544 Removed unused functions and other minor improvements 2018-01-19 15:08:31 +01:00
Magne Sjaastad
ef3d9f1095 #2141 Fracture Legend : If conductivity, use legend to set ellipse fracture color 2018-01-19 15:08:31 +01:00
Magne Sjaastad
b53603e906 Use range based for 2018-01-17 09:23:45 +01:00
Magne Sjaastad
0ecfdeee6b Reorder functions, remove unused function 2018-01-17 09:23:45 +01:00
Magne Sjaastad
1523ce55f0 #2150 Fracture : Duplicate fracture geometry for along well pipe fractures 2018-01-17 09:23:45 +01:00
Magne Sjaastad
673ae6b1ff #2150 Fracture : Create two parts of fracture geometry 2018-01-17 09:23:45 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Bjørn Erik Jensen
ee50b0492d #2151 fractures. Turn on/off fractures in views by toggling fracture colors 2018-01-15 09:24:19 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad
e5aaf73a84 #2152 Fracture : Add StimPlan cell element color 2018-01-15 08:58:56 +01:00
Rebecca Cox
3b46849c79 Fix warning 2018-01-12 16:14:30 +01:00
Magne Sjaastad
ff03820a19 #2152 Minor refactoring 2018-01-12 14:56:05 +01:00
Rebecca Cox
e4e160cdd4 #2347 Elm Props: Evaluate result type ELEMENT for Intersections 2018-01-11 11:35:08 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
sigurdp
9b38e9f9c2 #1880: Fixed visualization so that completions and well paths are visible through transparent cells 2018-01-03 14:27:17 +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
82d8b7c98a #2295. Guard for null frac template where it is being used 2018-01-02 12:54:10 +01:00
Magne Sjaastad
4956604a86 #2288 Fracture Viz : Do not show fracture attached to an invisible well path 2017-12-22 13:43:35 +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
Rebecca Cox
c90715d038 Fix linux error 2017-12-04 12:08:29 +01:00
Rebecca Cox
8ab70887c3 #2219 Intersections: Fix max height of intersection bug 2017-12-04 10:56:57 +01:00
Rebecca Cox
c47f5e413f #2162 Context manu: Remove const from RimIntersectionBox pointer 2017-11-29 14:57:04 +01:00
Rebecca Cox
58550817a0 #2162 Context menu: Remove const from RimIntersection pointer 2017-11-29 14:57:04 +01:00
Rebecca Cox
5fdb5f00ad Remove a comment 2017-11-24 15:19:43 +01:00
Rebecca Cox
181871f970 #2122 Intersection clip surface on tighter bounds than bounding box 2017-11-24 15:18:25 +01:00
Unknown
e765a9ad59 #2175 Intersection: Set length in two directions 2017-11-24 15:18:25 +01:00
Unknown
ef52927795 #2175 Intersection: Make extrude length option on azimuth, dip plane 2017-11-23 15:20:14 +01:00
Unknown
89f67c053f #2121 Intersections: Highlight polyline on Azimuth/dip plane creation 2017-11-23 15:20:14 +01:00
Rebecca Cox
75c506e257 #2109 Remove automatic color on well labels on background change 2017-11-13 07:55:22 +01:00
Rebecca Cox
c49db44909 #1490 Simulation well: Remove well head if it does not have perforations 2017-11-08 11:22:51 +01:00
Rebecca Cox
de8b953360 #2094 Move annotation functions from updateGridBoxData to new function 2017-11-08 09:07:44 +01:00
Rebecca Cox
93a83cd756 #2094 Update well name color in 3d view (not sim well) 2017-11-08 09:07:44 +01:00
Rebecca Cox
f3b7f0abd6 #1392 Improve Dark 3D-View background support 2017-11-07 15:08:32 +01:00
Magne Sjaastad
6aaa8f7606 #2067 NNC : Guard before accessing values 2017-10-31 10:22:20 +01:00
Rebecca Cox
adf55ec762 #1987 Time Step Filtering: Support dynamic NNC data time step filtering 2017-10-19 09:57:10 +02:00
Rebecca Cox
9bd556a1b9 #1996 Remane RimFieldCollection -> RimFaultInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
97e60ab5f2 #1996: Rename RimFault -> RimFaultInView 2017-10-17 09:52:31 +02: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
Jacob Støren
dc1844f5d5 #1901 Use the more robust WellLogExtraction system for perforation interval intersection calculations. 2017-09-19 17:20:49 +02:00
Jacob Støren
d4315f7ccf #1901 Fix wrong calculation of perforation points along wellpath 2017-09-18 16:24:29 +02:00
Magne Sjaastad
908545c669 CppCheck : Add missing initialization of pointer 2017-09-07 20:55:02 +02:00
Bjørnar Grip Fjær
5ead49e01e #1807 Add option to use visible cells in view as region selection in flow characteristics plot 2017-08-24 09:28:05 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad
5775c3bb20 Remove duplicate definitions of file names 2017-08-11 14:24:54 +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
7e3e538a43 #1662 Octave interface to push generated NNC values back into ResInsight 2017-08-08 13:13:05 +02:00
Jacob Støren
2d9f48d715 Whitespace and typo 2017-08-08 13:12:18 +02:00
Bjørnar Grip Fjær
156401d0db #1703 Add interpolation when well path clipping to ensure well path is actually visible 2017-08-07 11:41:13 +02:00
Bjørnar Grip Fjær
cb06ce11bb #1682 Respect disable result lighting for NNC results 2017-08-04 16:30:21 +02:00
Magne Sjaastad
3c5016cb8c #1724 Fix merge issues 2017-08-04 10:45:04 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Magne Sjaastad
88186619db #1724 Apply fix on dev branch 2017-08-04 10:31:55 +02:00
Magne Sjaastad
6ddfab6823 #1724 Removed unused code 2017-08-04 10:24:30 +02:00
Magne Sjaastad
1adba2caf7 #1724 Removed unused code 2017-08-04 10:21:07 +02:00
Magne Sjaastad
e35bcf1f58 #1724 Fix mapping from picked triangle index to segment index 2017-08-04 10:07:53 +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
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
Bjørnar Grip Fjær
de414c4277 #1645 Load dynamic NNC results from restart file 2017-06-26 10:25:08 +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
Jacob Støren
7d7172f811 #1646 Fix disappearing mesh lines by using double transformation calculations 2017-06-23 10:16:39 +02:00
Jacob Støren
63cf1e91b3 #1440 Split fracture coloring from geometry generation 2017-06-22 14:55:16 +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
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
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
8e47d82038 Improve layout in header file 2017-06-20 15:01:30 +02:00
Magne Sjaastad
b9ee3d6d4a Add const and remove dependency to RimView 2017-06-19 22:53:19 +02:00
Magne Sjaastad
210bdab4c3 Remove scale transform 2017-06-19 22:15:28 +02:00
Magne Sjaastad
994198d388 Add characteristicCellSize to RimView 2017-06-19 20:55:58 +02:00
Magne Sjaastad
6cd0f0ebd2 #1440 Use view as basis for appending dynamic parts 2017-06-16 08:56:02 +02:00
Magne Sjaastad
e50f876cf0 Add infrastructure for dynamic parts to well path part managers 2017-06-15 14:07:04 +02:00
Jacob Støren
1911092cb7 Merge dev into pre-proto 2017-06-14 23:25:55 +02:00
Bjørnar Grip Fjær
c4172d4c19 #1601 Completion Type : Show undefined as gray 2017-06-14 12:41:52 +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
d8d2aaed5f #1585 More rename and code reordering of StimPlanFractureTemplate 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
Jacob Støren
dceae0581e #1585 Major renaming of fracture related methods and members 2017-06-09 17:21:59 +02:00
Magne Sjaastad
96981d1ab4 Fix mix of signed / unsigned compare 2017-06-09 15:55:47 +02:00
Magne Sjaastad
5f20ef1a0a #1568 Add checkbox to well path fracture collection 2017-06-09 10:33:50 +02:00
Magne Sjaastad
10b7aa4e32 #1570 Improve robustness and readability 
Add tests for empty geometry
Clear all parts in clearGeometryCache
 2017-06-07 14:46:54 +02:00
Magne Sjaastad
29e1b10bcd #1572 Do not show polygon for ellipsis fracture 2017-06-07 11:17:56 +02:00
Jacob Støren
2d85f1f1c5 Merge branch 'dev' into pre-proto 2017-06-05 11:40:13 +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
Bjørnar Grip Fjær
e5b7196537 #1520 Show completion type cells as transparent 2017-06-01 13:46:22 +02:00
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +02:00
astridkbjorke
406bf96f3f #1487 RigFractureGrid inherits from cvf::Object, and RimStimPlanFractureTemplate fractureGrid() is returning a pointer 2017-05-30 14:57:21 +02:00
astridkbjorke
a8b6543c3c #1487 Renaming RigStimPlanFracTemplateCell to RigFractureCell 2017-05-30 11:52:19 +02:00
astridkbjorke
8cf5f6983f #1487 Renaming. Removing stimPlan from names in RigFractureGrid 2017-05-30 11:35:52 +02:00
astridkbjorke
8ca5a5a90a #1487 - pre-proto - Adding class RigFractureGrid, which now holds RigStimPlanFracTemplateCells and functions for accessing these. 2017-05-29 14:16:45 +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
a72658a88d Trigger redraw when fishbone collection checkbox is manipulated 2017-05-22 11:29:13 +02:00
Magne Sjaastad
5ec2764c16 #1495 Add 'Completions' folder to RimWellPath 
Move perforation intervals into folder
Move fishbone definitions and fishbone well paths into folder
 2017-05-19 15:44:32 +02:00
Magne Sjaastad
fd254565e6 #1495 Rename to FishboneWellPath and FishboneWellPathCollection 2017-05-19 13:47:44 +02:00
Jacob Støren
503713354f Remove unneccessary use of AppEnum 2017-05-16 16:00:13 +02:00
Magne Sjaastad
43e50bd8d2 Updated copyright headers 2017-05-16 12:49:36 +02:00
astridkbjorke
c6b329ea00 pre-proto - Rename RigStimPlanCell to RigStimPlanFracTemplateCell 2017-05-15 14:20:18 +02:00
Bjørnar Grip Fjær
813b8ecad2 #1470 Interpolate perforation visualization between well path points 2017-05-12 10:44:34 +02:00
Bjørnar Grip Fjær
a399f54ed7 #1470 Fishbones : Perforation intervals visualization 2017-05-12 10:02:00 +02:00
Bjørnar Grip Fjær
0bc423a0d1 Remove unused code 2017-05-11 11:15:13 +02:00
Bjørnar Grip Fjær
b81150829a #1471 Completions visualization 2017-05-10 17:10:23 +02:00
Magne Sjaastad
b0c5ceeab6 #1442 Moved geometry functions to RigFishbonesGeometry 2017-05-08 08:00:55 +02:00
Magne Sjaastad
a85883228c Fishbones : Extract method for computing lateral coords 2017-05-05 15:09:22 +02:00
Magne Sjaastad
710236f7f5 #1450 Use x-axis as lateral start axis if well path is close to z-axis 2017-05-05 13:32:50 +02:00
Magne Sjaastad
414733899e Fishbones : Add model and visualization 2017-05-05 12:23:29 +02:00
Magne Sjaastad
2dcf3c75f5 Fishbones : Propagate displayCoordTransform to well path part manager 2017-05-05 12:18:37 +02:00
Magne Sjaastad
a8cab547a0 1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-05-05 12:18:10 +02:00
Jacob Støren
f40cf3a9b7 #1427 Apply specific changes from pre-proto regarding selection in 3D 
To be used for transporting branch index from 3D context menu operation to feature.
 2017-04-25 16:12:55 +02:00
astridkbjorke
4295928af6 pre-proto - Fix for loading projects with saved stim plan fractures with multiple time steps 2017-04-07 12:41:06 +02:00
astridkbjorke
7646b3fcf0 #1410 - pre-proto - stimplan timestep set to readonly for fracture and value is taken from fracture template. 2017-04-07 11:02:31 +02:00
astridkbjorke
50f71a873e #1409, #1410 - pre-proto - Using parameter from FractureColor and units based on parameter/unit system when setting up RigStimPlanCells, and using fromer polygonTimeStep as timestep for setting up RigStimPlanCells 2017-04-07 10:17:17 +02:00
astridkbjorke
b73e2bb63b pre-proto - Refactoring. Vector of RigStimPlanCells is now being owned by RimStimPlanFractureTemplate 2017-04-06 09:34:38 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
astridkbjorke
054f35c5ac Pre-proto - Renaming RimStimPlanCell -> RigStimPlanCell 2017-03-29 10:18:14 +02:00
astridkbjorke
520ab45649 1363 - pre-proto - Creating class StimPlanCell and using this class when displaying stimPlan mesh on fracture 2017-03-27 14:19:21 +02:00
astridkbjorke
28a794cc40 #1320 - pre-proto - Performing artithmetric upscaling of stimPlan values. 2017-03-27 10:16:00 +02:00
astridkbjorke
ffeb50b06a #1320 - pre-proto - Prototyping calculation of upscaled parameter values from stimPlan. Bug in calculation so output values are wrong. 2017-03-27 10:06:42 +02:00
Magne Sjaastad
c513326b7d Perfromance : Compute polygon outside loop when building mesh 2017-03-22 07:46:38 +01:00
Jacob Støren
2fb35af7a6 #1335 Connection arrows for all cross-flows also. Made ready for options to show straight arrows, and adjusted a bit. 2017-03-17 18:11:06 +01:00
Jacob Støren
c77741f3ab Exclude Well Communication lines that have exact 0 flux. 
In waiting for a GUI-adjustable tolerance.
+ some rename
 2017-03-17 09:46:49 +01:00
Jacob Støren
f0331e02c9 #1325 Always show the communication lines related to a visible well (When they are on) 2017-03-17 09:34:52 +01:00
astridkbjorke
f8b246bdf3 #1274 - pre-proto - Fix in which cells that is shown. 2017-03-16 14:53:44 +01:00
astridkbjorke
654bbb38e3 #1274 - pre-proto - Showing lines between nodes instead of though nodes (different interpretation of what the grid is...) 2017-03-16 13:21:11 +01:00
astridkbjorke
fe01fe2751 #1274 - pre-proto - showing stimPlan mesh 2017-03-16 12:02:07 +01:00
Jacob Støren
983db61402 #1114 Use "Disable Lighting" on well communication lines also. 2017-03-15 10:53:25 +01:00
Jacob Støren
c7207afcc2 #1114 Improved communication lines geometry. Added normals 2017-03-15 10:39:35 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Jacob Støren
1a42af5b37 #1114 First working well communication lines operative 2017-03-14 19:21:55 +01:00
Jacob Støren
d4c14d0f53 #1114 WIP: Moved pipe radius, and well head position calculations to RimEclipseWell as preparation for well pair lines. 2017-03-14 19:17:14 +01:00
Jacob Støren
4c8e1e2bcd #1114 WIP: Refactor: Removed RivReservoirWellSpheresPartMgr 2017-03-13 11:35:49 +01:00
Jacob Støren
d34b4e3c05 #1114 WIP: Added field in Sim Well Collection, renamed a bit as preparations 2017-03-13 11:05:46 +01:00
Magne Sjaastad
6c6049a317 #1282 Mesh lines : Use LEQUAL for depth test to make sure highest pri is visible 2017-03-08 14:27:02 +01:00
Jacob Støren
b5e782dfc3 #1292 Fixed CppCheck Issues in ModelVisualization 2017-03-06 11:20:28 +01:00
Jacob Støren
4312968124 Removed CppCheck Warnings 2017-03-03 17:09:30 +01:00
Magne Sjaastad
f7521ad12f Merged branch pre-proto into pre-proto 2017-03-02 11:48:35 +01:00
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ResInsightVersion.cmake
 2017-03-02 11:46:25 +01:00
astridkbjorke
2811e5aa4d #1272, #1271 - pre-proto - Adding field for setting unit system for fracture, and converting geometry/polygon between unit systems 2017-03-02 11:43:41 +01:00
Magne Sjaastad
68ff093c61 #1266 If not computed, compute staticWellCellPath when needed 2017-03-01 14:23:01 +01:00
Magne Sjaastad
e29c6474bd Minor refactoring 2017-02-28 19:17:36 +01:00
Magne Sjaastad
be6a2e0d39 #1243 Improved how enclosing polygon is visualized 2017-02-28 18:41:58 +01:00
astridkbjorke
c2c3145e5a #1243 - pre-proto - Adding visualization of polygon output for stimplan fractures 2017-02-28 14:28:14 +01:00
Magne Sjaastad
8ce430cb25 #1242 Hide opacity level and discard transparent fragments 2017-02-27 22:21:37 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
85228ee39c #1255 Removed includes from RimWellPath 2017-02-24 14:31:06 +01:00
Magne Sjaastad
1792290ef0 #1255 Removed includes from RivReservoirWellSpheresPartMgr 2017-02-24 13:48:19 +01:00
Magne Sjaastad
6e960e74c3 #1255 Removed includes in Riv classes 2017-02-24 13:34:25 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
2ce28ffff0 #1251 Use RivObjectSourceInfo for fractures 2017-02-23 11:53:26 +01:00
Magne Sjaastad
555ecba8b3 #1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-02-23 11:52:56 +01:00
Magne Sjaastad
f59c4b4b9e #1242 Do not use transparency on ellipse, default transparency set to 1.0 2017-02-23 11:25:21 +01:00
Magne Sjaastad
7f75f7e509 #1252 Add and use transparent color for both ellipse and stim plan objects 2017-02-23 10:15:56 +01:00
Magne Sjaastad
139590760f #1240 Added checbox to StimPlan Colors 2017-02-22 15:32:19 +01:00
Magne Sjaastad
73690e6d66 #1239 Do not show fracture when fracture is unchecked 2017-02-22 13:29:20 +01:00
astridkbjorke
c84f4efbb1 #1138 - pre-proto - Adding field in RimStimPlanColors for transparency 2017-02-20 13:24:22 +01:00
Magne Sjaastad
ad3270e513 #1230 Use part priority system 2017-02-20 11:10:03 +01:00
Magne Sjaastad
bdbb110ca4 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/CMakeLists_files.cmake
	ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
 2017-02-20 11:07:46 +01:00
Magne Sjaastad
b510979151 #1230 Use transparent on low values 2017-02-20 11:03:18 +01:00
Magne Sjaastad
b7aebbb392 #1230 Created StimPlan colors and show lenged in 3D view 2017-02-20 09:31:24 +01:00
Magne Sjaastad
fb93fbbcc8 #1233 Improve system for setting part priorities 2017-02-18 12:38:15 +01:00
Magne Sjaastad
52615de9a3 #1194 Add some space between end of pipe and wel head arrow 2017-02-18 12:38:15 +01:00
astridkbjorke
1b99c25297 #1138 - pre-proto - Added possibility to visualize all properties in input XML stimPlan file 2017-02-17 14:14:49 +01:00
astridkbjorke
fa638243ab #1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates). 2017-02-17 10:11:32 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
 2017-02-16 10:18:39 +01:00
astridkbjorke
8a603c7f73 #1138 - pre-proto - Using legend config for controlling colors of stimPlan fracture 2017-02-16 09:15:23 +01:00
Magne Sjaastad
f323aa05e4 #1194 Well Head : Larger size for pipe part 2017-02-16 07:30:18 +01:00
Magne Sjaastad
18f77e16b5 #1194 Increased size of arrow head for well head 2017-02-16 07:15:01 +01:00
Magne Sjaastad
a29fe1f7c1 Fixed #1223, now pipe can also be rendered without lighting 2017-02-15 15:55:24 +01:00
astridkbjorke
3ae816a9aa #1138 - pre-proto - Re-reading data from files when opening stored project. Re-generating geometry when updating values for time-step / parameter to show from stimPlan-file. 2017-02-15 15:49:53 +01:00
astridkbjorke
bcd3009066 #1138 - pre-proto - Showing data from stimPlan-file on fracture 2017-02-15 15:14:16 +01:00
Magne Sjaastad
43faf00cfa #1194 Use slightly larger pipe radius for open wells 2017-02-15 08:14:29 +01:00
Magne Sjaastad
41836a4930 #1138 Added test code for texture scalar mapping 2017-02-14 10:29:25 +01:00
Magne Sjaastad
093e02287a Fixed missing include 2017-02-13 15:33:42 +01:00
Magne Sjaastad
2ee25c6cf5 Use triangleIndices instead of polygonIndices 2017-02-10 11:32:18 +01:00
Magne Sjaastad
8fffc53629 #1180 Use RiaColorTables and deleted RivColorTableArray 2017-02-10 08:36:32 +01:00
Magne Sjaastad
9753e8b242 #1194 Use larger geometry for open wells for spheres and well head 2017-02-08 14:26:28 +01:00
Magne Sjaastad
9c5f3732b4 #1189 Use gray for closed sphere connections 2017-02-08 13:45:37 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Jacob Støren
76bc449d1f #1161 and #1188 Fixed problems with last MSW segments. Two errors: missing last segment ID, and missing drawing the last pipe segment. 2017-02-07 10:53:48 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
 2017-02-03 10:51:46 +01:00
Magne Sjaastad
0633e6ca39 Fixed mix of signed and unsigned value compare 2017-02-03 10:14:02 +01:00
Magne Sjaastad
9493a1dfc0 Use hasWellResult instead of firstResultTimeStep 2017-02-02 12:52:32 +01:00
Magne Sjaastad
49e0709dc6 #1158 Fixed position of well path fractures after scale change 2017-02-01 14:54:02 +01:00
Magne Sjaastad
a4ce5f532d #1148 Use tristate to indicate visibility of simulation well geometry 2017-02-01 09:52:01 +01:00
Magne Sjaastad
ddd72b4866 #1148 Added well head scale factor to EclipseWell 2017-02-01 09:52:01 +01:00
Magne Sjaastad
301c36d809 #1148 Always show connection status color for well spheres 2017-01-30 14:50:45 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
 2017-01-26 14:30:13 +01:00
Magne Sjaastad
d0f613520e #1078 Added possibility to show/hide connection status colors 2017-01-26 14:25:34 +01:00
Magne Sjaastad
f9a9040ed5 #1078 Added show pipe and show spheres to well collection 2017-01-26 10:27:23 +01:00
Magne Sjaastad
8304cb0393 #1078 Added showWellsIntersectingVisibleCells 
Obsoleted wellPipeVisibility and removed wellSphereVisibility
 2017-01-26 08:12:28 +01:00
Magne Sjaastad
c4d4d03cee #1078 Added well head control to RimEclipseWell plus rename and reorder 2017-01-26 07:23:18 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
Jacob Støren
0d7da9788a #1112 Made conveninece methods to calculate well pipe centerline, and added possibility to do it pr timestep. 2017-01-20 17:20:09 +01:00
Jacob Støren
06b9f13e41 #1112 Well centerline with cell centers improved, and moved to centerline calculator 2017-01-20 15:57:04 +01:00
Magne Sjaastad
da371c099b Merged branch dev into pre-proto 2017-01-19 10:45:22 +01:00
Magne Sjaastad
9b42f1ca8c Reverted 4ec7c97a77 
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
 2017-01-19 10:37:59 +01:00
Magne Sjaastad
74fc8458ed Refactored visualization : One part manager for each fracture 2017-01-19 07:28:04 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-01-18 12:19:07 +01:00
Magne Sjaastad
539db3cc52 #1128m Cleaned up includes 2017-01-18 09:56:42 +01:00
Magne Sjaastad
8786b863dd #1128 Use well color along pipe in undefined sections 2017-01-18 09:44:48 +01:00
Magne Sjaastad
f5000766c4 #1077 Added option to draw simulation well pipes from center to center 2017-01-18 08:06:03 +01:00
Magne Sjaastad
e0ba009e34 Cleaned up includes 
Removed includes to cvfLibCore and friends. Removed several includes from header files.
 2017-01-17 15:11:02 +01:00
Magne Sjaastad
bdeb2b5584 Cleaned up includes 2017-01-17 14:27:30 +01:00
Magne Sjaastad
c11daf88fa #1127 Now possible to select well by clicking on well head geometry 2017-01-17 14:18:03 +01:00
Magne Sjaastad
a91636ac8b #1127 Select sim well when clicking on well head 2017-01-17 13:33:24 +01:00
astridkbjorke
63e975f6ff pre-proto - Rename (and adding todo-s for further work) 2017-01-12 10:24:01 +01:00
Magne Sjaastad
4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
Magne Sjaastad
f16228ecc5 #1056 Added support for flow data for cell edge in 3D view 2017-01-11 15:03:39 +01:00
Magne Sjaastad
6dd3db4d97 #1101 Compute surface normals 2017-01-11 08:02:23 +01:00
Magne Sjaastad
866fb92d5f #1101 Do not use transparency on fracture 2017-01-11 07:08:18 +01:00
Magne Sjaastad
bb89994dbc #1101 Added azimuth 2017-01-10 10:53:54 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
 2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
93032a23eb #1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
0fd3bc8865 #1068 Access mainGrid directly from RimEclipseView 2017-01-09 10:51:06 +01:00
astridkbjorke
3f052976f5 #1040 - pre-proto - Converting facture coordinates to display coordinates for visualization. Fractures not yet shown at correct possition. 2017-01-06 15:55:53 +01:00
astridkbjorke
a5e8001745 #1044 - pre-proto - Fixed eternal loop 2017-01-04 09:28:10 +01:00
astridkbjorke
fe9ac8f908 #1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well 2017-01-04 09:28:10 +01:00
Magne Sjaastad
a64c1dd447 Fixed missing includes 2017-01-04 09:26:39 +01:00
Magne Sjaastad
d1bf189154 #1040 Established basis for fracture visualization 2017-01-04 08:10:02 +01:00
Magne Sjaastad
51e8cae11b Added branch index to source info as basis for more work on #1044 2017-01-03 11:11:36 +01:00
Magne Sjaastad
276eaf0f33 Rename 2017-01-03 10:09:57 +01:00
Jacob Støren
fd604f844b #1035 Removed obsolete code, and used the createFromResultDefinition method in CellEdge and property filter 2016-12-15 07:47:54 +01:00
Jacob Støren
ec5ad417f3 #1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come. 2016-12-14 14:51:53 +01:00
Magne Sjaastad
860b51931c #1025 Removed unsused code and renamed to isWellPipe/SpheresVisible 2016-12-14 07:15:44 +01:00
Magne Sjaastad
5aeb737795 #1025 Refactored visibility to handle both well cell pipes and well cell spheres 2016-12-13 09:35:01 +01:00
astridkbjorke
8e81c53520 #1025 Code cean-up. Removed obsolete scaletransform for cell center spheres. 2016-12-12 11:03:37 +01:00
astridkbjorke
21a8acdb76 #1025 Replaced check-box with enum for showing cell center spheres 2016-12-12 11:03:37 +01:00
astridkbjorke
829c775f63 #1025 Added Show well spheres check-box option for each well 2016-12-12 11:03:37 +01:00
Magne Sjaastad
9e6575633f #1025 Avoid mix of shader based rendering and fixed function rendering for DrawableVectors, this causes artifacts 2016-12-08 15:11:35 +01:00
astridkbjorke
fa47587f71 #1025 Updated so that cell center spheres are visible also with well visibility set to all off 2016-12-08 14:06:36 +01:00
astridkbjorke
bb2fb88858 #1025 Updated drawing of cell center spheres to use DrawableVectors (one part for all spheres) 2016-12-08 13:32:19 +01:00
astridkbjorke
cd6494cc0c #1025 Created well cell center spheres group box and added sphere radius controls 2016-12-08 09:59:45 +01:00
astridkbjorke
916ab51df4 #1025 Only showing cell center sphere if well is visible 2016-12-08 09:59:45 +01:00
Magne Sjaastad
374b44060d #1025 Guard against invalid grid index and invalid cell index 2016-12-08 09:54:51 +01:00
astridkbjorke
a485c23773 #1025 Fixes after merge conflict 2016-12-07 15:26:01 +01:00
astridkbjorke
df46e626c9 #1025 Setting colour of cell center spheres based on well type 2016-12-07 15:18:48 +01:00
Magne Sjaastad
3922d51790 #1025 Use DisplayCoordTransform for coordinate transformations 2016-12-07 14:41:48 +01:00
astridkbjorke
600f3da30a #1025 Established geometry for all well cell centers 2016-12-07 12:06:24 +01:00
astridkbjorke
1801e49105 #1025 Establish base code structure 2016-12-07 12:06:24 +01:00
Magne Sjaastad
f688a89262 #945 Do not use Inactive to show fault label parts 2016-11-21 13:29:07 +01:00
Magne Sjaastad
7d52242285 #945 Use visible grid parts to force watertight faults 2016-11-21 13:13:53 +01:00
Magne Sjaastad
5fb209f27b #944 Added clear of watertight flag 2016-11-21 13:13:53 +01:00
Magne Sjaastad
e89b73d64c #945 Removed flag as watertight flag was always set true 2016-11-18 14:05:50 +01:00
Magne Sjaastad
8344617ba9 #945 Improved handling of visible fault geometry when showing faults outside filters 2016-11-18 13:57:01 +01:00
Magne Sjaastad
8deeba66d5 #945 Added possibility to force watertight flag for property filter geo 2016-11-18 13:57:01 +01:00
Magne Sjaastad
c52e1809ab #992 Fixed invalid access of nullpointer for property filtered geometry 2016-11-18 10:49:06 +01:00
Magne Sjaastad
3ba7ade88e #945 Rename 2016-11-18 10:49:06 +01:00
Magne Sjaastad
c0309b4368 Added comment 2016-11-17 10:05:00 +01:00
Jacob Støren
d2d9d43ca1 #942 Added plane Azi and Inc angles as result values. 2016-11-01 12:05:22 +01:00
Jacob Støren
c93c7e41df #933 Fixed the closes result for intersections also. Display the tensor data from the closest element node transformed onto the plane. 2016-10-26 17:14:33 +02:00