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,877 Commits 27 Branches 61 Tags 309 MiB
0d56ee060e
Commit Graph

1277 Commits

Author SHA1 Message Date
Magne Sjaastad
51d4bd6023 Fault result : Moved config from FaultCollection to FaultResultSettings 2014-08-14 10:56:03 +02:00
Magne Sjaastad
07b25a2f60 Added special handling to expand an item in tree view 2014-08-14 10:56:02 +02:00
Magne Sjaastad
73f29bb115 Recent files : Show full path in tooltip 2014-08-14 10:56:02 +02:00
Magne Sjaastad
fe712222ce Recent files : Set last opened file first, remove file if load fails 2014-08-14 10:56:01 +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
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
a5e928dec1 Removed obsolete fault code 2014-08-14 10:55:58 +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
ce58846584 Updates to tests 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
23d44a0747 Make sure grid view is active after a range filter is added 2014-08-14 10:55:55 +02:00
Magne Sjaastad
9925556579 Added hide fault to context menu in 3D view 2014-08-14 10:55:54 +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
9fd4c268d8 Adjusted file unit test 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
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
7db9b83c45 Added recent file list 2014-08-14 10:55:48 +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
Magne Sjaastad
329ec921e8 Preferences : Control if info text from Octave is displayed before executing scripts 2014-08-14 10:55:46 +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
549e61af77 Fixed some compiler warnings 2014-08-14 10:55:41 +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
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
f5b0e03211 Fix of crash: Compute SOIL for Fracture Results 
https://github.com/OPM/ResInsight/issues/179
 2014-06-30 11:10:35 +02:00
Jacob Støren
e1c55e4452 Comb Trans: Fixed max/min and close to zero calc 2014-06-20 14:05:28 +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
6a20f16de1 Legend config: Do not show two configs when loading new case 2014-06-13 08:12:45 +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
7faf950dc7 riGetActiveCellProperty: Fix for input properties 
Only read values for active cells if we have result values for all cells
 2014-06-11 12:06:15 +02:00
Magne Sjaastad
a37b9f6ea2 Consolidated reading of double data from input file 2014-06-11 08:42:47 +02:00
Magne Sjaastad
f68aa1908d Show help message if positional parameters is present 2014-06-05 07:34:34 +02:00
Magne Sjaastad
dbdd28fcde When no ternary component is present, hide TERNARY result 2014-05-09 07:34:27 +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
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
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
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
3608c36291 Added test to guard for invalid cell index 2014-04-25 12:13:09 +02:00
Magne Sjaastad
2e45fc41cb Improved robustness for reading faults 2014-04-25 08:39:42 +02:00
Magne Sjaastad
dbe54ff9bf Performance: Reverted OpenMP, as the function needs rewrite 2014-04-24 10:25:22 +02:00
Magne Sjaastad
d3456ffcc9 Performance: Use OpenMP for fault calculations 2014-04-24 09:53:40 +02:00
Magne Sjaastad
366c3cd2e8 Performance: Use OpenMP for static data 2014-04-24 09:52:46 +02:00
Magne Sjaastad
62a2c9e3ce Fixed mock models 2014-04-24 08:32:43 +02:00
Magne Sjaastad
0f8b844873 Use max block size when reading from socket 2014-04-24 07:40:29 +02:00
Magne Sjaastad
e5712e9809 Cleanup after merge 2014-04-22 14:39:09 +02:00
Magne Sjaastad
d529e58c56 Fixed block transfer 2014-04-22 13:17:54 +02:00
Magne Sjaastad
e799a25c2e Block transfer for active cell info 2014-04-22 13:17:53 +02:00
Magne Sjaastad
19b655542a Use block transfer for data transfer of cell properties 2014-04-22 13:17:53 +02:00
Magne Sjaastad
eec2ffbecd Fixed invalid assert 2014-04-22 13:17:52 +02:00
Magne Sjaastad
32bfb65a9d Added socket data transfer 
Added one common class used to transfer data using socket. This class is
used both from the Octave plugins and from the socket server code in
ResInsight
 2014-04-22 13:17:52 +02:00
Magne Sjaastad
1693ae25dd Updated riGetGridProperty 2014-04-22 13:17:47 +02:00
Magne Sjaastad
b16536c9b0 Use socket block read/write for geometry data 2014-04-22 13:17:45 +02:00
Magne Sjaastad
492d86c39f Added block read from socket 2014-04-22 13:17:44 +02:00
Magne Sjaastad
c2f80f402d Fixed used on unsigned 2014-04-22 13:17:43 +02:00
Magne Sjaastad
e5248683f0 Added block write to socket tools 2014-04-22 13:17:43 +02:00
Magne Sjaastad
7a07b2926e Added flag to control how to do IO with sockets 2014-04-22 13:17:42 +02:00
Magne Sjaastad
343dba02f8 Added flag to control adding of well data 2014-04-22 13:17:28 +02:00
Magne Sjaastad
03516a8336 Added mock model settings 2014-04-22 13:17:27 +02:00
Magne Sjaastad
d751128fde Added isCoarseningActive 2014-04-22 13:17:14 +02:00
Magne Sjaastad
c74851bfff Performance: Reduce memory use for riGetPropertyData 2014-04-22 13:16:32 +02:00
Magne Sjaastad
a36d4c9b73 Performance: Added OpenMP to mock models 2014-04-22 13:16:32 +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
03ab3d0a34 Ternary: Use shader based per vertex coloring effect 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
b158c0da9d Use polygon offsett to avoid flickering with mesh lines 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
8eb040e7cb Fixed block transfer 2014-04-15 16:20:21 +02:00
Magne Sjaastad
476387fda4 Block transfer for active cell info 2014-04-15 14:03:41 +02:00
Magne Sjaastad
b4821ed7a3 Use block transfer for data transfer of cell properties 2014-04-15 13:40:53 +02:00
Magne Sjaastad
8ea418272d Fixed invalid assert 2014-04-15 13:04:57 +02:00
Magne Sjaastad
0f01703ac3 Added socket data transfer 
Added one common class used to transfer data using socket. This class is
used both from the Octave plugins and from the socket server code in
ResInsight
 2014-04-14 14:36:47 +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
0562f92585 Updated riGetGridProperty 2014-04-14 09:18:26 +02:00
Magne Sjaastad
874b05b119 Added isCoarseningActive 2014-04-14 09:18:25 +02:00
Magne Sjaastad
acc1d732d7 Use socket block read/write for geometry data 2014-04-14 09:18:24 +02:00
Magne Sjaastad
364ea1f937 Added block read from socket 2014-04-14 09:18:22 +02:00
Magne Sjaastad
c1419e53e8 Fixed used on unsigned 2014-04-14 09:18:22 +02:00
Magne Sjaastad
039ba48bed Added block write to socket tools 2014-04-14 09:18:21 +02:00
Magne Sjaastad
3ec22a9221 Added flag to control how to do IO with sockets 2014-04-14 09:18:20 +02:00
Magne Sjaastad
b9b5441bdb Performance: Reduce memory use for riGetPropertyData 2014-04-14 09:16:07 +02:00
Magne Sjaastad
60ff9c5a2b Performance: Added OpenMP to mock models 2014-04-14 09:16:06 +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
7ffe48bff9 Added flag to control adding of well data 2014-04-14 09:14:39 +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
770f706803 Updated riGetGridProperty 2014-04-03 11:56:01 +02:00
Magne Sjaastad
9aa32e4a88 Added isCoarseningActive 2014-04-03 10:58:29 +02:00
Magne Sjaastad
05f1c056b7 Use socket block read/write for geometry data 2014-04-03 10:41:27 +02:00
Magne Sjaastad
e748f087a7 Added block read from socket 2014-04-02 08:55:26 +02:00
Magne Sjaastad
f5e1773fde Fixed used on unsigned 2014-04-01 15:36:08 +02:00
Magne Sjaastad
4ab5e28cf7 Added block write to socket tools 2014-04-01 15:31:13 +02:00
Magne Sjaastad
af6d92d64e Added flag to control how to do IO with sockets 2014-04-01 13:02:52 +02:00
Magne Sjaastad
dc040d673a RegressionTest: Improved application configuration 
Disable read of faults (preferences)
Disable faults outside filters
Enable result mapping on faults
 2014-01-23 13:17:49 +01:00
Magne Sjaastad
e0b093d78d Replace space with underline in snapshot generated filenames 2014-01-23 09:25:22 +01:00
Magne Sjaastad
43adffdc83 Use setValueFromUi to update connected editors when pushing toolbuttons 2014-01-23 09:19:04 +01:00
Magne Sjaastad
d1aacfaf1e Improved tool button image 2014-01-23 09:06:56 +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
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
4f079549f3 Removed trace output 2014-01-08 13:33:57 +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
dbc357eb39 Avoid duplicate filenames containing faults 2014-01-08 10:07:42 +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
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
3e6954d7f5 Read multiple FAULTS keywords 
A list of files are cached in the project file. When reading faults from
these files, make sure multiple FAULTS keywords in the same file is
parsed.
 2014-01-03 09:44:13 +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
de7dddc25e Add a folder to global path for Octave environment on Windows 2014-01-02 14:31:10 +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
Magne Sjaastad
9c7c8f1969 NNC: Use smaller depth distance for pick threshold 2013-12-20 14:53:48 +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
1c80a9dbe8 NNC: Prioritize NNC parts when picking in 3D scene 2013-12-20 10:57:53 +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
Magne Sjaastad
d165d6ce38 Fixed rename on Linux 2013-12-19 11:07:33 +01:00
Jacob Støren
909831ad34 NNC: Removed some debug output 2013-12-19 10:50:51 +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
f13f91d74d Show updated help text from menu Help -> Command line help 2013-12-19 10:45:15 +01:00
Magne Sjaastad
c3cd245ffa Hide fault labels when fault collection is disabled 2013-12-19 10:37:16 +01:00
sigurdp
f0c0df2efa Cleaned op help text for command line options. 
Also semoved old argument arsing implementation
 2013-12-19 10:07:19 +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
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
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
12e818b3b2 Updated cell topology comments 2013-12-18 15:36:28 +01:00
Jacob Støren
a2dd688df1 Fixed cell coordinate debug output 2013-12-18 15:35:23 +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
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
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
b2f31b8045 Added face culling control 2013-12-18 09:31:43 +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
Jacob Støren
8b52a43360 NNC: Typo in message 2013-12-18 09:20:53 +01:00
Jacob Støren
1639240240 Faults: Readded geometry fault generation 2013-12-17 13:28:13 +01:00
Jacob Støren
344ac7a146 Faults Guarded Fault neighbour calculation 2013-12-17 13:28:10 +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
f6510210b0 Fix for null pointer 2013-12-17 11:52:53 +01:00
Magne Sjaastad
b53e21a61d Store filenames for files with faults in project file 2013-12-17 11:52:53 +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
78699d52eb Added pick info on combined transmissibility 2013-12-17 11:52:45 +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
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
a39fe493f2 NNC: Fixed assert oposite face of NO_FACE 2013-12-16 15:56:57 +01:00
Jacob Støren
2a31035fb4 NNC: Added som diagnostics output 2013-12-16 14:26:07 +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
7e2d860bba NNC: Tried to fix Linux typename compile issue 2013-12-16 11:40:50 +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
440499fbfd NNC: Add connection to both faults if different 2013-12-16 11:26:29 +01:00
Jacob Støren
925d5b5dd6 NNC: Added NNC parts to the FaultPartMgr 2013-12-14 09:48:13 +01:00
Jacob Støren
e75bd8adfb NNC: Distribute the NNC on the correct faults 
Making the NNC search map obsolete
 2013-12-14 09:48:10 +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
e175a5c96f Refactored to use Cell::faceIndices 2013-12-12 22:18:14 +01:00
Jacob Støren
e171aa66ac NNC processing first cut 2013-12-12 22:18:11 +01:00
Jacob Støren
1be9f1996f Moved GeometryTools w tests to ReservoirDataModel 2013-12-12 22:18:06 +01:00
Jacob Støren
04ccadd2f1 NNC import started 2013-12-12 22:18:03 +01:00
Jacob Støren
81176258bc RigCell: Added faceIndices and faceNormal methods 2013-12-12 22:18:00 +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
0a87811263 Show fault name in ResultInfo when picking 2013-12-10 08:26:49 +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
c8a4db6571 Added faults to mock models 2013-12-10 07:44:48 +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
Magne Sjaastad
d515d0342b Added control flags to fault collection 2013-12-10 07:44:45 +01:00
Magne Sjaastad
6179d84b87 Use cell indices in RigBase 2013-12-10 07:44:45 +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
776ed7755e Improved FixedArray 2013-12-06 14:22:01 +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
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
sigurdp
368af75bf2 Refactored ProgramOptions class 2013-12-04 14:56:04 +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
sigurdp
0656b5254f First cut, command line options for batch processing 
First cut implementation of command line oprions for batch proccessing.
Added support for the follwoing new command line options:
size, replacecase, replaceSourceCase and multiCaseSnapshots
Reworked the entire command line processing code.
 2013-12-04 12:04:42 +01:00
Magne Sjaastad
3189437d5a Added color table array 2013-12-04 11:32:33 +01:00
Magne Sjaastad
f85b8aad08 Updated header 2013-12-04 09:39:50 +01:00
magnesj
65d9222d97 Fixes for Linux 2013-12-04 07:20:18 +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
4d46744783 Performance: Reduce memory use for riGetPropertyData 2013-11-08 14:27:21 +01:00
Magne Sjaastad
e47f2e6317 Performance: Added OpenMP to mock models 2013-11-08 10:34:05 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce 
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
 2013-10-31 14:57:52 +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
2315ab9014 Added flag to control adding of well data 2013-10-28 10:31:46 +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
72b7936247 Updated copyright year and link to online documentation 2013-10-25 10:38:47 +02:00
Magne Sjaastad
7318780122 Renamed label in Regression Test dialog 
Updated doc for regression test and new dialog image
 2013-10-24 13:40:29 +02:00
Magne Sjaastad
3996f6442d Moved Debug menu to File->Testing 2013-10-24 13:08:19 +02: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
a74be74792 Open Users Guide url from Help menu 2013-10-24 10:47:02 +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
Jacob Støren
a5f4f2c7fd Added a better info box icon 2013-10-23 16:17:05 +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
cbe9110c8a SSIHUB: Fixed memory leak 
Delete copy of RimWellPathImport object and added destructor to related
objects
 2013-10-23 10:42:34 +02:00
Magne Sjaastad
bcc1482532 SSIHUB: Test if well path is selected before import 2013-10-23 08:30:48 +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
Magne Sjaastad
89cd331489 Linux: QVariant has no overload for size_t 2013-10-22 11:28:14 +02:00
Magne Sjaastad
631353cf97 SSIHUB: Regions and well paths unselected by default 2013-10-22 08:54:48 +02:00
Magne Sjaastad
e2663d7db6 Removed obsolete command line parameter 2013-10-21 14:41:42 +02:00
Jacob Støren
9eb4b19384 Use the improved Ceetron Navigation 2013-10-20 00:42:14 +02:00
Magne Sjaastad
74f6b544ce Renaming related to import actions 2013-10-18 16:23:31 +02:00
Jacob Støren
1cce11f7f9 Add possible support for AllCell result in Result Cases 
See issue #99 and #100
 2013-10-18 14:27:37 +02:00
Jacob Støren
5a745b7f3b Tool button to add well cells to range filter 
Issue #73
 2013-10-18 11:19:49 +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
Jacob Støren
606a14f9f7 Octave Interface: Tentative Fix of lockup of Resinsight 
Added a timer to call back if a signal from the socket has to be
ignored.
This way we should not loose signals and state.
Needs to be experienced over some time to be verified.
 2013-10-08 14:21:18 +02:00
Jacob Støren
d5fe84bfbb Octave Interface: Moved debug output macro to socket tools 
To make it available to all the SocketServer related classes.
 2013-10-08 14:18:23 +02:00
Jacob Støren
230561573e Merge branch 'internal' of https://github.com/OPM/ResInsight into internal 2013-10-08 13:51:48 +02:00
Jacob Støren
7701cef865 Octave interfance: GetActiveCellCenters GetActiveCellCorners Fixed wrong CaseId addressing 
Fixed Wrong CaseId addressing
 2013-10-08 13:41:30 +02:00
Magne Sjaastad
1d160d4f8a Use date function from ERT, as ecl_rsthead_date() can handle time step 
defined before 1970. This type of typesteps are often used in synthetic
cases.
 2013-10-08 13:33:02 +02:00
Magne Sjaastad
ab31222efa Octave: Use 1-based IJK for riGetWellCells 2013-10-08 13:07:14 +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
Jacob Støren
12f3986d5f Octave interface: SocketServer Major review 
Simplified and made more readable. Hopefully more stable and robust.
 2013-10-07 11:47:09 +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
Magne Sjaastad
3faa9d65a4 Set numeric locale to make sure parsing of text in ResInsight and 
dependant libraries (ERT) are robust to different userdefined system
locales.
 2013-10-07 11:28:57 +02:00
Magne Sjaastad
08b970d084 Normalize line endings 2013-10-07 09:07:27 +02:00
Jacob Støren
ca55d44884 Octave Interface: Fixed bugs riSetGridProperties riSetActiveCellProperty 
SetGridProp did not read all data (if -> while)
Both returned not finished while they could have been finished
 2013-10-04 14:36:34 +02:00
Jacob Støren
4efeba4a51 Socket Interface: Comments and debug message possibilities 2013-10-04 14:36:26 +02:00
Magne Sjaastad
cf439fbf96 RegressionTest: Fixes to regression testing system to make it run 
correctly on Ubuntu 12.04 - fixed size of grabbed image. Side effect is
that the default window size for ResInsight is increased slightly.
Removed parameter to image comparison tool to allow running regression
tests on RedHat 5
 2013-10-04 10:22:17 +02:00
Magne Sjaastad
483b1a0fd9 RegressionTests: Open HTML report in browser 2013-10-04 08:11:22 +02:00
Jacob Støren
5367460462 Process Monitor: Removed border, and switched to courier font. 
ResultinfoPanel: Removed border
 2013-10-03 14:43:03 +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
77285785fb Default file open dir on linux set to cwd 2013-10-01 12:04:36 +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
Jacob Støren
a5a1dfe701 Fixed Win Compile error. Missing include 2013-09-30 11:02:17 +02:00
Magne Sjaastad
af232d8c31 Debug: Added paint performance reporting from 'Debug->Paint Event 
Performance Test'
 2013-09-30 07:56:47 +02:00
Ceetron
7e4c793da5 Octave Interface: Yet more fix on multicase octave script exec. 2013-09-27 17:06:20 +02:00
Ceetron
6a7181e1d9 Octave Interface: Current Case is now interpreted correctly by Resinsight 
The method returning the current case had not been updated to do so.
Some debug output is also removed.
 2013-09-27 16:25:40 +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
b0761d0612 Added dialog for configuration and execution of regression test from 
Debug->Regression Test Dialog
Generalized read/write of pdm object fields using QSettings
 2013-09-27 10:04:10 +02:00
Magne Sjaastad
227e3e6353 Hide all items for well path import in ResInsight project workspace 2013-09-27 07:29:01 +02:00
Jacob Støren
07f7ad82de Merge remote-tracking branch 'origin/internal' into internal 2013-09-26 15:43:22 +02:00
Jacob Støren
3f2fb1aadc Fixed Empty Environment Bug for Subprocesses 
QProcessEnvironment was used wrong
 2013-09-26 15:34:40 +02:00
Magne Sjaastad
517047c330 Added progress info when reading well path files 2013-09-26 14:49:28 +02:00
Magne Sjaastad
c30d3bb27e Use lowercase in 'utmzone' when asking for wells in area 
Show one progress dialog when downloading well paths
 2013-09-26 13:54:57 +02:00
Magne Sjaastad
24822a611e Show only selected items from field selection page in well selection 
page
 2013-09-26 12:21:15 +02:00