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
Jacob Støren
27f6bd9eb5 Start of geomech support 
Possible GUI-tree layout
 2015-04-20 09:02:33 +02:00
Jacob Støren
a5fba8f3f4 Fixes to match new Ert 2015-04-14 15:47:51 +02:00
Jacob Støren
02e47c6679 Guard against reading nnc data if none are available 
See Issue #278. (Not fixing the issue, just improving code)
 2015-02-24 14:57:23 +01:00
Jacob Støren
27ce1852ca Fix of #281: Crash while importing - cvfPlane.cpp Aborted 2015-02-24 13:34:03 +01:00
Magne Sjaastad
3b914c7ac0 Fixed missing dash in Linux startup script 
https://github.com/OPM/ResInsight/issues/271
 2015-01-25 22:14:20 +01:00
Magne Sjaastad
8de0f468ac Fixed invalid foreach syntax 2015-01-09 08:37:22 +01:00
Magne Sjaastad
9ded05212f Merge branch 'pr/268' into dev 2015-01-09 08:05:23 +01:00
Magne Sjaastad
053a9c4d78 Improved parsing of fault face text strings 
See https://github.com/OPM/ResInsight/issues/263
 2015-01-09 07:42:49 +01:00
Roland Kaufmann
4378f4886a Add application icon into the executable bundle 2015-01-01 19:46:25 +01:00
Roland Kaufmann
9fb9f84a7a Build resulting executable as a bundle on MacOS X 
This will allow us to launch it from the Finder and add it to the dock
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
eac27f149a Enable in-package substitute of tr1/tuple 
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
b25290bebd Complete instantiated types 
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).

A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
 2015-01-01 19:46:24 +01:00
Magne Sjaastad
0dcba178fd Do not show NNC text at all in progress bar when NNC import is disabled 2014-11-06 09:35:39 +01:00
Magne Sjaastad
619b7a211a Fix for dates before 1970 2014-10-29 09:34:57 +01: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
d9d4fdab3f Compute placeholder results when creating grid case group 2014-10-28 18:33:23 +01:00
Magne Sjaastad
043584b1b1 Faults : Improved robustness of fault names including space 2014-10-28 11:07:59 +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
55b5da018c Ternary : Clamp texture coordinates to avoid texture edge issues 2014-10-28 09:39:26 +01:00
Magne Sjaastad
da31522ae9 Removed invalid include 2014-10-27 14:09:19 +01:00
Magne Sjaastad
babe812ebc Fixed memory leak 2014-10-27 12:25:52 +01:00
Magne Sjaastad
5b5d0ffa5a Show generated static result for all time steps 2014-10-27 08:00:23 +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
2509fa974f Performance : Now possible to disable load of SOIL on load 2014-10-24 11:38:47 +02:00
Magne Sjaastad
a5e4e756af Updated ERT, now possible to read simplified MSW 
Updated ERT to 3ac60303aa2dc58aed9420a24d9a881fec32076b
 2014-10-24 11:19:54 +02:00
Magne Sjaastad
63a5dd24fe Added support for fault face using IJK in addition to XYZ 2014-10-09 20:36:27 +02:00
Magne Sjaastad
b93053b089 Updated ERT to 946e512ac17c1e2469892072a925428c0a012fa1 2014-10-09 20:13:04 +02:00
Magne Sjaastad
a8ce90e404 Always compute grid faults 2014-09-26 08:15:22 +02:00
Magne Sjaastad
b046a0354d Converted assert to if statement when no NNC data is present 2014-09-24 13:28:08 +02:00
Magne Sjaastad
212b41f854 Updated help text 2014-09-24 07:21:26 +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
Magne Sjaastad
57ade584b2 Updated about dialog 2014-09-23 14:34:03 +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
c9065eeed9 Made mean calculation handle inf and nan 2014-09-09 15:20:16 +02:00
Jacob Støren
ed202cc7cf Combined TRAN results: Now set to 0.0 on border to inactive cells / grid border 2014-09-09 14:02:03 +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
4befec7897 Result Info: Always show the grid cell results 2014-09-09 10:58:41 +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
078ae992bf Result info : Always show fault result details 2014-09-09 07:26:28 +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
e605ceafa2 Socket server : Improved server logic 2014-09-08 15:39:23 +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
787d44e446 Added class used to build text strings from picked objects in 3D scene 2014-09-05 08:25:38 +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
4fdb06e0e0 Moved code from header to source 2014-09-04 09:28:39 +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
ca2558bf20 Bugfix: Update NNC colors when Cell Edge is active 2014-09-04 08:35:59 +02:00
Magne Sjaastad
7daf170f99 Fixed crash when activating riMULT 2014-09-03 07:35:23 +02:00
Magne Sjaastad
6857bd3122 Updated link to help web pages 2014-09-03 07:08:44 +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
Jacob Støren
5377742bbc riTRANSXYZ: Fixed negative values due to bug in polygon calculations 2014-08-28 11:25:20 +02:00
Magne Sjaastad
b7bc732b32 Bugfix : Do not compute SOIL if present on disk 2014-08-28 10:35:05 +02:00
Magne Sjaastad
103a9f4018 Bugfix : Allocate max timestep count when receiving data from Octave 2014-08-28 09:54:34 +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
e40e3c40f1 Bugfix MULTXYZ : Clamp HUGE_VAL to 1.0 2014-08-27 09:54:12 +02:00
Magne Sjaastad
27b25443a1 Use 1-based indices for text to be displayed to user 2014-08-27 09:29:15 +02:00
Magne Sjaastad
b90c230d5c Fault import : Skip reading if same line contains end keyword 2014-08-27 09:21:52 +02:00
Jacob Støren
781d008f07 Faults: Fixed bug introduced by 76d6304 2014-08-26 17:23:22 +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
0bd0d6d7a7 Linux fix: Added include of cmath and reorganized includes 2014-08-26 14:46:48 +02:00
Magne Sjaastad
10c76f2926 Fault import : Handle invalid fault specification gracefully 2014-08-26 14:37:20 +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
27571a839a Linux compile fix 2014-08-26 13:35:49 +02:00
Jacob Støren
670ca4ced5 riTRANSXYZ: nnc calculations in place 
Making this feaure complete.
Had to add the concept of several results sets to the nnc data
 2014-08-26 12:16:22 +02:00
Magne Sjaastad
56b1f78f2f Faults : Show NNCs moved from fault result to fault collection 2014-08-26 11:55:26 +02:00
Magne Sjaastad
f69413087a Custom fault result: Reorganized custom fault result selection 
Removed combo box used to specify fault color or custom result color.
Fault colors is used if None is selected in result dialog.
 2014-08-26 11:47:14 +02:00
Magne Sjaastad
b3fd96d72e Cell edge: Update texture also if none is cell result 2014-08-26 10:13:35 +02:00
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
1b2b0d8560 Fixed compile error introduced by rename 
The dependency was not detected by CMAKE/msvbuild. ... Strange
Needed a complete make clean to find it.
 2014-08-25 08:04:31 +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
314d07e733 SOIL is loaded/computed on demand, removed autocompute from prefs 2014-08-22 07:45:16 +02:00
Magne Sjaastad
b9a5d5b743 Bugfix: Apply face culling mode when creating effects 2014-08-21 14:41:03 +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
Magne Sjaastad
f61f7f1fd1 Result statistics: Fixed computation of scalar values close to zero 2014-08-20 11:55:11 +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
Jacob Støren
a3af100189 riTRANXYZ: Added to build system. First implementation. 2014-08-20 08:12:19 +02:00
Magne Sjaastad
7e815a8641 Corrected combined mult result name 2014-08-19 14:57:36 +02:00
Magne Sjaastad
cdf2b07118 Removed use of cvfStructGridScalarDataAccess 2014-08-19 14:56:20 +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
a2f4887d56 Added riMULTXYZ to statistics and result factory 2014-08-19 13:20:44 +02:00
Magne Sjaastad
be224149f0 Added riMULTXYZ to result selection UI 2014-08-19 13:20:12 +02:00
Magne Sjaastad
e6358a1289 Added MULTXYZ result accessor 2014-08-19 11:57:31 +02:00
Magne Sjaastad
af89f3e45e Use icon update functions from pdmDocument 2014-08-19 10:57:55 +02:00
Magne Sjaastad
6418928bd2 Faults: Skip out of range cell index 2014-08-19 10:33:29 +02:00
Magne Sjaastad
d5e911d01b Added RigStatisticsDataCache and RigStatisticsCalculator 
Moved cache from RigCaseCellResultsData to RigStatisticsDataCache
Moved statistics computations from RigCaseCellResultsData to RigStatisticsCalculator
 2014-08-19 08:14:03 +02:00
Jacob Støren
06df5ba1da riTRANXYZ: removed strange character 2014-08-18 18:32:55 +02:00
Jacob Støren
147fbffe55 riTRANXYZ: Paving the way: Renaming, Removing obsolete code, Store fault index for each cell face, Added prototype code for the calculation 2014-08-18 18:30:52 +02:00
Magne Sjaastad
ab483fee81 Made ternary result accessor more robust 2014-08-14 12:12:07 +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
2a55b47e9a Renamed and restructured files and classes 2014-08-14 10:56:48 +02:00
Magne Sjaastad
7e5c46cf59 Added support for cell edge on faults 2014-08-14 10:56:47 +02:00
Magne Sjaastad
2c903a0d18 Cell edge now handles also ternary 2014-08-14 10:56:47 +02:00
Magne Sjaastad
ef3c463128 Added cell edge with 2d texture coord support 2014-08-14 10:56:46 +02:00
Magne Sjaastad
67e12e3f71 Cleaned up includes 2014-08-14 10:56:45 +02:00
Magne Sjaastad
245573e03c Cell edge visualization can now handle individual per face center values 2014-08-14 10:56:44 +02:00
Magne Sjaastad
debd17a3ab Removed unused code 2014-08-14 10:56:44 +02:00
Magne Sjaastad
0941834da9 Added RigHugeValResultAccessor 
Linux: Added include of cmath for define of HUGE_VAL
 2014-08-14 10:56:43 +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
6e2dffc399 Linux include fix 2014-08-14 10:56:42 +02:00
Magne Sjaastad
3582d2e30b Removed unused code 2014-08-14 10:56:42 +02:00
Magne Sjaastad
301d274eed Rename 2014-08-14 10:56:41 +02:00
Magne Sjaastad
2069375555 Use shared grid/fault visualization code 2014-08-14 10:56:41 +02:00
Magne Sjaastad
03b68e08c3 Use RivScalarMapperUtils 2014-08-14 10:56:40 +02:00
Magne Sjaastad
eca4276adb Added scalarMapperUtils for code sharing between grids/faults 2014-08-14 10:56:40 +02:00
Magne Sjaastad
c67b75e992 Fixed transparency for ternary well cells 2014-08-14 10:56:39 +02:00
Magne Sjaastad
4c00a48a25 Fixed viz bug introduced by new texturing method 
SHA: a9794815c7
 2014-08-14 10:56:39 +02:00
Magne Sjaastad
24a464ecf9 Use texture based ternary visualization 2014-08-14 10:56:38 +02:00
Magne Sjaastad
1b69f93a11 Added ternary scalar mapper effect generator 2014-08-14 10:56:38 +02:00
Magne Sjaastad
1161ff7c73 Added ternary texture and scalar mappers 2014-08-14 10:56:37 +02:00
Magne Sjaastad
5e478d8336 Layout cleanup 2014-08-14 10:56:37 +02:00
Magne Sjaastad
b414ba0ee3 Created setter for opacity 2014-08-14 10:56:36 +02:00
Magne Sjaastad
68bc378abe Minor fixes for result accessors 2014-08-14 10:56:36 +02:00
Magne Sjaastad
85d4de6746 Added RigResultAccessor2d 2014-08-14 10:56:35 +02:00
Magne Sjaastad
0440e21f27 Created texture and texture coord calculations 2014-08-14 10:56:35 +02:00
Magne Sjaastad
e9b67a9599 Added RivTernaryScalarMapper and unit test 2014-08-14 10:56:34 +02:00
Magne Sjaastad
1b3be87074 Moved include from header to cpp 2014-08-14 10:56:33 +02:00
Magne Sjaastad
897ed240c5 Use RigResultAccessor 2014-08-14 10:56:33 +02:00
Magne Sjaastad
8451ffc2fb Added include to RigResultAccessor in factory 2014-08-14 10:56:32 +02:00
Magne Sjaastad
0bef6369e1 Deleted unused code 2014-08-14 10:56:32 +02:00