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
2,973 Commits 27 Branches 61 Tags 309 MiB
227eba0325
Commit Graph

338 Commits

Author SHA1 Message Date
Jacob Støren
edd7a671d9 riMULTXYZ: Added tolerances for CellEdge and Calculations 2014-08-28 11:25:21 +02:00
Jacob Støren
d76dd6a588 Added riTRANSXYZbyArea (and X, Y, Z ) 2014-08-27 11:41:40 +02:00
Jacob Støren
03a9bf459d Added riMULTXYZ and X,Y,Z 2014-08-26 15:39:21 +02:00
Jacob Støren
670ca4ced5 riTRANSXYZ: nnc calculations in place 
Making this feaure complete.
Had to add the concept of several results sets to the nnc data
 2014-08-26 12:16:22 +02:00
Magne Sjaastad
56b1f78f2f Faults : Show NNCs moved from fault result to fault collection 2014-08-26 11:55:26 +02:00
Magne Sjaastad
f69413087a Custom fault result: Reorganized custom fault result selection 
Removed combo box used to specify fault color or custom result color.
Fault colors is used if None is selected in result dialog.
 2014-08-26 11:47:14 +02:00
Magne Sjaastad
b3fd96d72e Cell edge: Update texture also if none is cell result 2014-08-26 10:13:35 +02:00
Jacob Støren
9e22c90a4a Renamed cellindex to gridLocalCellIndex 2014-08-22 13:39:21 +02:00
Magne Sjaastad
b9a5d5b743 Bugfix: Apply face culling mode when creating effects 2014-08-21 14:41:03 +02:00
Magne Sjaastad
cdf2b07118 Removed use of cvfStructGridScalarDataAccess 2014-08-19 14:56:20 +02:00
Magne Sjaastad
6418928bd2 Faults: Skip out of range cell index 2014-08-19 10:33:29 +02:00
Magne Sjaastad
2a55b47e9a Renamed and restructured files and classes 2014-08-14 10:56:48 +02:00
Magne Sjaastad
7e5c46cf59 Added support for cell edge on faults 2014-08-14 10:56:47 +02:00
Magne Sjaastad
2c903a0d18 Cell edge now handles also ternary 2014-08-14 10:56:47 +02:00
Magne Sjaastad
67e12e3f71 Cleaned up includes 2014-08-14 10:56:45 +02:00
Magne Sjaastad
245573e03c Cell edge visualization can now handle individual per face center values 2014-08-14 10:56:44 +02:00
Magne Sjaastad
debd17a3ab Removed unused code 2014-08-14 10:56:44 +02:00
Magne Sjaastad
6e2dffc399 Linux include fix 2014-08-14 10:56:42 +02:00
Magne Sjaastad
3582d2e30b Removed unused code 2014-08-14 10:56:42 +02:00
Magne Sjaastad
301d274eed Rename 2014-08-14 10:56:41 +02:00
Magne Sjaastad
2069375555 Use shared grid/fault visualization code 2014-08-14 10:56:41 +02:00
Magne Sjaastad
03b68e08c3 Use RivScalarMapperUtils 2014-08-14 10:56:40 +02:00
Magne Sjaastad
eca4276adb Added scalarMapperUtils for code sharing between grids/faults 2014-08-14 10:56:40 +02:00
Magne Sjaastad
c67b75e992 Fixed transparency for ternary well cells 2014-08-14 10:56:39 +02:00
Magne Sjaastad
4c00a48a25 Fixed viz bug introduced by new texturing method 
SHA: a9794815c7
 2014-08-14 10:56:39 +02:00
Magne Sjaastad
24a464ecf9 Use texture based ternary visualization 2014-08-14 10:56:38 +02:00
Magne Sjaastad
1b69f93a11 Added ternary scalar mapper effect generator 2014-08-14 10:56:38 +02:00
Magne Sjaastad
1161ff7c73 Added ternary texture and scalar mappers 2014-08-14 10:56:37 +02:00
Magne Sjaastad
5e478d8336 Layout cleanup 2014-08-14 10:56:37 +02:00
Magne Sjaastad
b414ba0ee3 Created setter for opacity 2014-08-14 10:56:36 +02:00
Magne Sjaastad
0440e21f27 Created texture and texture coord calculations 2014-08-14 10:56:35 +02:00
Magne Sjaastad
e9b67a9599 Added RivTernaryScalarMapper and unit test 2014-08-14 10:56:34 +02:00
Magne Sjaastad
1b3be87074 Moved include from header to cpp 2014-08-14 10:56:33 +02:00
Magne Sjaastad
897ed240c5 Use RigResultAccessor 2014-08-14 10:56:33 +02:00
Magne Sjaastad
8451ffc2fb Added include to RigResultAccessor in factory 2014-08-14 10:56:32 +02:00
Magne Sjaastad
2ab2838e88 Removed obsolete code 2014-08-14 10:56:30 +02:00
Magne Sjaastad
24ff71d23e Prefix function to be deleted to easily spot the function in code 2014-08-14 10:56:30 +02:00
Jacob Støren
419ad87ceb Used new texturing on faults 2014-08-14 10:56:28 +02:00
Jacob Støren
38d2000e29 Wip: New generalized texturing in play 
Only on GridParts
 2014-08-14 10:56:27 +02:00
Jacob Støren
33ab16f7d7 New classes for the generalized texturing 2014-08-14 10:56:27 +02:00
Jacob Støren
e1b67b15e0 Rename of GlobalCell to ReservoirCell 2014-08-14 10:56:26 +02:00
Jacob Støren
37ef1cf71c Renamed globalCellIndex to reservoirCellIndex 2014-08-14 10:56:23 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
9288b766e2 Ternary legend: Minor layout tweaks 2014-08-14 10:56:18 +02:00
Jacob Støren
7ebe9b17b9 Renamed files to reflect new classnames 2014-08-14 10:56:18 +02:00
Jacob Støren
aff8d8fd2a Moved needed code to above "delete" mark 2014-08-14 10:56:14 +02:00
Magne Sjaastad
8a1611c14c Improved visual appearance of legend 2014-08-14 10:56:13 +02:00
Magne Sjaastad
75541e92fb Renamed to RigResultAccessObjectFactory 2014-08-14 10:56:10 +02:00
Magne Sjaastad
b5d1c63966 Renamed to RimFaultResultSlot 2014-08-14 10:56:09 +02:00
Magne Sjaastad
39dc1421c4 Fault visibility : Restructured code 2014-08-14 10:56:08 +02:00
Magne Sjaastad
b2f80c7ef9 Fault result : Use checkbox to enable custom fault visualization 
When checkbox is disabled, faults are visualized using current cell
visualization. When checkbox is activated, fault colors or custom fault
result is active
 2014-08-14 10:56:05 +02:00
Magne Sjaastad
8b04e2a2e8 Ternary legend : Added title 2014-08-14 10:56:05 +02:00
Magne Sjaastad
51d4bd6023 Fault result : Moved config from FaultCollection to FaultResultSettings 2014-08-14 10:56:03 +02:00
Magne Sjaastad
cdbc5829ab Fault result : Renamed file and improved interface 2014-08-14 10:56:01 +02:00
Magne Sjaastad
7f4e5b266b Added missing pointer check 2014-08-14 10:56:00 +02:00
Magne Sjaastad
6416a6d71d Fault result: Moved result mapping from collection to fault result 2014-08-14 10:56:00 +02:00
Magne Sjaastad
a5e928dec1 Removed obsolete fault code 2014-08-14 10:55:58 +02:00
Magne Sjaastad
ff674d8eb0 Always show result color when showing grid 2014-08-14 10:55:54 +02:00
Magne Sjaastad
57f1da1675 Map result color on fault if fault is disabled by user 2014-08-14 10:55:53 +02:00
Magne Sjaastad
cf14cc55fd Create geometry if needed before accessing fault parts 2014-08-14 10:55:52 +02:00
Magne Sjaastad
430f95d52a Rename and simplified control of fault visibility 2014-08-14 10:55:51 +02:00
Magne Sjaastad
f259f21b32 Renamed file to match class name for RimReservoirCellResultStorage 2014-08-14 10:55:51 +02:00
Magne Sjaastad
b13c2621da Linux fixes: Added missing includes 2014-08-14 10:55:50 +02:00
Magne Sjaastad
d21e532c61 Cleaned up includes for ProjectDataModel 2014-08-14 10:55:49 +02:00
Jacob Støren
537a6ef7af Fixed bug/assert introduced after merge 2014-08-14 10:55:45 +02:00
Jacob Støren
34d62964d6 FaultCelledge : Extracted a method from some duplicate code. 2014-08-14 10:55:43 +02:00
Jacob Støren
066a2c5749 First step in refactoring result texture handling 
In order to support more derived reults properties
more consistently across cell/fault/nnc and celledgevisualizations
 2014-08-14 10:55:43 +02:00
Jacob Støren
fc1c7c0b0f Wip - reactoring result texture handling 2014-08-14 10:55:42 +02:00
Jacob Støren
710395bb85 Created StructGrid...ToCellFaceMapper 
Done to start refactoring to pave way for many new combined result
properties
 2014-08-14 10:55:42 +02:00
Jacob Støren
c96169c62e Fixed crash in loading Statistics RegTest manually 2014-07-02 14:11:56 +02:00
Jacob Støren
2a61073b26 Fixed missing Well cell transparency on faults 2014-07-01 14:28:06 +02:00
Jacob Støren
076601e0e5 Fault Results: Fix of crash with None as selected result 
Discovered during regtest
 2014-06-30 11:20:27 +02:00
Jacob Støren
7846bb1ac6 Fixed bug in Combined Trans result. 
Wrong neighbour was used, so the results was actually completely wrong
in any sence for the negative faces.
 2014-06-20 12:41:16 +02:00
Magne Sjaastad
a29a388df2 Fixed issue when combining static and dynamic filters 
Time step index was set to 0 for static results. This was also done for
all other filters, which caused dynamic filters to always evaluate time
step 0
 2014-06-12 08:00:28 +02:00
Magne Sjaastad
071abb2c97 Ternary: Improved positioning of SOIL text and range 2014-05-09 07:32:18 +02:00
Magne Sjaastad
bed902d005 Show ternary range on overlay item 2014-05-06 23:29:41 +02:00
Magne Sjaastad
625a6b5f0e Cleaned up includes 2014-05-06 22:51:17 +02:00
Magne Sjaastad
7c6ff0c533 Added ternary legend config 
Included user defined ranges for SOIL, SGAS, SWAT
 2014-05-06 22:39:53 +02:00
Magne Sjaastad
3b651d7578 Show ternary saturation data on faults 2014-04-29 10:13:19 +02:00
Magne Sjaastad
83a5a34c4b Ternary: Compute color based on local/global min/max values 2014-04-25 16:32:41 +02:00
Magne Sjaastad
03ab3d0a34 Ternary: Use shader based per vertex coloring effect 2014-04-22 11:22:18 +02:00
Magne Sjaastad
b158c0da9d Use polygon offsett to avoid flickering with mesh lines 2014-04-22 11:22:17 +02:00
Magne Sjaastad
0e92bc5d3f Added ternary saturation overlay item 2014-04-22 11:22:16 +02:00
Magne Sjaastad
d10177494e Added ternary saturation visualization 
Ternary saturation available on top of dynamic results
Created visualization for ternary based on SOIL, SGAS and SWAT
 2014-04-22 11:22:15 +02:00
Magne Sjaastad
6aa586f9f5 NNC: Improved visual effects 
Removed use of depth buffer manipulation as this caused invalid result
color mapping for NNC when combined with other fault geometry.
Use polygon offset on NNC geometry to make sure NNC always wins
 2014-01-22 13:17:05 +01:00
Magne Sjaastad
658a513c7f Fault: Show both fault faces in in grid mode to make geometry watertight 2014-01-08 10:47:41 +01:00
Magne Sjaastad
271eb755eb Faults: Fixed update of fault colors (missing files from previous commit) 2014-01-08 08:25:46 +01:00
Magne Sjaastad
f477d7ade6 Faults: Fixed update of fault colors 2014-01-08 08:23:56 +01:00
Magne Sjaastad
7276c2ad31 Faults: Improved forced visibility control of faults. Renaming. 2014-01-07 14:27:43 +01:00
Magne Sjaastad
4391a4ff65 Show fault result mapping in 3D info. Fixed display model update. 2014-01-06 14:02:08 +01:00
Magne Sjaastad
38aca20b84 Faults: Renaming 2014-01-06 13:03:57 +01:00
Magne Sjaastad
c569b9fac1 Faults: Show faults when filters are active 2014-01-06 12:06:36 +01:00
Magne Sjaastad
49a43a036e Pick info and result info: Added face type 2014-01-03 14:59:52 +01:00
Jacob Støren
9aa70640a3 Faults: Use "Cell behind" when showing grid cells 
When any grid cell visualization we need to set the Faults face mode to
the cell behind, to match the needs of the normal grid cell
visualization.
The face culling option is grayed out, but is not altered yet.
 2014-01-03 08:50:15 +01:00
Magne Sjaastad
34ed2d7e9f Option: Renamed to Fault results 2014-01-02 15:24:07 +01:00
Magne Sjaastad
088df79245 Option: Renamed to Show result on faults 2014-01-02 15:20:08 +01:00
Magne Sjaastad
508334fcb0 Faults: Always show fault color option 2014-01-02 11:21:35 +01:00
Magne Sjaastad
1c80a9dbe8 NNC: Prioritize NNC parts when picking in 3D scene 2013-12-20 10:57:53 +01:00
Magne Sjaastad
c3cd245ffa Hide fault labels when fault collection is disabled 2013-12-19 10:37:16 +01:00
Magne Sjaastad
75225b7519 NNC: Picking and result mapping 
Show NNC info in Result Info
Show NNC result mapping for combined transmissibility
 2013-12-19 09:24:35 +01:00
Magne Sjaastad
01e0bf4999 Added source info to communicate both cell indices and face indices 2013-12-19 09:16:30 +01:00
Magne Sjaastad
f492f0eda2 Renaming 2013-12-19 09:16:29 +01:00
Jacob Støren
b7f305b142 Faults: Face culling handles flipaxis 2013-12-19 08:48:36 +01:00
Jacob Støren
2171b1bde4 Faults: First shot on getting the face culling right 
Still needs to handle flipaxis
 2013-12-18 15:49:03 +01:00
Jacob Støren
a6ef98772a Faults: Override backface culling from Grid mode 
When in grid mode, backface culling must always be off, when we do not
have results.
 2013-12-18 13:36:29 +01:00
Magne Sjaastad
bc4ef17409 Create only one label per fault 
Use a separate code path for fault labels to avoid multiple labels on
different sub parts of a fault
 2013-12-18 12:49:41 +01:00
Magne Sjaastad
ae4175dd15 Always connect label line to native fault 2013-12-18 12:49:41 +01:00
sigurdp
0100038db0 Experimental support for offsetting NNCs when drawing 
Utilize polygon offset in conjunction with disabling of depth writes to
layer drawing of NNs on top of other fault drawing.
 2013-12-18 12:13:44 +01:00
Jacob Støren
6d1db22cd8 NNC: Made nnc's folllow cell filters 2013-12-18 10:16:14 +01:00
Magne Sjaastad
55fe73c3b2 Control face culling when mapping results 2013-12-18 09:31:45 +01:00
Magne Sjaastad
d826c79a73 Added face culling in fault part color mode 2013-12-18 09:31:44 +01:00
Magne Sjaastad
a617c4a430 Added more control of face culling 2013-12-18 09:31:43 +01:00
Jacob Støren
473a49f83d Faults: Always show faults when showing Grid 
Always show the faults parts when showing the grid in the "normal" way.
If we do not, there will be holes in the model.
 2013-12-18 09:26:06 +01:00
sigurdp
28d0fbc476 Added support for multi-level polygon offset 
Allow effect generator to tak multiple levels of polygon offsetting.
 2013-12-17 13:11:46 +01:00
Magne Sjaastad
decb0a756e Initialize cell scalar value 2013-12-17 12:19:29 +01:00
Magne Sjaastad
40a4e0d0ab Added combined transmissibility to faults 2013-12-17 11:52:50 +01:00
Magne Sjaastad
a8497bec85 Created static method for update of texture coordinates 2013-12-17 11:52:48 +01:00
Magne Sjaastad
3cf1a0f32a Use helper function to get transmissibility scalar results 2013-12-17 11:52:44 +01:00
Magne Sjaastad
c32cf208f2 Removed redundant call 2013-12-17 11:52:42 +01:00
JacobStoren
880ab554f9 Linux compile fixes. Had to pull out the unused NNC search map. 2013-12-16 13:48:51 +01:00
Jacob Støren
b6437d370c NNC: Fixed crash and made colorupdate work 2013-12-16 11:31:06 +01:00
Jacob Støren
56616097d3 NNC: Added preliminary Gui control 2013-12-16 11:29:48 +01:00
Jacob Støren
925d5b5dd6 NNC: Added NNC parts to the FaultPartMgr 2013-12-14 09:48:13 +01:00
Jacob Støren
1e65a9db11 NNC: Added NNCGeometryGenerator 2013-12-14 09:48:06 +01:00
JacobStoren
d4f5dd6803 Fix of linux Compile warnings 2013-12-14 09:38:55 +01:00
Jacob Støren
bf6fba191e Moved Faluts to MainGrid. New fault calculation 
Now finding the uncovered geometrical faults and adds them to a separate
generated fault.
 2013-12-12 22:18:20 +01:00
Jacob Støren
1be9f1996f Moved GeometryTools w tests to ReservoirDataModel 2013-12-12 22:18:06 +01:00
Jacob Støren
df411efe3f Geometry tools: Made edgeIntersectStorage optional 2013-12-12 22:17:57 +01:00
Magne Sjaastad
e3135e8d08 Use back face culling on faults to avoid z-fighting issues 2013-12-10 11:31:10 +01:00
Magne Sjaastad
48d63495e5 Renamed to RivFaultPartMgr 2013-12-10 07:56:58 +01:00
Magne Sjaastad
07cac1367c Completed fault label color 2013-12-10 07:44:52 +01:00
Magne Sjaastad
98b9bdac03 Cleaned up fault viz config 2013-12-10 07:44:51 +01:00
Magne Sjaastad
1f210e36c1 Added handling of faults on higher level structures 2013-12-10 07:44:51 +01:00
Magne Sjaastad
9a958f3c95 Renamed fault part managers 2013-12-10 07:44:50 +01:00
Magne Sjaastad
d53e9aa9c1 Added global cell indices to faults and added optimalizations 2013-12-10 07:44:49 +01:00
Magne Sjaastad
5edcb1c161 Added label and label anchor line. Setting to control fault outside filter. 2013-12-10 07:44:49 +01:00
Magne Sjaastad
30cc4b0194 Show gridlines for both native and opposite faults always 2013-12-10 07:44:48 +01:00
Magne Sjaastad
58c4a87c49 Added concept of native and opposite fault faces 2013-12-10 07:44:47 +01:00
Magne Sjaastad
1f208e3f53 Renaming 2013-12-10 07:44:46 +01:00
Magne Sjaastad
363d624d38 Use global cell indices instead of cell ranges 2013-12-10 07:44:46 +01:00
JacobStoren
5ca8911a68 Linux compile fixes 2013-12-09 15:48:55 +01:00
Jacob Støren
63e945fedf Fixed error in test 2013-12-09 09:40:05 +01:00
Jacob Støren
d80611a61c Geometry tools update finalizing with Unit tests 2013-12-06 14:23:51 +01:00
Jacob Støren
819a2ab93e Wip 2013-12-05 11:02:05 +01:00
Jacob Støren
f92ca7fba7 Templatized some geometry tools 2013-12-05 11:02:02 +01:00
Jacob Støren
286bae9e85 Preparations for Templateification 2013-12-05 11:01:59 +01:00
Jacob Støren
d4345bef7d Preparations for Templatification 2013-12-05 11:01:57 +01:00
Jacob Støren
acef0c441d CMakeList error 2013-12-05 11:01:54 +01:00
Jacob Støren
05200fe01f Added MSVC ignores to .gitignore Start point of geometry fixes 2013-12-05 11:01:52 +01:00
JacobStoren
741debebd2 Fixed Linux compile issues 2013-12-05 10:48:57 +01:00