OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-02 01:38:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,752 Commits 51 Branches 82 Tags
9eb85966ed16e75067a46c756173baacecd02ccb
Commit Graph
681 Commits
Author SHA1 Message Date
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