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
2,213 Commits 27 Branches 61 Tags 309 MiB
eadf1ca300
Commit Graph

742 Commits

Author SHA1 Message Date
Pål Hagen
051ab1ea24 Renamed class RimResultCase to RimEclipseResultCase 2015-06-26 10:00:35 +02:00
Pål Hagen
9049a47871 Renamed class RimInputPropertyCollection to RimEclipseInputPropertyCollection 2015-06-26 10:00:35 +02:00
Pål Hagen
33684d32c3 Renamed class RimInputProperty to RimEclipseInputProperty 2015-06-26 10:00:34 +02:00
Pål Hagen
dec6791027 Renamed class RimInputCase to RimEclipseInputCase 2015-06-26 10:00:33 +02:00
Pål Hagen
9458c818b4 Renamed class RimCellPropertyFilterCollection to RimEclipsePropertyFilterCollection 2015-06-26 10:00:33 +02:00
Pål Hagen
1883116c59 Renamed class RimCellPropertyFilter to RimEclipsePropertyFilter 2015-06-26 10:00:32 +02:00
Pål Hagen
f7a2582805 Renamed class RimResultDefinition to RimEclipseResultDefinition 2015-06-26 10:00:31 +02:00
Jacob Støren
1cdd5262f8 Cleaned up PropertyFilter classes. 2015-06-24 15:03:55 +02:00
Pål Hagen
355cef2ea4 Fix for setting the current frame when generating the display model 
Made sure that current frame is set when animation/multiple frames has
been requested. The old conditions for this were not sufficient.
 2015-06-24 10:07:27 +02:00
Pål Hagen
3c408f4ee8 (#314) Regenerating the display model when changing results in property filter 
Max and min values would be updated in the GUI for the newly selected
result, but the display model wasn't updated. This has now been fixed.
 2015-06-23 11:18:37 +02:00
Jacob Støren
515fb8b8d7 #314 Connected the Property filter code together. 
Now working !
 2015-06-22 21:57:52 +02:00
Pål Hagen
6191422103 Property filters for geo mech (#314) 
Added GUI objects for property filters for geo mech models.
 2015-06-22 15:27:37 +02:00
Jacob Støren
8f2090eccf Refactored GeoMechView createDisplayModel 
Made adding well paths less obfuscated
Preparing for #314 Property Filter
 2015-06-22 14:04:36 +02:00
Jacob Støren
088bc12459 Preparing for property filter. #314 
Prototype code for property filter visibility
Refactoring the VizLogic class to make the responsibilities clearer
 2015-06-22 08:18:54 +02:00
Jacob Støren
e9fe03f63a Moved Fem visibility calculator to a separate file 
Preparing for GeoMech Property filter
 2015-06-22 08:18:48 +02:00
Jacob Støren
74efc8da1a Use the new RigCellSetEnum instead of unsigned char 
Preparing for property filter
 2015-06-22 08:18:42 +02:00
Jacob Støren
0377461da0 #323, #318 Geomechanical sign on Stress/Strain 
Now they are presented as S and E, and the native Abaqus values are hidden.
 2015-06-19 14:38:31 +02:00
Jacob Støren
cfb0bfeb55 Moved RivCellSetEnum to a separate file. 
Preparations for property filtering
 2015-06-18 14:17:03 +02:00
Jacob Støren
8bf90ec27c Renamed enum type for Cell Sets (previously called ReservoirGeometryType) 2015-06-18 14:16:58 +02:00
Stein Dale
b4759ca06e Refactored cell property filter collection 
Using caf::PdmPointersField as container.
 2015-06-18 14:00:16 +02:00
Stein Dale
f55b6d2519 Removed ui update code that is not needed (#311) 2015-06-18 13:22:13 +02:00
Stein Dale
2ca5151c6c "Disable Results Lighting" field is always enabled (not read only) in a view (#311) 2015-06-18 13:20:54 +02:00
Stein Dale
8bdb957c8c Handling new field "Disable Lighting" in the view (#311) 2015-06-18 12:23:27 +02:00
Stein Dale
4b1a71fd91 Added new field "Disable Lighting" (#311) 2015-06-18 12:23:26 +02:00
Jacob Støren
8773c54f17 #322 Result field name in info box 2015-06-17 16:03:37 +02:00
Jacob Støren
b5cfa8ab53 Renaming and improved some readability around well paths 2015-06-12 09:25:09 +02:00
Jacob Støren
ceeb38d13a Added bbox calculation on the fem part for #312 
This concludes #312 for now. Wellpaths are now shown in the Geomech
views
 2015-06-11 19:13:04 +02:00
Stein Dale
b59695f352 Refactored addition of well path models 
Well path models can now be added to geo mech models. Moved code that
adds well path models to a scene from RimEclipseView to
RimView::addWellPathsToScene(). This new function is now used by both
RimEclipseView and RimGeoMechView. Made sure that it is not needed to
load a result before well paths appear. TODO: Compute characteristic hex
element size for geo mech models.
 2015-06-11 13:44:21 +02:00
Jacob Støren
30fcbebc8e Deep fix of #316 and also implements #317 
#316 Do not show wrong results ...
#317 Avoid stopping animation when switching results
This commit cleans up some of the inconsistencies etc in the top of the
display model generation logic.
 2015-06-09 16:18:11 +02:00
Jacob Støren
0d8bfb0403 Fixed #307 Nothing is shown if using only exclude range filters for Geomech models 2015-06-05 15:36:38 +02:00
Jacob Støren
ba633bd847 Moved rangeFilterCollection to RimView 2015-06-05 10:05:40 +02:00
Jacob Støren
00796b3fb4 3D view info box is up to speed. 
This completes #291 feature wise
Statistics is now pr result address and not pr. Part-result Address
 2015-06-04 16:25:27 +02:00
Jacob Støren
273e91d38d Moved the new resultCollection class to new files 
Also removed obsolete file, and added missing header files to the
CMakeLists file
 2015-06-04 16:25:16 +02:00
Jacob Støren
a3fa27d2ec Created RigFemPartResultsCollection 
Refactored the results stuff from GeoMechCaseData into the new class
preparing to extend the statistics calculation
 2015-06-04 16:25:11 +02:00
Stein Dale
43f50dac41 Displaying error messages from ODB API on file open 
Made sure that the error messages from the ODB API are picked if file
open fails, and then displayed in an error messsage box.
 2015-06-04 13:08:21 +02:00
Jacob Støren
e347249526 3DInfo : Made max and min values work 2015-06-03 15:24:28 +02:00
Stein Dale
189e5dca40 Added retrieval of mean value 
Added RigGeoMechCaseData::meanCellScalarValues(). Using this method to
retrieve the mean value for display in the info box. ToDo: Make sure
that the mean values this methods needs have been computed.
 2015-06-03 14:37:51 +02:00
Jacob Støren
96329793f3 Use odb "Steps" as animation steps 
Issue #293
This is only tested with one step yet.
 2015-06-03 12:14:25 +02:00
Jacob Støren
ca6d9d364d Improved progress bar a bit, for geomech cases 2015-06-03 12:14:21 +02:00
Stein Dale
d325342940 Additional geomech case info (#291) 
Displaying time step, step name, and Z scaling factor. Prepared display
of statistics and histograms, when implemented. For now, we show zeros
and an empty histogram.
 2015-06-02 10:37:05 +02:00
Stein Dale
f88343a122 Geomech case info (#291) 
Displaying result info and the number of cells in the 3D view's info box
for geomech cases.
 2015-06-01 16:37:22 +02:00
Jacob Støren
51fd1b4de2 Geomech Range filters working 
The algorithm for the IJK assignment now works on the simple test
example.
 2015-05-29 07:53:03 +02:00
Jacob Storen
95557dcfba Yet another linux compile warning 2015-05-27 06:23:08 -07:00
Jacob Storen
f6e8bb4a1a Fixes of linux compile errors and warnings 2015-05-27 05:50:12 -07:00
Jacob Støren
f32fc130fc Prep Geom range: Neighbor calculation 
A checkpoint before starting to use the neighbor calculations
 2015-05-26 08:57:53 +02:00
Jacob Støren
b280196b7c Prep for Geomech range: Introduced VizLogic 
Refactored to use the new RivVizLogic class, together with the
partMgrCache
Works.
 2015-05-22 17:01:59 +02:00
Jacob Støren
49fafbf47f Cleaned up RimEclipseView.h 2015-05-22 13:19:42 +02:00
Jacob Støren
68caed93b4 Prep for Gromech range filters: 
* Generalized RangeFilter vs view
* Added stub implememntation of a StructGridInterface implementation for
Fem parts
 2015-05-21 15:39:44 +02:00
Jacob Støren
038c578f97 Preps for Geomech RangeFilters: Small refactorings 2015-05-21 11:46:04 +02:00
Jacob Støren
2c7a741805 Renamed the files of RimReservoirView to RimEclipseView 2015-05-21 10:34:38 +02:00
Jacob Støren
ed74116376 Rename of RimReservoirView to RimEclipseView 
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
 2015-05-21 10:05:33 +02:00
Jacob Støren
caa835331f Added progress bar when loading Geomech cases 
Introduces Qt dependency in OdbReader
 2015-05-20 15:22:10 +02:00
Jacob Støren
249823c970 Added a "Close" command on Geomech cases 
See issue #292
 2015-05-20 13:45:46 +02:00
Jacob Støren
10388ea3dc Rewrote Add and Delete View for GeoMech 
See issue #292
 2015-05-20 12:33:06 +02:00
Jacob Støren
6a9555a196 Add general ownercase access method 
Preparations for #292
 2015-05-20 12:29:01 +02:00
Jacob Støren
b280c2287e Case Groups: Added error message on missing maincase 
When loading a project file, there were no error messages if the grid
file could not be found.
 2015-05-20 09:40:00 +02:00
Jacob Støren
3c8bac9f2a Fixed crash in regressiontest of statistics case 
Destructor chain deleting view fired off getting all cases, which
accessed case during its destruction.
 2015-05-18 15:23:51 +02:00
Jacob Støren
f544528aee GeoMechView: Added missing include 2015-05-16 09:35:15 +02:00
Jacob Støren
d38aae29b6 GeoMech results loaded before animation setup 
Now Geomech projects seems to open fine.
 2015-05-16 09:12:43 +02:00
Jacob Støren
9596f6c0a4 Added init after read for GeoMechView/Case 
And finalized moving the caseUserDescription field
All in order to get project load to work. Nearly there. Animation frame
is not restored though.
 2015-05-16 08:45:50 +02:00
Jacob Støren
969a181897 RimCase reintroduced as baseclass for all cases 
Refactored to handle cases generically in  a lot of places.
Mostly complete regarding all these issues, but not tested yet:
Assigning caseId
Update relative path to the case data
RimProject::createDisplayModelAndRedrawAllViews
RimProject::computeUtmAreaOfInterest
Load case data on project open
save snapshots for all views
RegressionTest viewer size
Finding case based on caseId
Giving case information to octave
 2015-05-15 18:51:49 +02:00
Jacob Støren
b111a26f21 Renamed Files: RimCase to RimEclipseCase 2015-05-15 09:16:33 +02:00
Jacob Støren
223f8385d2 Renamed base class RimCase to RimEclipseCase 
To make room for a RimCase base class that can be used as base class for
RimGeoMechCase as well.
This commit is only the class rename not the file rename.
 2015-05-15 08:40:27 +02:00
Jacob Støren
2aae86073b GeoMechView Toggle On/Off now works 2015-05-13 22:55:07 +02:00
Jacob Støren
af2699d362 Z-Scale working for geomech views 
Alligned GeoMech and Reservoir views through RimView
 2015-05-13 22:42:11 +02:00
Jacob Støren
04c9639b0b Performance: Avoid regeneration of geometry on result change 2015-05-13 13:03:41 +02:00
Stein Dale
aaa4ff3b41 RedHat build fix: Fixed case in include filename 
"RigGeomechCaseData.h" -> "RigGeoMechCaseData.h"
 2015-05-13 11:45:09 +02:00
Jacob Støren
091fe2551e Fixed missing step information on first click 2015-05-12 14:59:51 +02:00
Jacob Støren
2e3fbaf7ce Fixed missing update of ComponentName 
When selecting a field only variable
 2015-05-12 14:47:45 +02:00
Stein Dale
da7035517f Added include - RedHat compilation fix 
Added #include <limits.h>.
 2015-05-11 09:48:55 +02:00
Stein Dale
54dac07c36 RedHat compilation fixes 
Removed a couple of auto types and started writing the types explicitly,
to be able to compile on RedHat.
 2015-05-08 15:51:17 +02:00
Jacob Støren
a05c186d34 Now result colors are correct at first selection 2015-05-08 15:16:29 +02:00
Jacob Støren
d6643d9d35 RimView etc: More aligning GeoMech/Eclipse 
Now Animation drawstyle works fairly well.
 2015-05-08 14:13:26 +02:00
Jacob Støren
86b058cdbe RimView etc: Refactored and alligned 
To implement geomechView features alligned with ReservoirView
Now geomech results are shown with correct legend, and updated fairly
well.
 2015-05-08 10:38:10 +02:00
Jacob Støren
55512db6a0 Introduced RigFemResultAddress 
Breaks build, possibly. Intermediate chek-in
 2015-05-08 10:34:57 +02:00
Jacob Støren
27dcd80bfd Creating a fem-results caching system 
Needed specifically for statistics
Work in progress brakes build
 2015-05-07 10:12:37 +02:00
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