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 |
|
Magne Sjaastad
|
3d67946976
|
Merge remote-tracking branch 'origin/dev' into pre-proto
|
2017-03-15 10:10:43 +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
|
b5e782dfc3
|
#1292 Fixed CppCheck Issues in ModelVisualization
|
2017-03-06 11:20:28 +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 |
|
Magne Sjaastad
|
a29fe1f7c1
|
Fixed #1223, now pipe can also be rendered without lighting
|
2017-02-15 15:55:24 +01:00 |
|
Magne Sjaastad
|
43faf00cfa
|
#1194 Use slightly larger pipe radius for open wells
|
2017-02-15 08:14:29 +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
|
9493a1dfc0
|
Use hasWellResult instead of firstResultTimeStep
|
2017-02-02 12:52:32 +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
|
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
|
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
|
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
|
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
|
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
|
a5e8001745
|
#1044 - pre-proto - Fixed eternal loop
|
2017-01-04 09:28:10 +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 |
|