OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,195 Commits 53 Branches 83 Tags
b13ca8bb1cd3d71960c2e39a8fed6421e7ee8e0d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad 758bc96ff5 #1135 Compute and show location along sim well pipe 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 329bed71a4 Removed linking of ert_utilxx included in d71476b1aa 
This library contains shared pointer code, and is not needed to link with
 2017-01-26 14:21:24 +01:00
Magne Sjaastad 1f9ef0d942 #1078 Added color control to sim well collection 2017-01-26 12:25:45 +01:00
Magne Sjaastad a95adf4167 AppFwk : Fixed invalid else statement 2017-01-26 12:13:03 +01:00
Magne Sjaastad 6528d243fe AppFwk : Use namespace prefix for parameters 
When using Visual Assist for automatic implementation of virtual functions, the namespace must be included to be able to compile the generated code without any changes.
 2017-01-26 11:51:52 +01:00
Magne Sjaastad 0a00f15e5d Removed whitespace 2017-01-26 11:31:04 +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 6ee54733f4 #1078 Context menu commands for multi select of EclipseWell objects 2017-01-26 07:23:18 +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 405cd382af Reorganized how clipper is included and deleted example files 2017-01-24 15:39:39 +01:00
Magne Sjaastad 827f0d670c Fixed includes after merge 2017-01-24 15:23:31 +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
Magne Sjaastad df4b42e69e Call method in base class when overriding defineEditorAttributes 2017-01-24 15:12:13 +01:00
Magne Sjaastad b035212712 #1040 Switch a and b when computing fracture geometry 2017-01-24 15:11:20 +01:00
Magne Sjaastad 7e78d8f1ae Added double slider to well path fracture 2017-01-24 14:59:41 +01:00
Magne Sjaastad 5053112e3d #1118 Calculate and display flow rate 2017-01-24 14:25:31 +01:00
Magne Sjaastad 1b517a8e5e Added helper class for measured depth 2017-01-24 13:46:35 +01:00
Magne Sjaastad b96b51284e Fixed invalid comparison between signed and unsigned 2017-01-23 14:43:52 +01:00
Magne Sjaastad 7adafbe17c Fixed missing forward declare 2017-01-23 14:16:57 +01:00
Magne Sjaastad 5ffd2ac626 Fixed type compare 2017-01-23 13:51:44 +01:00
Magne Sjaastad 055315085e #1108 Created settings object for "Well Allocation Factors" pie chart 2017-01-23 13:29:06 +01:00
Magne Sjaastad 2511a59f8a #1116 Added RiuNightchartsWidget 2017-01-23 12:59:24 +01:00
Magne Sjaastad 09dacf1928 System : Set solution folder property at correct location 2017-01-23 12:59:24 +01:00
Magne Sjaastad 699c2a1103 #1116 Added nightcharts pie plotting library 2017-01-23 12:59:24 +01:00
Magne Sjaastad d71476b1aa System : Improved organization of ThirdParty libraries 2017-01-23 12:59:24 +01:00
Magne Sjaastad cebe5428be #1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes 2017-01-20 16:25:05 +01:00
Magne Sjaastad 93e9b04655 Cleanup includes 2017-01-19 13:35:07 +01:00
Magne Sjaastad f24b5ff084 Fixed missing include 2017-01-19 11:02:44 +01:00
Magne Sjaastad da371c099b Merged branch dev into pre-proto 2017-01-19 10:45:22 +01:00
Magne Sjaastad b25f630a7e Moved several fields to RimFracture 2017-01-19 10:43:23 +01:00
Magne Sjaastad 2edc090c89 Restored previous behaviour related to result accessor creation 2017-01-19 10:39:08 +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 caba8e97ad Use naked pointer to access RigFracture 2017-01-19 07:42:33 +01:00
Magne Sjaastad 74fc8458ed Refactored visualization : One part manager for each fracture 2017-01-19 07:28: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
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
Magne Sjaastad 1b5dc51a7e #1084 Snapshot : Removed header above table 2017-01-17 13:11:09 +01:00
Magne Sjaastad 0cda0a4071 AppFwk : Added flag to control visibility of header text above table editor 2017-01-17 13:10:37 +01:00
Magne Sjaastad 07865268b1 Snapshot : Set fields read only based on state of other fields 2017-01-17 12:59:13 +01:00
Magne Sjaastad d8114decec AppFwk : TableEditor - Show text in lightGray when field is readonly 2017-01-17 12:55:13 +01:00
Magne Sjaastad 3488ada29d #1083 Snapshot : Added None to view list 2017-01-17 11:05:21 +01:00
Magne Sjaastad 9c1e9f0970 #1080 Snapshot : Show parameter and case as default 2017-01-17 10:40:38 +01:00
Magne Sjaastad 22f870bff0 #1082 Snapshot : Added four empty rows 2017-01-16 23:21:28 +01:00
Magne Sjaastad 7ee5fe321b #1081 Snapshot : Row numbering starts at 1 2017-01-16 23:07:22 +01:00
Magne Sjaastad 2292debc6b #1085 Snapshots : Added toggle to control if a snapshot definition is active 2017-01-16 22:55:22 +01:00
Magne Sjaastad 723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00
Magne Sjaastad 239322ba50 AppFwk : Removed assert guard, to prepare for delete of contained object 2017-01-13 13:32:17 +01:00
Magne Sjaastad ccb88c6520 Rename 2017-01-13 13:32:17 +01:00
Magne Sjaastad 0cbdcd587d #1105 Stripped down basic infrastructure code 2017-01-13 13:32:17 +01:00
Magne Sjaastad 894b4468b4 #1125 Limit size of string in legend and info, reordered tracer combo 2017-01-12 15:00:23 +01:00
Magne Sjaastad 8ce8b4e7f1 #1105 Added framework files for Well Allocation plot 2017-01-12 15:00:23 +01:00
Magne Sjaastad fcd2a09f83 #1105 Created new folder for flow project files 2017-01-12 15:00:23 +01:00
Magne Sjaastad 597dc46945 #1102 Possible to select all injectors/all producers 2017-01-12 11:13:33 +01:00
Magne Sjaastad 00db484f0c #1056 Do not show time history plots for flow data 2017-01-12 10:42:51 +01:00
Magne Sjaastad c638def4d6 Fixed missing includes 2017-01-12 08:20:50 +01:00
Magne Sjaastad b104b1a97c #1056 Simplified TimeHistoryResultAccessor 
#1056 Simplified TimeHistoryResultAccessor
 2017-01-12 07:22:19 +01:00
Magne Sjaastad 4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
Magne Sjaastad 4a9fec49bf #1056 Added cell edge picking text info 2017-01-11 21:07:03 +01:00
Magne Sjaastad 392e08a2ab #1056 Flow diagnostics cell edge min/max in info box 2017-01-11 20:44:32 +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 6c84f9f59e #1101 Added azimuth to fracture, and update visualization 2017-01-10 13:37:50 +01:00
Magne Sjaastad bb89994dbc #1101 Added azimuth 2017-01-10 10:53:54 +01:00
Magne Sjaastad 082960d887 Updated to pre-proto.7 2017-01-10 10:13:34 +01:00
Magne Sjaastad a3cbf7da85 Fixup after merge 2017-01-10 10:12:14 +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 36c008a12c #1068 Removed obsolute include 2017-01-10 09:20:03 +01:00
Magne Sjaastad f22555c382 #1068 Fixed missing include 2017-01-10 09:20:03 +01:00
Magne Sjaastad 50b9fe0ece #1068 Removed obsolete include of RigCaseData 2017-01-10 09:20:03 +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 9cacf0db6c #1068 Access mainGrid directly from RimEclipseView 2017-01-10 09:20:03 +01:00
Magne Sjaastad 95b7ce73ee #1075 Fixed toggle of single item when two items are selected 2017-01-09 14:14:06 +01:00
Magne Sjaastad 0fd3bc8865 #1068 Access mainGrid directly from RimEclipseView 2017-01-09 10:51:06 +01:00
Magne Sjaastad 45b581dc74 #1068 Added mainGrid() to RimEclipseView 2017-01-09 10:37:07 +01:00
Magne Sjaastad 46bc8e80aa Removed unused code 2017-01-09 07:43:31 +01:00
Magne Sjaastad 785a5e9ff8 #1060 Use DisplayCoordTransform in ResultTextBuilder 2017-01-09 07:43:17 +01:00
Magne Sjaastad c197709e08 Fixed invalid keyword used only in UI 2017-01-07 08:59:19 +01:00
Magne Sjaastad 5d9fd5ddeb #1064 Use constexpr to verify keywords for pdmObject and pdmFields 2017-01-07 08:59:19 +01:00
Magne Sjaastad 508c2ba1a2 #1071 Updated icons for fractures 2017-01-05 14:57:04 +01:00
Magne Sjaastad a61b3ad5f6 #1059 Rename 2017-01-05 07:57:37 +01:00
Magne Sjaastad a9984c4bd5 #1059 System : Use PdmOptionItemInfo constructor for PdmObjects 2017-01-05 07:53:14 +01:00
Magne Sjaastad 18fde7621e #1071 Added icons for fracture templates 2017-01-04 14:48:09 +01:00
Magne Sjaastad d0b669b987 #1071 Added fracture icons (created by JacobStoren) 2017-01-04 14:38:06 +01:00
Magne Sjaastad 40cce6f990 Temporary disable well path fracture center 2017-01-04 14:24:47 +01:00
Magne Sjaastad a64c1dd447 Fixed missing includes 2017-01-04 09:26:39 +01:00