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,515 Commits 27 Branches 61 Tags 309 MiB
c25d4953df
Commit Graph

53 Commits

Author SHA1 Message Date
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ResInsightVersion.cmake
 2017-03-02 11:46:25 +01:00
Magne Sjaastad
68ff093c61 #1266 If not computed, compute staticWellCellPath when needed 2017-03-01 14:23:01 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
65d71f7106 #1250 Show fractures directly as child objects of wells / well path 2017-02-22 14:40:13 +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
d1743be8e7 #1178 Update well allocation plots when well color changes 2017-02-10 19:12:21 +01:00
Magne Sjaastad
a5de98ab32 Use upper case for first character in words 2017-02-08 13:59:20 +01:00
Magne Sjaastad
b1beacb46a #1189 Fixed well cells visibilities when no range filters are active 2017-02-08 13:34:31 +01:00
Magne Sjaastad
d5ec760ddd #1189 Fixed well pipe/sphere visibilities when no range filters are active 2017-02-08 08:07:27 +01:00
Magne Sjaastad
f11d2a0d31 #1189 Fixed well pipe/sphere visibilities when no range filters are active 2017-02-08 08:04:08 +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
Magne Sjaastad
4bfb85c62e #1189 Harmonized static and dynamic evaluation of cell visibilities 2017-02-07 15:36:19 +01:00
Magne Sjaastad
2404cf1582 #1189 Visibility of well cells now follow visible range filtered cells 2017-02-07 15:33:04 +01:00
Magne Sjaastad
0061067aa7 #1189 Do not consider well cells when controlling pipe/sphere visibilities 2017-02-07 15:33:04 +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
fad0974b3f #1148 Use tristate for well cell visibility 2017-02-02 09:59:26 +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
929e9ad09b Guard for index out of range 2017-02-01 09:52:01 +01:00
Magne Sjaastad
7b6574327e #1094 Gray out wells not visible because they do not intersect visible cells 2017-01-27 15:50:17 +01:00
Magne Sjaastad
23eeacde37 #1094 Improved constness and use of range based for 2017-01-27 15:19:18 +01:00
Magne Sjaastad
1e20a61d4c #1078 Updated enabled state of well cells and well cell fence 2017-01-26 18:01:08 +01:00
Magne Sjaastad
8f4fa4592a #1078 Improved well cells and well cell fence settings 2017-01-26 17:41:34 +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
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
07b9eba3a8 Fixed missing include 2017-01-18 13:38:34 +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
astridkbjorke
e6ef4fee42 #1037 - pre-proto - added classes RimSimWellFracture and RimSimWellFractureCollection, and functions for creating new / deleting. 2017-01-02 11:10:25 +01:00
astridkbjorke
ab6e12eb3a #1038 - pre-proto - Added command feature for creating new well log collection fracture from context menu in project tree 2016-12-20 09:53:19 +01:00
Magne Sjaastad
860b51931c #1025 Removed unsused code and renamed to isWellPipe/SpheresVisible 2016-12-14 07:15:44 +01:00
Magne Sjaastad
5aeb737795 #1025 Refactored visibility to handle both well cell pipes and well cell spheres 2016-12-13 09:35:01 +01:00
astridkbjorke
277cdf79b6 #1025 Added check for valid input for visibleCellsIntersetcsWell-function. 2016-12-12 11:35:44 +01:00
astridkbjorke
21a8acdb76 #1025 Replaced check-box with enum for showing cell center spheres 2016-12-12 11:03:37 +01:00
astridkbjorke
829c775f63 #1025 Added Show well spheres check-box option for each well 2016-12-12 11:03:37 +01:00
Magne Sjaastad
442fb04a97 #927 Rename from cross section to intersection 2016-10-25 10:03:55 +02:00
Jacob Støren
f734bf595b #815 Renamed RimCrossSectionCollection -> RimIntersectionCollection 2016-09-21 10:52:16 +02:00
Magne Sjaastad
a7d0c0c83e #751 : Well pipes for intersections based on Simulation Wells disappears when a Range Filter is applied 2016-07-27 08:05:44 +02:00
Jacob Støren
2a98f5b116 (#707) Renamed to make the use of resultWellIndex more clear 2015-12-11 17:45:09 +01:00
Jacob Støren
d01367a932 (#707) Fixed regression regarding well pipe and well cells 
Introduced in 707e8c6 and not quite fixed in 179f0c9
 2015-12-11 17:34:52 +01:00
Magne Sjaastad
77d66f59af (#657) Added option items for well path and simulation wells 2015-11-18 15:55:24 +01:00
Magne Sjaastad
6e0c6b89b1 (#565) Fixed invalid guarding of index when calculating well pipe visibility 
Reverts two previous commits cfc8c72137
and 7c8fe47683
 2015-10-22 10:39:36 +02:00
Magne Sjaastad
cfc8c72137 Completed more robust check for commit 7c8fe47683 2015-09-15 16:33:40 +02:00
Magne Sjaastad
7c8fe47683 Made cell visibility check more robust 2015-09-15 12:17:10 +02:00