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

554 Commits

Author SHA1 Message Date
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
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
b2f31b8045 Added face culling control 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
Magne Sjaastad
b53e21a61d Store filenames for files with faults in project file 2013-12-17 11:52:53 +01:00
Magne Sjaastad
78699d52eb Added pick info on combined transmissibility 2013-12-17 11:52:45 +01:00
Magne Sjaastad
e824b8f7b0 Added special handling of combined transmissibility 2013-12-17 11:52:40 +01:00
Jacob Støren
57e136d50a NNC: Added some progress info 2013-12-16 15:57:15 +01:00
Jacob Støren
56616097d3 NNC: Added preliminary Gui control 2013-12-16 11:29:48 +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
Magne Sjaastad
0a87811263 Show fault name in ResultInfo when picking 2013-12-10 08:26:49 +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
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
d515d0342b Added control flags to fault collection 2013-12-10 07:44:45 +01:00
JacobStoren
741debebd2 Fixed Linux compile issues 2013-12-05 10:48:57 +01:00
Magne Sjaastad
19737aa99a Use const access for FixedArray. Added sorting of faults 2013-12-05 09:59:05 +01:00
sigurdp
477792e89d Refactored naming of cvfqt:Utils member functions 2013-12-04 17:04:05 +01:00
sigurdp
cc72c7b2f6 Merged down changes from Resinsight dev branch 2013-12-04 16:06:48 +01:00
Jacob Støren
32da41faee Fixed compile errors in debug 2013-12-04 13:20:16 +01:00
Magne Sjaastad
2d22d31e12 Use several colors for faults to be able to separate them 2013-12-04 12:13:01 +01:00
Magne Sjaastad
f85b8aad08 Updated header 2013-12-04 09:39:50 +01:00
Magne Sjaastad
12918ec107 Faults: Reading from Eclipse text files and basic visualization 
Added reading of faults directly from Eclipse text files
Added named faults in project tree
Added fault geompetry parts
Added test data
 2013-12-03 20:30:32 +01:00
sigurdp
f2821cf9be Added member to recompute all statistics 
Added member function
RimAnalysisModels::recomputeStatisticsForAllCaseGroups().
 2013-12-02 08:56:42 +01:00
sigurdp
498918e050 Added RimResultCase::setGridFileName() 2013-12-02 08:55:13 +01:00
Magne Sjaastad
c0c78c8ada Use caf property dialog and removed obsolete riuPreferencesDialog 2013-10-28 12:50:39 +01:00
Magne Sjaastad
ae38128969 Improved mock model settings and use caf property dialog 2013-10-28 12:05:06 +01:00
Magne Sjaastad
93ba02c7db Added customized mock model to user interface 2013-10-28 10:32:24 +01:00
Magne Sjaastad
e43bcd56b9 Added mock model settings 2013-10-28 10:30:58 +01:00
Magne Sjaastad
797e9df01d Moved mock model identicators to RimDefines 2013-10-28 07:30:00 +01:00
Magne Sjaastad
de476c38ce Added context menu for add case group 2013-10-24 11:10:33 +02:00
Magne Sjaastad
cd686990f0 Improved context menu for well collection and analysis model 2013-10-24 11:06:26 +02:00
Magne Sjaastad
f6cb4baf7e Delete child object to fix memory leak 2013-10-24 09:53:27 +02:00
Magne Sjaastad
40092b0d62 SSIHUB: Update file paths for and well path cache 
Consolidated cache creation in RimTools
 2013-10-24 09:50:21 +02:00
Magne Sjaastad
f145302206 SSIHUB: Copy cache well paths using setupBeforeSave() 2013-10-24 07:28:45 +02:00
Jacob Støren
538efff651 Grid Case Group: Relabeled "Cases" to "Source Cases" 2013-10-23 22:13:01 +02:00
Jacob Støren
ea855ceed2 User Doc: Finalized Wells and thereby Views 2013-10-23 18:14:08 +02:00
Magne Sjaastad
f61731da74 Renaming to Info Box 2013-10-23 16:04:12 +02:00
Magne Sjaastad
8e32b8f770 Renaming 
Renamed simulated wells from Wells to Simulation Wells
Renamed group name for Well range filter
 2013-10-23 15:51:30 +02:00
Magne Sjaastad
76ffd7e937 Well paths: Update display model after delete 2013-10-23 08:07:11 +02:00
Magne Sjaastad
9abc3387aa SSIHUB: Added visibility checkbox next to well path collection 2013-10-22 15:30:12 +02:00
Jacob Støren
9eb4b19384 Use the improved Ceetron Navigation 2013-10-20 00:42:14 +02:00
Jacob Støren
f7869f9a5c Ui brush-up of View property panel 2013-10-17 13:38:53 +02:00
Jacob Støren
63177ef234 Ui Brushup of Well property panels 2013-10-17 13:38:52 +02:00
Magne Sjaastad
4459fe0c71 Added ResInsightVersion.cmake to list of files. Removed redundant 
includes.
 2013-10-09 08:54:51 +02:00
Magne Sjaastad
3f7bdbb5ec Use filename from file containing the grid as InputCase case description. Fixed Input Case Mock model. 2013-10-08 14:30:42 +02:00
Magne Sjaastad
d1f8f383c4 ERT: Use 1-based ids for well branches and segments. Removed adding of 1 
in picking text info in RimReservoirView.

Integraded ERT from
0f9e820554
 2013-10-08 12:31:15 +02:00
JacobStoren
3264520619 File paths: Convert native Win paths to use "/" 
On linux we need to convert filepaths produced on windows manually
before trying to find the relatively placed files referenced by the
project.
 2013-10-07 11:46:28 +02:00
Jacob Støren
35f7b7db2f Added some comments on getting rid of QModelIndex based commands 2013-10-03 14:43:02 +02:00
Magne Sjaastad
0a3ce268ac Increased default number of significant digits to 4 2013-10-03 11:07:52 +02:00
Jacob Støren
56590a8c55 New Case groups is now correctly positioned in the tree. 
The context command was not quite up to speed.
 2013-10-02 15:51:25 +02:00
Jacob Støren
5e51ded9a9 Well Label Color: Added label color setting on Well Paths 2013-10-01 11:47:57 +02:00
Jacob Støren
2c546ea1e9 Linux/Win Line ending harmonization 2013-10-01 11:47:56 +02:00
Jacob Støren
a8f9851896 Well Label Color: Preferences for new views and color setting on well 
collection.
 2013-10-01 11:13:23 +02:00
Jacob Støren
567f16ad43 Removed Wellhead cell visualization if cell is not active 
Issue #63
 2013-09-30 15:22:48 +02:00
Magne Sjaastad
e02d2f2300 Performance: Recompute legend only when required 2013-09-30 13:29:29 +02:00
Ceetron
26d5a7c5b0 Legend: Fixed legend numbers being completely wrong. 
The abs() function is only integer on linux RH5.
Caused legend numbers to be truncated (0 typically)
 2013-09-27 14:43:11 +02:00
Magne Sjaastad
227e3e6353 Hide all items for well path import in ResInsight project workspace 2013-09-27 07:29:01 +02:00
Magne Sjaastad
517047c330 Added progress info when reading well path files 2013-09-26 14:49:28 +02:00
Jacob Støren
a283d6ac23 Legend: Now number format is really based on number of Significant 
digits.
Brushed up the labels and organized the ui into two groups. Added some
tooltips as well.
 2013-09-26 10:44:20 +02:00
Jacob Støren
a3d964e4eb Legend: Made number of digits after point be adjusted to show the number 
of significant digits defined by the user.
Not quite complete the solutions is. There are cornercases not covered
well yet.
* Fixed rounding error.
 2013-09-26 01:05:09 +02:00