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
