OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-15 10:03:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,089 Commits 26 Branches 61 Tags 309 MiB
803e6cd2b4
Commit Graph

1064 Commits

Author SHA1 Message Date
Gaute Lindkvist
2035df2739 #3492 Tidy up color code for well path components/completions and select colors that work better. 2018-10-12 15:05:22 +02:00
Gaute Lindkvist
256e5de30c Fix crash in RivWellPathPartMgr following valve updates 2018-10-11 12:46:10 +02:00
Gaute Lindkvist
f85e1bdb98 #3441 Slight tweaks to casing shoe 3D-look and added Packers. 2018-10-11 11:33:45 +02:00
Gaute Lindkvist
e7a39fb2f8 #3441 Valve visualisation in 3D view. 2018-10-11 11:18:11 +02:00
Magne Sjaastad
9d9771295f System : Replace NULL with nullptr 2018-10-10 10:17:27 +02:00
Bjørn Erik Jensen
063b7121b1 #3289 Well path creation. When clicking on a well path, use tangent. Rename arguments 2018-10-01 10:08:09 +02:00
Magne Sjaastad
09baef3e1c Remove local variable definition shadowing other variable 2018-09-28 09:39:10 +02:00
Magne Sjaastad
acf6a17c40 Fix warnings 2018-09-27 20:49:47 +02:00
Magne Sjaastad
4877e058ed Fix warnings 2018-09-27 20:17:56 +02:00
Bjørn Erik Jensen
ade352a259 Rename method 2018-09-27 09:55:28 +02:00
Magne Sjaastad
4009d4d63b System : Introduce compiler warning C4457 with fixes 2018-09-24 21:20:35 +02:00
Magne Sjaastad
b17865e117 System : Remove unused code 2018-09-21 16:31:31 +02:00
Magne Sjaastad
0127e0c1b5 #3343 Holo Lens : Use default surface color from geo mech 2018-09-21 14:14:19 +02:00
Magne Sjaastad
163193dc6c Whitespace 2018-09-21 14:14:19 +02:00
Magne Sjaastad
32237b6c7c #3401 HoloLens : Add detection of mesh line parts 2018-09-21 14:14:19 +02:00
Jacob Støren
7e78c77b90 Remove compiler warning 2018-09-20 14:53:54 +02:00
Magne Sjaastad
aa3287f615 #3379 Holo Lens : Add RivCellSetEnum to RivSouceInfo 2018-09-19 14:34:00 +02:00
Magne Sjaastad
56c91c39fd #3379 Holo Lens : Add source pdmObject to RivSouceInfo 2018-09-19 14:34:00 +02:00
Magne Sjaastad
fe4ce550e0 Add override 2018-09-13 08:17:17 +02:00
Magne Sjaastad
a1518bd9ec Whitespace 2018-09-12 14:44:41 +02:00
Magne Sjaastad
6f555c495a #3354 Fracture Viz : Geometry from previous fracture template is not removed 2018-09-11 14:46:55 +02:00
Magne Sjaastad
d5b10546b8 #3032 Completion Export Fracture Header : Refactoring 
Rename to reservoirCellIndicesOpenForFlow
Include inactive cells in area calculation
Consider containment/truncation for header related calculations
Moved calculations from stim plan fracture to stim plan calculator
 2018-09-11 13:35:35 +02:00
Magne Sjaastad
bbebbf108f #3340 Remove unused variables 2018-09-10 10:27:54 +02:00
Magne Sjaastad
3e10e59445 #3268 MSW Fracture Export: Add allFractures and allFishbones 2018-09-07 13:45:14 +02:00
Magne Sjaastad
eefb131701 #3268 MSW Fracture Export : Add activeFishbonesSubs 2018-09-07 13:45:14 +02:00
Gaute Lindkvist
ea8721f6ff Fix crash in 3d well log curve rendering. 2018-09-04 12:57:55 +02:00
Gaute Lindkvist
e3baaa4133 #3261 Show 3d well log curves even if the grid result isn't dynamic. 
* Have to be more precise on whether to attach the results as a static or dynamic property.
* Also rewrite some 3dWellLogPlanePartMgr code to only create one draw surface for each draw plane used for the curves.
 2018-09-04 12:01:07 +02:00
Magne Sjaastad
417ef314b4 #3246 Fracture Visualization: Move fracture coordinates into separate scope 2018-08-30 08:26:29 +02:00
Magne Sjaastad
25b78626be #3246 Fracture Visualization: Use display coordinates 2018-08-30 08:22:53 +02:00
Magne Sjaastad
9e3a100bcc #3253 OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Jacob Støren
9025cedecb #3204 Add double precision to OffshoreSphericalCoords 2018-08-14 11:41:20 +02:00
Jacob Støren
fb7a7e39eb #3201 #3202 Split in separate files. Move offshore spherical coords stuff to separate file in RiaTools 2018-08-14 11:41:19 +02:00
Magne Sjaastad
76913aded5 CppCheck : Use std::array 2018-08-10 16:05:35 +02:00
Magne Sjaastad
25ac317639 #3195 Grid Box : Enable depth test for all grid box lines 
The text labels are always visible, also through geometry. The line closest to label text was set to no depth test, probably to match the text visibility. This is changed by this commit, and the top line will be hidden by reservoir geometry.

Introduced by  https://github.com/OPM/ResInsight/issues/266
 2018-08-10 13:18:16 +02:00
Magne Sjaastad
8425ea96ad #3185 Remove FixedArray 2018-08-07 10:37:52 +02:00
Magne Sjaastad
aeae19c748 #3185 Use std::array instead of FixedArray 2018-08-07 10:07:42 +02:00
Magne Sjaastad
371969db3c #3038 Remove code duplication 2018-08-07 09:54:12 +02:00
Magne Sjaastad
5bbc0ee89f CppCheck : memcpy did not copy all data as intended 2018-08-03 07:12:40 +02:00
Magne Sjaastad
fe07b60392 CppCheck : Several fixes 
Add missing initializers
Guard potential null pointer access
 2018-08-02 19:22:03 +02:00
Magne Sjaastad
9b302d15a3 Grid Box Generator : Improve robustness for invalid bounding box 2018-06-29 16:42:23 +02:00
Magne Sjaastad
a90755c899 Guard null pointer access 2018-06-29 16:42:23 +02:00
Magne Sjaastad
451ce82aa9 Guard null pointer access 2018-06-29 16:42:23 +02:00
Magne Sjaastad
4ae3290e3c #1722 Completion Export : Use RimTools::wellPathCollection 2018-06-29 10:48:45 +02:00
Magne Sjaastad
c79b120031 #3035 Whitespace 2018-06-25 08:24:47 +02:00
Magne Sjaastad
1575a6564a #3035 Consolidate duplicate code 2018-06-25 08:19:29 +02:00
Magne Sjaastad
b317ea9e9e #3035 Fault Truncation: Display a mask for fracture outside grid 2018-06-25 07:45:25 +02:00
Gaute Lindkvist
a0f5db5d7e #2965 Implement option (on by default) to follow time step in 3D view. 2018-06-20 11:46:19 +02:00
Bjørn Erik Jensen
eebd8bef2d Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename 2018-06-08 15:10:45 +02:00
Magne Sjaastad
b0ee5a2834 #2969 Fracture Truncations : Visualize fault truncations 2018-05-31 08:30:04 +02:00
Magne Sjaastad
54f5ab66b4 #2969 Add const to currentActiveCellInfo 2018-05-31 08:30:04 +02:00
Gaute Lindkvist
bef7535eff #2941 3d well log curves: Fix crash if the draw surface width becomes larger than well path length 2018-05-18 14:26:52 +02:00
Gaute Lindkvist
9e665d5ab1 3d Well Log Plots: Remove curve filled code 2018-05-18 14:26:52 +02:00
Gaute Lindkvist
68dd0ba13e Switch calculation of extra curve vertices to double precision 2018-05-18 14:26:52 +02:00
Jacob Støren
73c0373264 #2940 Geomech: Display offset in place for intersections 2018-05-18 14:02:54 +02:00
Jacob Støren
c1b4cfc3e6 #2925 3D Well Log Curves: Fix missing plot/curves when Color Result = None. Moved the part generation from appendDynamicGeometryParts to appendStatic... 2018-05-15 18:09:46 +02:00
Gaute Lindkvist
1b6d6e714c #2923 Show sensible curve segments to range limits when points are outside range 2018-05-15 17:16:43 +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
52c2a93c05 #2882 CF Visualization : Never show connection factor for parent grid cells 2018-05-09 14:31:30 +02:00
Jacob Støren
43082b4952 #2871 Fault visibility toggle now controls fault label visibility in 2D intersection views also. 2018-05-08 16:26:15 +02:00
Gaute Lindkvist
043eaf7db6 Make new vertex creation more robust 
* Require that the length of the new segment is shorter than the *current*
  distance to the end of the original segment, rather than the length of the
  complete original segment.
 2018-05-08 09:09:36 +02:00
Gaute Lindkvist
0d8a034886 Fix Linux build by replacing a HUGE_VAL with std::numeric_limits::infinity 
* This build problem was introduced when fixing a crash issue that came from
  replacing HUGE_VAL with std::numeric_limits::max
 2018-05-07 19:34:22 +02:00
Jacob Støren
20a1e52323 #2850 Fix missing fault-label toggle and color setting awareness in 2D intersection view 2018-05-07 18:06:09 +02:00
Gaute Lindkvist
9125619c41 3D Well Log Curves: Fix crash bug due to wrong value used to force invalid values. 2018-05-07 16:07:13 +02:00
Gaute Lindkvist
c7bf6172f3 #2828 Allow setting curve domain range outside the range of the curve values. 
* Note that this implementation simply removes vertices that are outside the range.
* It would look far better to insert vertices at the boundary when a segment is heading
   out of range. This is more complicated.
 2018-05-07 14:47:24 +02:00
Gaute Lindkvist
57b3ad82a8 #2791 Fix tensor vector colors so principal to has a single color. 2018-05-07 11:17:51 +02:00
Gaute Lindkvist
78326bb19c #2703 An initial implementation of filled drawing style with problems remaining. 
* New vertices are successfully created in the intersections between the
  curve and draw surface triangles
* New vertices are also inserted along the bottom edge of the filled curve.
* However, new vertices will still need to be inserted in the lines connecting the
  top of the curve and the bottom where they intersect with the triangles.
* The option for filled curves remain hidden in the GUI. See #2860.

# Please enter the commit message for your changes. Lines starting
 2018-05-07 11:14:25 +02:00
Gaute Lindkvist
fba437f595 #2791 Rename misspelled "principalNumber" in TensorResultPartMgr 2018-05-07 10:13:17 +02:00
Jacob Støren
d413df0aeb #2730 Category and Scalarmapper Legend: Improve the preferred size 2018-05-04 13:33:06 +02:00
Gaute Lindkvist
23c90bd6eb #2846 Fix bad curve projection 
* Project existing points onto triangles first and make sure we choose the right triangle by
   sorting possible projections by distance.
 * Also allow some tolerance for the inside check.
 * Create the new vertices by projecting the curve segment vector onto each triangle plane
   before looking for intersections with the triangle edges.
 2018-05-03 13:39:39 +02:00
Gaute Lindkvist
944baee00e Fix comment in DrawSurfaceGenerator 2018-05-03 13:39:39 +02:00
Gaute Lindkvist
ffccb078e8 #2841 Fix bad result when z-clipping is applied. 2018-05-02 14:01:50 +02:00
Gaute Lindkvist
a37957824a Clean up 3D well log generator code. Renamed Grid -> DrawSurface and fixed spelling. 2018-05-02 12:10:05 +02:00
Gaute Lindkvist
6e3d989b2f #2825 Fix curve stitching issues against 3dwell log curve background. 2018-05-02 11:51:36 +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
7307b97466 #2823 Switching curve plane does not work 
* The previous drawable and geometry was kept if switching to a result type without
  valid points.
* The drawable is then stuck in position until switching back to a result
  type that has valid points.
* This commit fixes this by clearing the geometry every time you draw.
* TODO: cache values when it is possible to do so.
 2018-05-02 10:22:37 +02:00
Magne Sjaastad
a0e4f71138 #2715 Add direct access to RigFemPartCollection from a GeoMechView 2018-04-25 12:45:58 +02:00
Magne Sjaastad
9ac3d806e2 #2663 Rename 2018-04-23 23:06:21 +02:00
Magne Sjaastad
a9b1883dc8 #2663 Zoom All : Check if completions intersects bounding box of model 2018-04-23 22:52:44 +02:00
Gaute Lindkvist
c5e58df751 3d Well Log Curves (#2783): Enable picking with the track background switched off. 
* Add part to the model, but set the color mask false, depth test/write off.
* Result is an invisible part that is present for picking.
 2018-04-23 11:35:55 +02:00
Jacob Støren
851e68ac31 #2663 Code adjustment to avoid creating a geometry generator when not needed 2018-04-23 10:31:07 +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
Jacob Støren
3957027b4b #2657 Final cleanup and refactoring of legends size system 2018-04-20 16:59:10 +02:00
Jacob Støren
03ec76c20a #2657 Add a preferredSize method to the legends 2018-04-20 16:59:10 +02:00
Jacob Støren
1f8d4437bf Remove the unused, unnecessary "position" from several methods and the overlay layout struct 2018-04-20 16:59:10 +02:00
Magne Sjaastad
9e40ba39c8 #2684 Well CF Visualization: Option to turn off CF visualization on closed connections 2018-04-19 22:28:22 +02:00
Magne Sjaastad
e6781e2de4 #2683 Well CF Visualization: Refactor computation of connection factor location 2018-04-19 21:49:01 +02:00
Magne Sjaastad
f365dae014 #2683 Well CF Visualization: Add missing null pointer test 2018-04-19 20:29:24 +02:00
Magne Sjaastad
7156779e3d Rename 2018-04-19 20:20:57 +02:00
Magne Sjaastad
c16c10e774 #2683 Well CF Visualization: Show connection factors on closed connections 2018-04-19 20:18:15 +02:00
Magne Sjaastad
7676ba4f20 #2683 Refactoring : Use range based for and rename 2018-04-19 16:20:43 +02:00
Magne Sjaastad
39cb9326e4 #2683 Well CF Visualization: Sim Well pipe color should be gray for closed existing connections 2018-04-19 16:13:18 +02:00
Gaute Lindkvist
bf5d95d873 3D Well Log Curves (#2672): Max and min value control for each curve. 2018-04-19 13:43:12 +02:00
Gaute Lindkvist
5d89ad3a6d 3D Well Log Curves (#2674): Show what the value axis direction is 2018-04-19 13:43:12 +02:00
Bjørn Erik Jensen
e468227dfe Fix Linux warning 2018-04-18 14:13:37 +02:00
Gaute Lindkvist
01a1f660e7 3D Well Log Curves (#2746): Handle set scale. 
* Transform to display coordinates *before* calculating normals and generating curves.
 2018-04-18 11:33:04 +02:00
Gaute Lindkvist
3303350193 Rename member variable in RivWellPathsPartManager to get rid of spelling error. 2018-04-18 11:33:04 +02:00
Magne Sjaastad
3bc85ce794 #2727 Legends : Rename to RimRegularLegendConfig 2018-04-18 10:10:39 +02:00
Gaute Lindkvist
d7204363a0 3D Well Log Curves (#2673): Consolidate the draw plane position control. 2018-04-18 08:38: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
092624799e 3D Well Log Curves: Renaming of the term normals in curve/grid-generation 
* Make it more obvious we are talking about the normals to the 3D well log curve.
 2018-04-17 13:44:03 +02:00
Gaute Lindkvist
5e6613d428 3D Well Log Curves (#2671): Apply white background to curve draw plane. 2018-04-17 13:44:02 +02:00
Jacob Støren
5769ba45f1 #2739 Normal intersection box mesh lines now not labled as fault mesh lines 2018-04-17 07:42:41 +02:00
Gaute Lindkvist
fd63ae7531 3D Well path plots: clean up some indentation and remove an unnecessary epsilon 2018-04-13 15:33:37 +02:00
Gaute Lindkvist
b48adbbaa9 3D Well log curves: Use the new generalized interpolation for normals 
* Don't have to perform the normal generation again for grid points.
 2018-04-13 14:56:19 +02:00
Gaute Lindkvist
e8b006d068 3D Well Log Curves (#2671): Split normals, border and surface into several drawables. 
* Also create a closed LINES_LOOP out of the mesh border.
  * This will facilitate using different effects on the different parts.
    i.e. solid border and white surface background.
 2018-04-13 14:55:44 +02:00
Gaute Lindkvist
6e0b7e2305 Improve 3D Well path plots 
* Always generate in up-direction and rotate to left/right/down
* Generate a "dominant direction" by interrogating the whole curve, not
  just the first and last item.
* Improve maths:
  - Generate a projection plane spanned by UP and the dominant direction.
  - Project the tangent onto this projection plane.
  - Generate normal as the cross product between the projected tangent and
    the normal to the projection plane.
  - Rotate the normal into left/right/down if required.
 2018-04-13 14:55:44 +02:00
Jacob Støren
0bf6db50f9 Fix crash due to empty fault label parts 2018-04-13 11:30:01 +02:00
Jacob Støren
c784deae25 #2437 Add fault-labels to 2d Intersection view 2018-04-10 15:35:37 +02:00
Jacob Støren
fee549de35 Adjust an argument order in RigWellPathGeometryTools 2018-04-09 13:23:09 +02:00
Gaute Lindkvist
b6fb60115a Refactored after review 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
e93f79790e Make sure Ternary legends also expand and renamed width method. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
38aa447dcd Unify the width of all visible legends. 
* Calculate the minimum width to fit the content before the render pass.
  * Set the actual width of all the legends to the largest of the minimum widths.
  * This resizes the legends to always be the same size and reduces the size of you remove
     the widest legend.
 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
63ffade452 Set background and frame color from the view plus update frame margins. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
507229f84b Fixed background color setting for legends and refactored Legend class hierarchy 
* Added a new cafTitledOverlayFrame as a base-class for all ResInsight legend classes
  * Inherits cvf::OverlayItem
 2018-04-09 13:14:19 +02:00
Magne Sjaastad
98c8f3305d Add missing include 2018-04-05 14:47:03 +02:00
Magne Sjaastad
69b6ca6956 Fix signed / unsigned compare 2018-04-05 14:25:47 +02:00
Magne Sjaastad
9b0427aba9 #2553 Well CF Visualization: Add viz of connection factors on sim wells 2018-04-05 14:25:47 +02:00
Jacob Støren
436420b648 #2665 Fix draw plane position error with changed width 2018-04-05 14:18:00 +02:00
Jacob Støren
f7bfe8d003 #2436 Separated Hide grid cells mode as a separate value. Make sure that all the possible drawstyles works as expected, both for 2D intersection view and 3D views. 2018-04-05 07:41:29 +02:00
Jacob Støren
97c2ebd955 #2436 Intersection Fault lines are now separated and have a separate color 2018-04-05 07:41:29 +02:00
Jacob Støren
3b724e07bd #2436 Add cube face tracking through the clipping methods used for intersection calculations 2018-04-05 07:41:29 +02:00
Magne Sjaastad
bffc50b826 Fix typo when generating light NNC colors 2018-03-24 14:44:08 +01:00
Rebecca Cox
4dcf98eda8 Tensors: Imporve variable name 2018-03-22 14:39:00 +01:00
Rebecca Cox
18bde3cd89 #2636 3D Well log curve: Create well path geometry tools. 2018-03-22 14:35:54 +01:00
Rebecca Cox
73a08fffc4 #2635 3D well log curves: Give new curves different colors 2018-03-22 13:26:33 +01: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
Rebecca Cox
3547240fe6 #2591 3D well log curves: Remove view from geometry generator 2018-03-22 09:54:58 +01:00
Rebecca Cox
9e4d271d5b #2591 3D well log curves: Use an angle to deretmine draw plane 2018-03-22 08:54:48 +01:00
Rebecca Cox
26d83983b1 3D well log curve: add comments 2018-03-21 16:22:35 +01:00
Rebecca Cox
85cd8b0e1d 3D Well Log Curve: Give Plane Part Mgr more responsibility 2018-03-21 15:32:15 +01:00
Jacob Støren
203677e837 Merge several 2D Intersection View fixes (MD and Perf intervals) into dev 2018-03-21 14:27:20 +01:00
Jacob Støren
dd29a3c727 #2634 Fix wrong MD when context menu creating completions in 2D intersectino View 2018-03-21 14:13:56 +01:00
Jacob Støren
25ff51c82b #2630 Fix wrong picked MD on clipped well paths 2018-03-21 13:56:24 +01:00
Jacob Støren
2b4e26aaca #2630, #2605 unfalltenedTransformMatrix now returns mx[0] and mx[last] for points before and after end. 2018-03-21 13:47:22 +01:00
Rebecca Cox
e688b3de36 #2591 3D well log curves: Increase size of offset between pipe and plot 2018-03-21 13:46:03 +01:00
Rebecca Cox
a1d82fcffa #2633 3D well log curves: Clip curve on well path bounding box 2018-03-21 13:15:48 +01:00
Rebecca Cox
b20b633c40 #2633 3D well log curves: Use currect normals when making grid 2018-03-21 13:14:22 +01:00
Unknown
687ddcb0a6 #2591 3D well log curves: Only add grid if curve is added 2018-03-21 10:54:26 +01:00
Unknown
131eb64748 #2633 3D well log curves: Clip grid on well path bounding box 2018-03-21 10:54:26 +01:00
Jacob Støren
c22bafbf29 #2605 Show perforations along well path in 2D intersections view 2018-03-20 17:28:27 +01:00
Jacob Støren
65b35cff92 #2481, #2605, #2486, #2568 Remove obsolete code 2018-03-20 15:44:45 +01:00
Jacob Støren
a9daea0938 #2481, #2605, #2486 Use a flattened version of the normal wellpath visualization in 2D intersection view 2018-03-20 15:44:45 +01:00
Unknown
0de43ac938 #2628 3D well log curves: Scale curves by grid size 2018-03-20 15:37:02 +01:00
Unknown
cc5f4b2ec6 #2591 3D well log curves: Add grid line along path 2018-03-20 13:51:59 +01:00
Magne Sjaastad
57a766fd09 Return if geometry generator is null 2018-03-20 13:18:24 +01:00
Unknown
8766ea3057 #2591 3D well log curves: Option to turn grid on/off 2018-03-20 11:29:59 +01:00
Unknown
60120c70d5 #2591 3D well log curves: Make point normal function use well path geom 2018-03-20 11:29:59 +01:00