Jacob Støren
20a8527607
Noderesults are now read and displayed
...
The legend is not updated etc, but this is a start
2015-05-04 18:16:57 +02:00
Jacob Støren
6ff5f406d5
GeoMech result selection Gui working
2015-05-04 13:33:25 +02:00
Jacob Støren
1522fe2514
Start on getting the Metadata into the GUI
2015-04-30 17:06:01 +02:00
Jacob Støren
791a25e6e9
Preparing for result visualization
...
Calculated mapping vx to node nad elmnode reults
2015-04-30 14:28:13 +02:00
Jacob Støren
f13f05709f
Update legend and 3D info on display model gen
2015-04-30 14:27:57 +02:00
Jacob Støren
3dac8807c7
Refactoring more general stuff into RimView
...
updateViewerWidget
scheduleUpdateDisplayModelAndRedraw
2015-04-30 10:34:15 +02:00
Jacob Støren
4b7d593b3c
Refactored general view stuff into RimView
...
Removing it from RimReservoirView and RimGeoMechView
2015-04-29 22:19:49 +02:00
Jacob Støren
4a21bb4a30
Added RimView, and sorted the libs in folders
2015-04-29 10:50:25 +02:00
Jacob Støren
a7e38bcda1
Now handling compilation both with and without ODB api
2015-04-29 09:26:29 +02:00
Jacob Støren
c0217a68a4
First odb file read and displayed
2015-04-27 14:06:42 +02:00
Jacob Støren
0f3d9ffa60
Now reading Odb-file and creating display model
...
Nothing shows up yet, but we're getting there
2015-04-27 13:51:22 +02:00
Jacob Støren
2b967d9ca1
Created FemPartCollection
...
Used that instead against reader to make a "results free" interface
regarding reading the element models.
2015-04-27 10:25:04 +02:00
Jacob Støren
b94ba6ca0b
Added nodal results reading to Femreader interface
...
Adjusted interface
Started to add control code to fire reader and visualization generation
2015-04-25 08:57:34 +02:00
Jacob Støren
27c2c040fe
Added the 3D view to the geomech stuff
2015-04-20 16:56:26 +02:00
Jacob Støren
27f6bd9eb5
Start of geomech support
...
Possible GUI-tree layout
2015-04-20 09:02:33 +02:00
Magne Sjaastad
cff0313519
Bugfix: Do not change mesh mode when adding a range filter
2014-10-29 08:13:37 +01:00
Magne Sjaastad
5bb0b99ace
Rename
2014-10-28 10:17:02 +01:00
Magne Sjaastad
79b45e7008
Create placeholder results for main case in case group
2014-10-28 10:15:20 +01:00
Magne Sjaastad
31261a800f
Removed obsolete code and added comments
2014-10-27 07:19:04 +01:00
Magne Sjaastad
3b7919a913
Fix for executing a script on result cases with no view
2014-10-27 06:53:50 +01:00
Magne Sjaastad
a8ce90e404
Always compute grid faults
2014-09-26 08:15:22 +02:00
Magne Sjaastad
2d36af4f06
Updated file header for new files
2014-09-24 07:14:52 +02:00
Magne Sjaastad
b4df5419b1
Updated file header for modified files
2014-09-23 15:04:57 +02:00
Jacob Støren
6e55ca82e2
Fixed Problem regarding negative riTrans values
...
The reason was a bit sloppy detection of whether the surface normals was
pointing outwards or inwards in a cell.
The cells can be turned inside out due to depth/Z or mapaxis conditions.
2014-09-23 12:26:08 +02:00
Magne Sjaastad
b58862ad93
Do not try to set combined transmissibility if no nnc data is present
2014-09-23 11:41:27 +02:00
Magne Sjaastad
c7888bc2d3
Fixed missing cell result color for static cell results
2014-09-23 10:43:38 +02:00
Jacob Støren
74f927e13f
riTRAN/MULT :Improved handling of invalid operations 0/0 etc.
2014-09-09 15:21:09 +02:00
Jacob Støren
fff8f0c89b
Changed gui name of Fault Result to Separate Fault Result
2014-09-09 13:07:40 +02:00
Jacob Støren
2f22624228
Fixed problems in auto nnc on/off
...
Consolidated Gui into Fault
2014-09-09 13:07:01 +02:00
Jacob Støren
5ff55b4934
riTRAN: Use cell center to cell face center vectors
2014-09-09 10:58:02 +02:00
Magne Sjaastad
980207f4a7
Rename : Removed s from TRANS to TRAN to be in line with Eclipse naming
2014-09-09 07:12:43 +02:00
Magne Sjaastad
7d58e22b0c
Reverted clamping of computed SOIL value introduced in b7bc732b32
2014-09-08 08:50:42 +02:00
Magne Sjaastad
6a25f7e8b9
Move per cell face results at bottom of Cell Results
2014-09-08 07:53:49 +02:00
Magne Sjaastad
e2a5c449ce
Impoved result info text presentation
...
Display Cell result, Fault result, NNC result, and Cell edge result as a
section with a linefeed above
Always show value for intersection point at top with details below.
2014-09-08 07:35:23 +02:00
Magne Sjaastad
2906027429
Append LGR name for NNCs connected to LGR
2014-09-04 10:37:36 +02:00
Magne Sjaastad
50f6420c15
NNC : Show item count in folder No Common Area Nncs
2014-09-04 09:55:55 +02:00
Magne Sjaastad
5963d75085
Added checkbox for hiding NNC geometry when no NNC data is available
2014-09-04 09:30:00 +02:00
Magne Sjaastad
323f8d77eb
Rename
2014-09-04 09:14:01 +02:00
Magne Sjaastad
9873f3cfc6
Do not show fault result legend when fault result is disabled
2014-09-04 08:39:44 +02:00
Magne Sjaastad
7daf170f99
Fixed crash when activating riMULT
2014-09-03 07:35:23 +02:00
magnesj
68831f6e99
Fixed missing celledge visualization: abs/fabs usage error. Not detected on Windows
2014-08-31 14:37:25 +02:00
Jacob Støren
01cfed9ab7
Fixed crash after copy/paste of view and case
2014-08-28 13:37:56 +02:00
Jacob Støren
b61d582112
Completed the CDARCHY constant table
2014-08-28 11:35:32 +02:00
Jacob Støren
edd7a671d9
riMULTXYZ: Added tolerances for CellEdge and Calculations
2014-08-28 11:25:21 +02:00
Magne Sjaastad
b7bc732b32
Bugfix : Do not compute SOIL if present on disk
2014-08-28 10:35:05 +02:00
Magne Sjaastad
ffbfb8bdf0
Read units type from file and set CDARCHY value based on units type
2014-08-27 14:05:35 +02:00
Jacob Støren
d76dd6a588
Added riTRANSXYZbyArea (and X, Y, Z )
2014-08-27 11:41:40 +02:00
Magne Sjaastad
27b25443a1
Use 1-based indices for text to be displayed to user
2014-08-27 09:29:15 +02:00
Jacob Støren
0c1588435a
CellEdge: Fixed trouble with mixup of MULT and riMULT
2014-08-26 16:50:11 +02:00
Jacob Støren
03a9bf459d
Added riMULTXYZ and X,Y,Z
2014-08-26 15:39:21 +02:00
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
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
Jacob Støren
1dcca6a6ed
Added Blue white red, Red whit blue legends
2013-09-25 15:43:06 +02:00
Magne Sjaastad
659bf3d6dc
Added basic statistics case, will compute statistics on load
...
p4#: 22419
2013-09-16 07:55:35 +02:00
Magne Sjaastad
91adbe79bf
Added support for asyncronous commands
...
Implemented command to issue a recompute of statistics for a statistics case on project loading
p4#: 22417
2013-09-16 07:42:30 +02:00
Magne Sjaastad
5160c9bf86
Delete command objects in destructor
...
p4#: 22402
2013-09-13 10:42:27 +02:00
Magne Sjaastad
7eac8f26d5
Changed visibility to public
...
p4#: 22398
2013-09-13 09:18:29 +02:00
Magne Sjaastad
32b148ee0e
Added enabled state and button to be able to execute a command object
...
p4#: 22397
2013-09-13 09:17:57 +02:00
Magne Sjaastad
72d65976d7
Fixed Linux compiler issues
...
p4#: 22388
2013-09-12 08:29:37 +02:00
Magne Sjaastad
c3adfb7cb0
Prototyped command object infrastructure to be used in regression tests of Octave scripts
...
p4#: 22387
2013-09-12 08:11:56 +02:00
Magne Sjaastad
5dbc15998f
Fixed several compiler warning on Linux
...
p4#: 22370
2013-09-10 08:47:28 +02:00
Jacob Støren
dbeabc3240
TP #4177 : Context Toggle commands now toggles children if one parent is selected.
...
THe command names are renamed as well, to make it more clear what is going on.
p4#: 22360
2013-09-09 11:16:36 +02:00
Magne Sjaastad
4f70139dd4
Hide evaluation region from property filter, as this functionality is not implemented in application code
...
p4#: 22356
2013-09-09 09:13:45 +02:00
Jacob Støren
f0ddf37301
Started to use Update-display-model-And-Redraw scheduling system.
...
First mainly for object toggle fields on well related objects, to avoid recreating the displaymode for each object toggeled by a multiselect command.
p4#: 22355
2013-09-08 22:59:46 +02:00
Magne Sjaastad
3a77390b0a
Context menu 'Delete All Well Paths'
...
p4#: 22354
2013-09-08 12:11:22 +02:00
Magne Sjaastad
f9112c458c
Store username/password in session cache
...
Compute UTM region before import wizard is displayed
p4#: 22351
2013-09-08 10:53:25 +02:00
Jacob Støren
c3c50ae62e
Tree view Toggle Cmmands: Reimplemented to use PDM. Fixed missing update.
...
p4#: 22342
2013-09-07 10:18:28 +02:00
Magne Sjaastad
ca3fee6c34
Removed obsolete prototype code
...
Cleaned up unused functions
p4#: 22338
2013-09-06 15:59:25 +02:00
Jacob Støren
b0b24edeb9
Range/Property/Well Toggle fixes
...
* Well cells are now toggled along with pipe geometry by the Well toggle in the tree view.
* TP# 4156 Range filter collection toggle does not work
This last one was really a huge error on several places in the overall logig of what is shown when.
p4#: 22337
2013-09-06 15:45:21 +02:00
Jacob Støren
46f02f9384
Renaming and comments
...
p4#: 22333
2013-09-06 15:05:41 +02:00
Magne Sjaastad
86f5e6017d
Integrated well import wizard in project file
...
p4#: 22331
2013-09-06 13:06:39 +02:00
Jacob Støren
97bb848b1d
Fix of GH#43 Assertion Fail for localGridIndex
...
The grid number associated with an ert grid was an ID and not an index.
In addition: Fixed unrobustness handling wells with no data.
Now the /Troll/MSW_LGR/2BRANCHES-CCEWELLPATH-NEW-SCH-TUNED-AR3.EGRID file loads( Have tested only two timesteps ).
p4#: 22321
2013-09-05 13:03:53 +02:00
Jacob Støren
e0f5b15499
Octave interface: Added the path to ResInsight binary as search path for oct files in octave.
...
p4#: 22256
2013-08-30 15:35:28 +02:00
Jacob Støren
79c016b6b6
Wells: Improved output in Result info window when picking a well-cell
...
p4#: 22241
2013-08-28 15:36:29 +02:00
Jacob Støren
dbb72475e5
MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files.
...
The changes are from changelist numbers: 22190, 22189, 22154, 22151, 22141, 22124, 22010
Now It is supposed to compile again.
p4#: 22231
2013-08-26 21:56:40 +02:00
Jacob Støren
f392f4457d
MswRollUp: Splitted normal well and MSW handling. Got the Normal path to work fairly well. Some strangeties at the end of the pipes though
...
This is an intermediate commit and does not compile
p4#: 22214
2013-08-26 14:03:01 +02:00
Jacob Støren
b63f51921d
MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes
...
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
2013-08-26 13:56:42 +02:00
Magne Sjaastad
627211685d
Wellcollection can control if well head label is positioned at top active cell for IJ column or top Z of active cells bounding box
...
p4#: 22190
2013-08-22 07:55:21 +02:00
Magne Sjaastad
5580145bf9
Add keyword Name as identifier for a well in addition to well name given in quotes
...
p4#: 22184
2013-08-19 09:46:31 +02:00
Magne Sjaastad
cfb81a324b
Fixed issue with missing well pipe geometry
...
p4#: 22151
2013-08-12 17:05:03 +02:00
Magne Sjaastad
562dfb0135
Do not show well cells when wells are turned off
...
Renaming
p4#: 22141
2013-08-08 17:15:17 +02:00
Magne Sjaastad
a8b7662d2f
Rename
...
p4#: 22138
2013-08-08 15:19:16 +02:00
Magne Sjaastad
ffb3d3e235
Rebuild inactive geometry when invalid state changes
...
Show inactive/invalid cells also when using property filter, relevant for exclude filters
p4#: 22124
2013-08-08 08:57:23 +02:00
Magne Sjaastad
008842a1ee
Renamed cell filter field from active to isActive
...
Removed the special handling of range filters when only exclude filters are active
p4#: 22123
2013-08-08 08:49:29 +02:00
Magne Sjaastad
fea95940bf
Fixed missing min/max value range for property filters when loading from project file
...
p4#: 22105
2013-08-07 09:00:09 +02:00
Magne Sjaastad
f2be4dedaf
Fix for range filter exclude behaviour
...
Use active cells as range include filter when there are range exclude filters present and no include filters
p4#: 22095
2013-08-05 12:48:11 +02:00
Magne Sjaastad
ffbb0b6a46
Use a special flag to indicate hidden children of a field.
...
Added new method in PdmUiItem called isUiHideChildren()
p4#: 22093
2013-08-02 13:49:16 +02:00
Magne Sjaastad
50777b3e3f
Fixed issue related to missing legend config
...
Must hide legend config collection. Revisit when a more robust tree building strategy is in place.
p4#: 22092
2013-08-02 13:04:25 +02:00
Jacob Støren
7112589e33
Statistics calculation : Paralellized and avoided some memory reallocation
...
p4#: 22012
2013-06-27 00:45:50 +02:00
Jacob Støren
4f7b3e703c
Fixed Memory bug regarding statistics calcualtion
...
The results memory on each timestep was not freed resulting in all the data from all the cases for all timesteps in memory at the same time ...
In addition, the data was read accidentaly before the timeloop for all the source cases for all timesteps.
So, should perform better now, but there still are some memory allocated in the start, that i cant quite account for.
p4#: 22011
2013-06-26 23:34:03 +02:00