OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,318 Commits 27 Branches 61 Tags 309 MiB
3ae816a9aa
Commit Graph

516 Commits

Author SHA1 Message Date
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
41836a4930 #1138 Added test code for texture scalar mapping 2017-02-14 10:29:25 +01:00
Magne Sjaastad
2ee25c6cf5 Use triangleIndices instead of polygonIndices 2017-02-10 11:32:18 +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