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
1,931 Commits 27 Branches 61 Tags 309 MiB
ceeb38d13a
Commit Graph

616 Commits

Author SHA1 Message Date
Jacob Støren
1e59e050e6 Moved methods 2014-08-26 15:34:14 +02:00
Magne Sjaastad
473a701bf5 Result info : Improved display of text 2014-08-26 13:41:34 +02:00
Jacob Støren
28f5639607 riTRANSXYZ: Removed unused code 2014-08-26 13:36:38 +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
8dc2eed3c0 Moved loading of dependent datasets 2014-08-25 13:20:58 +02:00
Magne Sjaastad
4d1d2215c2 Fixed memory allocation issues when computing SOIL 2014-08-25 10:31:36 +02:00
Jacob Støren
11c01af61a riTRANSXYZ: First version working 
Not yet extensively tested, but seems ok for complete match faces
 2014-08-22 13:39:24 +02:00
Jacob Støren
57a049d39f riTRANSXYZ: Moving the calculation to ReservoirCellResultsStorage 
Create stored native riTRANX,Y,Z results instead of doing everyting in
one go.
This makes the statistics calculation work automatically instead of
beeing custoized and require a compplete calculation of its own.
 2014-08-22 13:39:23 +02:00
Jacob Støren
9e22c90a4a Renamed cellindex to gridLocalCellIndex 2014-08-22 13:39:21 +02:00
Magne Sjaastad
03df28282c Show NNCs with no common area in folder below Faults 2014-08-22 09:28:25 +02:00
Magne Sjaastad
ecfea98e20 Fault results: Show fault color if color mode is selected 2014-08-21 13:16:08 +02:00
Magne Sjaastad
f3c7c3017c Info window in 3D: Added fault property name 2014-08-21 12:16:18 +02:00
Magne Sjaastad
f29d3c2876 Result Info: Write out result values for fault in addition to grid 2014-08-21 12:06:18 +02:00
Magne Sjaastad
e4e3cca05f Moved creation of placeholder results to to RimCase 2014-08-21 08:39:19 +02:00
Jacob Støren
9e4c39627d Rename variable 2014-08-20 11:33:03 +02:00
Jacob Støren
b7693f449b Fixed missing result names when auto SOIL is off 2014-08-20 11:32:50 +02:00
Jacob Støren
83965a4f7b riTRANXYZ: Started to add it to the rest of the system 2014-08-20 09:51:55 +02:00
Magne Sjaastad
7e815a8641 Corrected combined mult result name 2014-08-19 14:57:36 +02:00
Magne Sjaastad
2fe63ece50 Use result accessors instead of StructGridScalarDataAccess 2014-08-19 14:30:12 +02:00
Magne Sjaastad
f98a909e51 Removed obsolete code and renamed functions 2014-08-19 14:02:21 +02:00
Magne Sjaastad
72daff665d Added function used to filter out per cell results by result name 2014-08-19 13:56:17 +02:00
Magne Sjaastad
eb96c5a7ed Property filer: Do not show (combined) per face results 2014-08-19 13:35:10 +02:00
Magne Sjaastad
be224149f0 Added riMULTXYZ to result selection UI 2014-08-19 13:20:12 +02:00
Magne Sjaastad
af89f3e45e Use icon update functions from pdmDocument 2014-08-19 10:57:55 +02:00
Magne Sjaastad
8e332366ac Execute initAfterRead when a reservoir view is created 
Updates visibility of application icons
 2014-08-14 11:45:13 +02:00
Magne Sjaastad
7e5c46cf59 Added support for cell edge on faults 2014-08-14 10:56:47 +02:00
Magne Sjaastad
20d70d0565 Bugfix statistics: Trigger loading of dataset before creating a result accessor 2014-08-14 10:56:43 +02:00
Magne Sjaastad
1161ff7c73 Added ternary texture and scalar mappers 2014-08-14 10:56:37 +02:00
Magne Sjaastad
1b3be87074 Moved include from header to cpp 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
0bef6369e1 Deleted unused code 2014-08-14 10:56:32 +02:00
Magne Sjaastad
ee939c8377 Use RigResultAccessor 2014-08-14 10:56:31 +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
09313c6caa More Rename of globalCell to reservoirCell 2014-08-14 10:56:25 +02:00
Jacob Støren
3022a40204 Renamed globalCell to reservoirCell etc. 2014-08-14 10:56:25 +02:00
Jacob Støren
6cdd9cfdc5 Renamed globalGridCellIndex to reservoirCellIndex 2014-08-14 10:56:24 +02:00
Jacob Støren
16f762984e Renamed more stuff to gridLocalCellIndex 2014-08-14 10:56:24 +02:00
Jacob Støren
37ef1cf71c Renamed globalCellIndex to reservoirCellIndex 2014-08-14 10:56:23 +02:00
Jacob Støren
0ea794a1a8 Renamed localCellIndex to gridLocalCellIndex 2014-08-14 10:56:23 +02:00
Magne Sjaastad
d9e9a173e4 Added RigResultModifier and use this object for result modifications 2014-08-14 10:56:22 +02:00
Jacob Støren
7a3d90daa4 Removed fvector and replaced with FixedArray. 
Needs replacing with std::array when we get to c++11
 2014-08-14 10:56:21 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
3c52137481 Reordered UI 2014-08-14 10:56:14 +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
0550f9df8c Improved handling of icon enabled state 2014-08-14 10:56:08 +02:00
Magne Sjaastad
e814246e22 Fault result : Renamed in tree view 2014-08-14 10:56:07 +02:00
Magne Sjaastad
79fbe65686 Fault result: Moved fault result up one level in tree view 2014-08-14 10:56:06 +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
d7f569360c Fault result: Updated icon 2014-08-14 10:56:03 +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
6416a6d71d Fault result: Moved result mapping from collection to fault result 2014-08-14 10:56:00 +02:00
Magne Sjaastad
11967c5161 Preferences : Added support for pdm objects recursively 2014-08-14 10:55:59 +02:00
Magne Sjaastad
0d14436b97 Fault result: Added fault result legend 2014-08-14 10:55:59 +02:00
Magne Sjaastad
710b9392ec Fault result: Added custom result to fault result project model 2014-08-14 10:55:58 +02:00
Magne Sjaastad
0d6c6f2785 Improved management of multiple legend overlay items 2014-08-14 10:55:57 +02:00
Magne Sjaastad
032a263685 Performance: Control how much data to import from file 
User can control if faults, NNCs and simulation wells are to be imported
from file.
 2014-08-14 10:55:56 +02:00
Magne Sjaastad
d8f412017e Faults: Added fault result mapping management 2014-08-14 10:55:56 +02:00
Magne Sjaastad
9925556579 Added hide fault to context menu in 3D view 2014-08-14 10:55:54 +02:00
Magne Sjaastad
4189719b87 Moved update for force visibility before retrieving display 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
9ffb919fb5 Linux fix: Added missing include 2014-08-14 10:55:50 +02:00
Magne Sjaastad
ecc7e9de59 Linux fix: Added missing include 2014-08-14 10:55:49 +02:00
Magne Sjaastad
d21e532c61 Cleaned up includes for ProjectDataModel 2014-08-14 10:55:49 +02:00
Magne Sjaastad
9236d27272 Removed obsolete includes 2014-08-14 10:55:47 +02:00
Magne Sjaastad
31274dbb00 Aggregated common Octave argument list 2014-08-14 10:55:47 +02:00
Jacob Støren
c96169c62e Fixed crash in loading Statistics RegTest manually 2014-07-02 14:11:56 +02:00
Jacob Støren
d29590080e Fixed Property filter Crash 
Introduced by the well cell awareness in faults
 2014-07-02 11:54:51 +02:00
Jacob Støren
2d9dd7c75b Turned On results on Faults by default 2014-07-01 14:29:31 +02:00
Jacob Støren
8f798cd78b Info Box: Shortened Fault result text 2014-07-01 14:28:49 +02:00
Jacob Støren
f5b0e03211 Fix of crash: Compute SOIL for Fracture Results 
https://github.com/OPM/ResInsight/issues/179
 2014-06-30 11:10:35 +02:00
Magne Sjaastad
6a20f16de1 Legend config: Do not show two configs when loading new case 2014-06-13 08:12:45 +02:00
Magne Sjaastad
dbdd28fcde When no ternary component is present, hide TERNARY result 2014-05-09 07:34:27 +02:00
Magne Sjaastad
bed902d005 Show ternary range on overlay item 2014-05-06 23:29:41 +02:00
Magne Sjaastad
cc4e9eb505 Make sure size_t is defined on Linux 2014-05-06 23:29:03 +02:00
Magne Sjaastad
625a6b5f0e Cleaned up includes 2014-05-06 22:51:17 +02:00
Magne Sjaastad
89dd686261 Added missing include on Linux 2014-05-06 22:50:49 +02:00
Magne Sjaastad
918f2c4305 Removed ternary specific code and cleaned up includes 2014-05-06 22:40:25 +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
0c3e54b130 Ternary: Added possibility to switch between local and global range 2014-04-25 16:32:06 +02:00
Magne Sjaastad
585f034799 Bugfix: Get pointer to data after adding data to std vector 
When SOIL is created, a new dataset is appended to a std vector. Pointer
to SWAT and SGAS data must be aquired AFTER the new dataset is added.
Adding data to a vector can trigger reallocation of data.
 2014-04-25 14:36:34 +02:00
Magne Sjaastad
62a2c9e3ce Fixed mock models 2014-04-24 08:32:43 +02:00
Magne Sjaastad
e5712e9809 Cleanup after merge 2014-04-22 14:39:09 +02:00
Magne Sjaastad
03516a8336 Added mock model settings 2014-04-22 13:17:27 +02:00
Magne Sjaastad
0fbcc57473 Use caf property dialog and removed obsolete riuPreferencesDialog 2014-04-22 13:16:31 +02:00
Magne Sjaastad
b7377e1873 Adde linebreak if no statistics are present 2014-04-22 11:22:19 +02:00
Magne Sjaastad
489b25531f Hide UI for ternary saturation legend config 2014-04-22 11:22:18 +02:00
Magne Sjaastad
b958d01540 Added missing test for ternary saturation result 2014-04-22 11:22:17 +02:00
Magne Sjaastad
02c4f8cff7 Use timestep when creating data access object 2014-04-22 11:22:16 +02:00
Magne Sjaastad
0e92bc5d3f Added ternary saturation overlay item 2014-04-22 11:22:16 +02:00
Magne Sjaastad
7dda4d8437 Remove ternary from property filter result selection list 2014-04-22 11:22:15 +02:00
Magne Sjaastad
79b523522d Show ternary info in result info by picking on cells 2014-04-22 11:22:15 +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
7b68c3cb6b Fix after merge conflicts take two 2014-04-14 10:24:15 +02:00
Magne Sjaastad
ce33c00219 Files fixed after merge conflicts 2014-04-14 09:25:27 +02:00
Magne Sjaastad
4aeac9197b Use caf property dialog and removed obsolete riuPreferencesDialog 2014-04-14 09:16:06 +02:00
Magne Sjaastad
6e3860571e Improved mock model settings and use caf property dialog 2014-04-14 09:16:05 +02:00
Magne Sjaastad
ae9f72912e Added customized mock model to user interface 2014-04-14 09:16:03 +02:00
Magne Sjaastad
5961b267b6 Added mock model settings 2014-04-14 09:12:39 +02:00
Magne Sjaastad
3e8a206f13 Moved mock model identicators to RimDefines 2014-04-14 09:06:46 +02:00
Magne Sjaastad
43adffdc83 Use setValueFromUi to update connected editors when pushing toolbuttons 2014-01-23 09:19:04 +01:00
Magne Sjaastad
f8254075cd Result Info: Show fault name only when picking on fault 2014-01-23 08:19:37 +01:00
Magne Sjaastad
8f56fa6ad4 Show fault name in Result Info when picking NNC 2014-01-23 07:53:17 +01:00
Magne Sjaastad
209919c651 Toolbar: Added button control for toolbar labels 2014-01-23 07:31:07 +01:00
Magne Sjaastad
b12e09c86d Updated defaults and modified GUI labels 2014-01-22 14:05:20 +01:00
Magne Sjaastad
ccf689b203 Show combined transmissibility first in list 2014-01-22 14:04:09 +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
8133f73d3b Faults: Use cell behind fault as default 2014-01-08 07:34:22 +01:00
Magne Sjaastad
c1f1804770 Faults: Include inactive fault geometry 2014-01-07 15:07:02 +01:00
Magne Sjaastad
7276c2ad31 Faults: Improved forced visibility control of faults. Renaming. 2014-01-07 14:27:43 +01:00
Magne Sjaastad
645f824ed0 Info window: Show all result properties mapped on faults 2014-01-07 11:08:38 +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
cea0e37d30 Faults: Only one label per fault when property filter is active 2014-01-06 13:14:25 +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
78571b0912 Removed apostrophe 2014-01-06 07:11: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
be81dbf711 Faults: Reordering and improving the Properties UI 
Disabled options when not applicable.
Put options into groups.
Renamed to clarify.
 2014-01-03 13:43:00 +01:00
Magne Sjaastad
a7a4102ef7 Pick info: Show NNC cell face 2014-01-03 11:27:06 +01:00
Magne Sjaastad
1a83008e39 Show fault count in fault collection tooltip 2014-01-03 09:40:39 +01:00
Jacob Støren
465e67ba64 Faults: Fixed mixed option names 2014-01-03 08:58:26 +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
202f6b799e Renamed to Result property 2014-01-03 07:24:19 +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
b2376b4a77 Renamed to Show faults outside filters 2014-01-02 15:15:50 +01:00
Magne Sjaastad
183203344b Option: Read fault data 2014-01-02 15:10:33 +01:00
Magne Sjaastad
ae95d44315 NNC: Improved readability of cell IJK listing 2014-01-02 11:46:17 +01:00
Magne Sjaastad
508334fcb0 Faults: Always show fault color option 2014-01-02 11:21:35 +01:00
Magne Sjaastad
1ea31f61ba Do not include CombinedTransmissibility in variable lists 2014-01-02 10:24:37 +01:00
Jacob Støren
ff361b39ef Batch: Fixed crash related to statistics calculations 2013-12-20 14:46:21 +01:00
Magne Sjaastad
8abfbd3730 Faults: Hide labels by default, set fault collection selected 2013-12-20 14:34:38 +01:00
Magne Sjaastad
e8137ff78a NNC: Show IJK values in Result Info 2013-12-20 14:29:08 +01:00
Magne Sjaastad
59eeb0894f Faults: Eclipse input case use preferences to control import of faults 2013-12-20 09:18:52 +01:00
Magne Sjaastad
b7141dde50 Preferences: Read faults on import and fault default visibility 2013-12-20 08:48:54 +01:00
Jacob Støren
b52c0fcdd3 NNC: Added face to result info text 2013-12-19 10:50:48 +01:00
Jacob Støren
cf7de9d588 Removed Geometry faults toggle, and disabled calculation 2013-12-19 10:50:45 +01:00
Magne Sjaastad
abc89ec7e7 Rename 2013-12-19 09:54:50 +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
Jacob Støren
a20e08237b Toolbar - Gridlines - Faults only option #74 2013-12-18 23:37:30 +01:00
Jacob Støren
ee135b5949 Faults: Set default faceculling to show inside 
And aligned some code
 2013-12-18 19:02:07 +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
13c387e787 Fixed missing update when toggling Fault mode 2013-12-18 13:36:26 +01:00