OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-12 00:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,436 Commits 29 Branches 61 Tags 290 MiB
95a5085ba0
Commit Graph

673 Commits

Author SHA1 Message Date
astridkbjorke
ffeb50b06a #1320 - pre-proto - Prototyping calculation of upscaled parameter values from stimPlan. Bug in calculation so output values are wrong. 2017-03-27 10:06:42 +02:00
Magne Sjaastad
c513326b7d Perfromance : Compute polygon outside loop when building mesh 2017-03-22 07:46:38 +01:00
Jacob Støren
2fb35af7a6 #1335 Connection arrows for all cross-flows also. Made ready for options to show straight arrows, and adjusted a bit. 2017-03-17 18:11:06 +01:00
Jacob Støren
c77741f3ab Exclude Well Communication lines that have exact 0 flux. 
In waiting for a GUI-adjustable tolerance.
+ some rename
 2017-03-17 09:46:49 +01:00
Jacob Støren
f0331e02c9 #1325 Always show the communication lines related to a visible well (When they are on) 2017-03-17 09:34:52 +01:00
astridkbjorke
f8b246bdf3 #1274 - pre-proto - Fix in which cells that is shown. 2017-03-16 14:53:44 +01:00
astridkbjorke
654bbb38e3 #1274 - pre-proto - Showing lines between nodes instead of though nodes (different interpretation of what the grid is...) 2017-03-16 13:21:11 +01:00
astridkbjorke
fe01fe2751 #1274 - pre-proto - showing stimPlan mesh 2017-03-16 12:02:07 +01:00
Jacob Støren
983db61402 #1114 Use "Disable Lighting" on well communication lines also. 2017-03-15 10:53:25 +01:00
Jacob Støren
c7207afcc2 #1114 Improved communication lines geometry. Added normals 2017-03-15 10:39:35 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Jacob Støren
1a42af5b37 #1114 First working well communication lines operative 2017-03-14 19:21:55 +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
4c8e1e2bcd #1114 WIP: Refactor: Removed RivReservoirWellSpheresPartMgr 2017-03-13 11:35:49 +01:00
Jacob Støren
d34b4e3c05 #1114 WIP: Added field in Sim Well Collection, renamed a bit as preparations 2017-03-13 11:05:46 +01:00
Magne Sjaastad
6c6049a317 #1282 Mesh lines : Use LEQUAL for depth test to make sure highest pri is visible 2017-03-08 14:27:02 +01:00
Jacob Støren
b5e782dfc3 #1292 Fixed CppCheck Issues in ModelVisualization 2017-03-06 11:20:28 +01:00
Jacob Støren
4312968124 Removed CppCheck Warnings 2017-03-03 17:09:30 +01:00
Magne Sjaastad
f7521ad12f Merged branch pre-proto into pre-proto 2017-03-02 11:48:35 +01:00
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ResInsightVersion.cmake
 2017-03-02 11:46:25 +01:00
astridkbjorke
2811e5aa4d #1272, #1271 - pre-proto - Adding field for setting unit system for fracture, and converting geometry/polygon between unit systems 2017-03-02 11:43:41 +01:00
Magne Sjaastad
68ff093c61 #1266 If not computed, compute staticWellCellPath when needed 2017-03-01 14:23:01 +01:00
Magne Sjaastad
e29c6474bd Minor refactoring 2017-02-28 19:17:36 +01:00
Magne Sjaastad
be6a2e0d39 #1243 Improved how enclosing polygon is visualized 2017-02-28 18:41:58 +01:00
astridkbjorke
c2c3145e5a #1243 - pre-proto - Adding visualization of polygon output for stimplan fractures 2017-02-28 14:28:14 +01:00
Magne Sjaastad
8ce430cb25 #1242 Hide opacity level and discard transparent fragments 2017-02-27 22:21:37 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
85228ee39c #1255 Removed includes from RimWellPath 2017-02-24 14:31:06 +01:00
Magne Sjaastad
1792290ef0 #1255 Removed includes from RivReservoirWellSpheresPartMgr 2017-02-24 13:48:19 +01:00
Magne Sjaastad
6e960e74c3 #1255 Removed includes in Riv classes 2017-02-24 13:34:25 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
2ce28ffff0 #1251 Use RivObjectSourceInfo for fractures 2017-02-23 11:53:26 +01:00
Magne Sjaastad
555ecba8b3 #1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-02-23 11:52:56 +01:00
Magne Sjaastad
f59c4b4b9e #1242 Do not use transparency on ellipse, default transparency set to 1.0 2017-02-23 11:25:21 +01:00
Magne Sjaastad
7f75f7e509 #1252 Add and use transparent color for both ellipse and stim plan objects 2017-02-23 10:15:56 +01:00
Magne Sjaastad
139590760f #1240 Added checbox to StimPlan Colors 2017-02-22 15:32:19 +01:00
Magne Sjaastad
73690e6d66 #1239 Do not show fracture when fracture is unchecked 2017-02-22 13:29:20 +01:00
astridkbjorke
c84f4efbb1 #1138 - pre-proto - Adding field in RimStimPlanColors for transparency 2017-02-20 13:24:22 +01:00
Magne Sjaastad
ad3270e513 #1230 Use part priority system 2017-02-20 11:10:03 +01:00
Magne Sjaastad
bdbb110ca4 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/CMakeLists_files.cmake
	ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
 2017-02-20 11:07:46 +01:00
Magne Sjaastad
b510979151 #1230 Use transparent on low values 2017-02-20 11:03:18 +01:00
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
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
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
Jacob Støren
fd604f844b #1035 Removed obsolete code, and used the createFromResultDefinition method in CellEdge and property filter 2016-12-15 07:47:54 +01:00
Jacob Støren
ec5ad417f3 #1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come. 2016-12-14 14:51:53 +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
8e81c53520 #1025 Code cean-up. Removed obsolete scaletransform for cell center spheres. 2016-12-12 11:03:37 +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
9e6575633f #1025 Avoid mix of shader based rendering and fixed function rendering for DrawableVectors, this causes artifacts 2016-12-08 15:11:35 +01:00
astridkbjorke
fa47587f71 #1025 Updated so that cell center spheres are visible also with well visibility set to all off 2016-12-08 14:06:36 +01:00
astridkbjorke
bb2fb88858 #1025 Updated drawing of cell center spheres to use DrawableVectors (one part for all spheres) 2016-12-08 13:32:19 +01:00
astridkbjorke
cd6494cc0c #1025 Created well cell center spheres group box and added sphere radius controls 2016-12-08 09:59:45 +01:00
astridkbjorke
916ab51df4 #1025 Only showing cell center sphere if well is visible 2016-12-08 09:59:45 +01:00
Magne Sjaastad
374b44060d #1025 Guard against invalid grid index and invalid cell index 2016-12-08 09:54:51 +01:00
astridkbjorke
a485c23773 #1025 Fixes after merge conflict 2016-12-07 15:26:01 +01:00
astridkbjorke
df46e626c9 #1025 Setting colour of cell center spheres based on well type 2016-12-07 15:18:48 +01:00
Magne Sjaastad
3922d51790 #1025 Use DisplayCoordTransform for coordinate transformations 2016-12-07 14:41:48 +01:00
astridkbjorke
600f3da30a #1025 Established geometry for all well cell centers 2016-12-07 12:06:24 +01:00
astridkbjorke
1801e49105 #1025 Establish base code structure 2016-12-07 12:06:24 +01:00
Magne Sjaastad
f688a89262 #945 Do not use Inactive to show fault label parts 2016-11-21 13:29:07 +01:00
Magne Sjaastad
7d52242285 #945 Use visible grid parts to force watertight faults 2016-11-21 13:13:53 +01:00
Magne Sjaastad
5fb209f27b #944 Added clear of watertight flag 2016-11-21 13:13:53 +01:00
Magne Sjaastad
e89b73d64c #945 Removed flag as watertight flag was always set true 2016-11-18 14:05:50 +01:00
Magne Sjaastad
8344617ba9 #945 Improved handling of visible fault geometry when showing faults outside filters 2016-11-18 13:57:01 +01:00
Magne Sjaastad
8deeba66d5 #945 Added possibility to force watertight flag for property filter geo 2016-11-18 13:57:01 +01:00
Magne Sjaastad
c52e1809ab #992 Fixed invalid access of nullpointer for property filtered geometry 2016-11-18 10:49:06 +01:00
Magne Sjaastad
3ba7ade88e #945 Rename 2016-11-18 10:49:06 +01:00
Magne Sjaastad
c0309b4368 Added comment 2016-11-17 10:05:00 +01:00
Jacob Støren
d2d9d43ca1 #942 Added plane Azi and Inc angles as result values. 2016-11-01 12:05:22 +01:00
Jacob Støren
c93c7e41df #933 Fixed the closes result for intersections also. Display the tensor data from the closest element node transformed onto the plane. 2016-10-26 17:14:33 +02:00
Jacob Støren
593fe93244 #930, #925, #914 
* Formation names format changed to allow no space around k-layer numbers. Also added possibility to use one number as k-layer count for the name. Based on  previous names last layer
* Deleted geomech cache of formation name result when updating the formation names
* Added TNH TNQV THQV to plane transformed stresses.
 2016-10-21 14:31:31 +02:00
Jacob Støren
0523e1065a #914 Changed name of the Norm Hor and Vert Components 2016-10-20 16:46:30 +02:00
Jacob Støren
b4c6277e72 #914 Transformed stress on intersection Box is working 2016-10-20 16:09:27 +02:00
Jacob Støren
159bbbe5e6 #914 First transformed stress on intersection 2016-10-20 10:50:29 +02:00
Magne Sjaastad
522ae9998f #923 Intersections : Added viz for extrusion direction by two points 2016-10-18 14:25:31 +02:00
Magne Sjaastad
6bb0c3b87e #923 Moved extrusion computation to RimIntersection 2016-10-18 10:22:20 +02:00
Magne Sjaastad
7659f58fd6 #884 Intersection collection is responsible for adding box manipulator geometry to model used in 3D viewer 2016-10-03 14:26:46 +02:00
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Magne Sjaastad
d4bdbcb7c8 (#884) Added prototype of event handler for interaction with box 2016-09-30 09:34:39 +02:00
Jacob Støren
865d1e1d9c #898 Include inactive cells in box intersections 2016-09-29 14:57:27 +02:00
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +02:00
Jacob Støren
3bca03a722 Fix of missing changes from previous merge commits. Missing rename of anchestor to ancestor 2016-09-28 14:35:57 +02:00