Commit Graph

284 Commits

Author SHA1 Message Date
Jacob Storen
cbe728c9af (#690) Fixed crash on linux when selecting cells with high cell index.
Caused by unintentional pointer arithmetics on string literal.
2015-12-09 02:20:33 -08:00
Jacob Støren
69ced2cdf0 (#685) Fixed errors in findMainIJKFaces that might cause crash, and incorrect mapping.
Makes the example case work.
2015-12-03 14:34:03 +01:00
Jacob Støren
f8fa6787e9 (#166) WIP: Starting to get geomech cross sections in place 2015-11-20 15:54:22 +01:00
Magne Sjaastad
5ac3dea46d [System] Cleaned up unused variables and functions 2015-11-19 07:57:45 +01:00
Magne Sjaastad
4469d32a2d Fixed Linux issues 2015-11-17 05:00:35 -08:00
Magne Sjaastad
bca5720968 (#266) Added interface for all/activeCellsBoundingBox and displayModelOffset 2015-11-17 13:18:05 +01:00
Magne Sjaastad
7ff7f42adc (#266) Added geometry for grid box faces
Added legend lines and text
2015-11-17 13:11:54 +01:00
Jacob Støren
7b65cb91ce (#625) Added access to the generalized propertyFilterCollection in the view 2015-11-12 10:48:13 +01:00
Magne Sjaastad
6063ca1b54 (#646) Show selected cells in geo mech view 2015-11-11 13:38:54 +01:00
Magne Sjaastad
e64f943e4c Fixed includes on Linux 2015-11-10 01:53:24 -08:00
Jacob Støren
4f05c0d6b9 (#606) (#607) Added eclipse stats for visible cells 2015-11-06 13:24:48 +01:00
Jacob Støren
67abe959db (#606) Made each node-result count only once 2015-11-06 13:24:45 +01:00
Jacob Støren
0bd4f4a8f9 (#606) (#607) Calculate visible cells statistics for geomech
Refactored some in 3D info regarding geomech cases.
2015-11-06 13:24:43 +01:00
Magne Sjaastad
ff6e2755aa Added time history plot for geo mech models 2015-11-05 13:48:10 +01:00
Jacob Støren
a4d7e369eb (#606)(#607) Added option to show 3D-info statistics pr. time step. 2015-11-04 15:44:09 +01:00
Jacob Støren
738af9c88e (#606)(#607) Added gui for the statistics control. Started refactoring
Refactoring to access pr timestep data from the statistics calculation.
2015-11-04 12:51:55 +01:00
Jacob Støren
765c659c7f (#563) Added integration point number in result info text for Geom Cases.
Also added node coordinates of associated nodes.
2015-11-02 07:57:33 +01:00
Magne Sjaastad
930209f527 System : Added asserts and initialized pointer before calling firstAnchestorOrThisOfType() 2015-10-26 10:18:57 +01:00
Magne Sjaastad
01224dd5e6 System : Removed unused variables 2015-10-26 10:18:57 +01:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Jacob Støren
db4e637e76 Constified some methods in FemPart. WIP range filter mapping first untested code. 2015-10-20 11:15:12 +02:00
Jacob Storen
10046eed4a Linux fixes 2015-10-14 07:13:45 -07:00
Magne Sjaastad
67a62f4f02 Renamed RimViewLink to RimViewController 2015-10-13 10:24:39 +02:00
Jacob Støren
5677665dba (#331) Properly shown POR values by checking for element type.
We are calculating and using an elmNode POR result to correctly
respect the element type.
2015-09-28 07:39:57 +02:00
Jacob Støren
07d101353c (#405) Gamma calculation test POR < threshold needed the threshold to be in bar as well. 2015-09-26 10:22:39 +02:00
Jacob Støren
43dd883f63 Fixed Crash when selecting SE witout any component. 2015-09-26 10:08:58 +02:00
Jacob Støren
276addc713 (#405) Convert POR, SE, and ST to Bar. Fixed issues regarding property filters.
Result fields without component had an extra space in the option value string
that made the search for the option in the option list fail.
2015-09-26 09:38:29 +02:00
Jacob Støren
da893744a5 (#513) Use element type to distinguish when to use the POR values 2015-09-25 20:20:46 +02:00
Jacob Støren
5097082f09 (#513) Added a HEX8P element type to distinguish C3D8 and C3D8P 2015-09-25 19:33:34 +02:00
Magne Sjaastad
4424c110be Transformed static functions from ViewLinker to dynamic functions in RimView 2015-09-25 11:17:51 +02:00
Jacob Støren
c79a01f3b9 Linked Views: created access methods for viewController settings
The access methods now respects the active settings on both the ViewController
and the Toplevel.
2015-09-25 09:39:42 +02:00
Jacob Støren
8c63f4963b (#513) Minor rename 2015-09-25 09:16:14 +02:00
Jacob Støren
9711f5d891 (#513) POR now ignored in ST calculation where not all elmnodes have POR 2015-09-24 22:37:57 +02:00
Jacob Støren
8404ccd38b RigFemPart: Renamed mispelled member 2015-09-24 22:15:01 +02:00
Jacob Støren
5e0505dfe8 Renaming and cleanup in ViewLinker and friends 2015-09-24 17:43:09 +02:00
Jacob Støren
255f2e496b RigFemTypes Hex definition: Added a clarifying comment 2015-09-18 15:00:32 +02:00
Jacob Støren
d40ab88cd9 Made interface in RigFemPartGrid clearer regarding what it provides, and not. 2015-09-18 10:10:31 +02:00
Jacob Støren
b0caa7f952 (#401) WIP: Implemented averaging to create a geomech equivalent cell
to compare with the real geomech cells.
Creating mapping based on this, but there are bugs or weaknesses yet,
so it does not work properly.
2015-09-17 16:13:25 +02:00
Jacob Støren
7a6c7149e1 (#401) WIP: First cell filtering Eclipse Geomec grid visible.
Not working very well. BB matching is not good enough.
2015-09-17 16:13:22 +02:00
Jacob Støren
36bc2f8f69 (#401) WIP: Activated the visibility calculation code.
Started on mapping calculation.
2015-09-17 16:13:21 +02:00
Jacob Støren
57ff5becbc (#401) WIP: Added skeleton class for cell mapping 2015-09-17 16:13:19 +02:00
Jacob Støren
b6fb85e0a4 (#401) WIP: Prototyped total cell visibility calculation and
calculation of overridden cell visibility.
2015-09-17 16:13:17 +02:00
Jacob Støren
665d233c38 Guard against not having geomMechData 2015-09-14 09:53:22 +02:00
Jacob Støren
f8dc3b4b81 This fixes a cutpaste error in the Geomech IJK assignment.
It might fix (#309)
2015-09-10 12:14:00 +02:00
Jacob Støren
1b9977239d (#415) Used AABB tree to search for elements
to find close elements to the wellpath for Geom Well Log extraction
2015-09-07 16:47:40 +02:00
Jacob Støren
8d57bbe77b (#399) WIP: First commit of experimental geomech WellLog extractor
Not yet enabled in any way
2015-09-04 15:35:20 +02:00
Jacob Støren
52281633d6 (#396) untangled Geomech Result Definition from the use of GeoMechView
In order to reuse the RimGeoMechResultDefinition in the curve data.
2015-09-01 17:19:09 +02:00
Magne Sjaastad
fa622acb72 Renamed functions in effect generator and use cached effects instead of uncached 2015-08-13 14:35:30 +02:00
Pål Hagen
bf570ed1e1 (#343) Made sure that principal stress calculation is correct 2015-07-01 11:43:21 +02:00
Pål Hagen
6c54b1ad49 (#337) Renamed S to SE
SE is set to undefined where pore pressure is undefined.
2015-07-01 11:35:17 +02:00
Jacob Støren
00f8743cef Fixed an assert and wrong behavior:
When selecting a result field "heading", after selecting one of its components.
2015-06-29 12:17:30 +02:00
Pål Hagen
fb195dbd4b (#335) Showing field name and component name in progress bar
Showing field name and component name in progress bar when loading
results.
2015-06-29 10:24:44 +02:00
Pål Hagen
e5bb58b269 (#335) Showing progress bar when loading geo mech results 2015-06-26 15:43:43 +02:00
Pål Hagen
24a84184d8 Revert "Showing progress bar when loading geo mech results"
This reverts commit 798a6c2fcb.
2015-06-26 15:41:46 +02:00
Pål Hagen
798a6c2fcb Showing progress bar when loading geo mech results 2015-06-26 15:38:33 +02:00
Pål Hagen
0af13d4e13 (#331) Fix for undefined nodal results when coloring the elements
The entire element is drawn with undefined color if one or more nodal
value is undefined.
2015-06-26 12:12:40 +02:00
Pål Hagen
7315dd5318 Renamed variables according to newly renamed class names
"Result slot" -> "Result colors"
2015-06-26 10:00:46 +02:00
Pål Hagen
fa75a46ecb Moved geo mech related source files to different folder
Moved RivGeoMechVizLogic.h/cpp RivGeoMechPartMgrCache.h/cpp to
GeoMech/GeoMechVisualization.
2015-06-26 10:00:45 +02:00
Pål Hagen
cd662dc7d1 Renamed source files according to new class names 2015-06-26 10:00:43 +02:00
Pål Hagen
2f34b03135 Renamed source files according to new class names 2015-06-26 10:00:41 +02:00
Pål Hagen
5eb673410e Renamed class RimGeoMechResultSlot to RimGeoMechCellColors 2015-06-26 10:00:37 +02:00
Jacob Støren
fddef6d32c Turned on parallell GeoMech prop. filter visibility calculation 2015-06-24 13:15:34 +02:00
Jacob Støren
7d075999af Removed obsolete ifdefs 2015-06-24 12:04:55 +02:00
Jacob Storen
eb2515b8c2 Linux compile fixes 2015-06-23 04:34:25 -07:00
Jacob Støren
515fb8b8d7 #314 Connected the Property filter code together.
Now working !
2015-06-22 21:57:52 +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
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
e740bdc618 #324, 323 -E and GammaNN derived results 2015-06-19 14:05:33 +02:00
Stein Dale
8bdb957c8c Handling new field "Disable Lighting" in the view (#311) 2015-06-18 12:23:27 +02:00
Jacob Støren
5443582fec #313 Added Stress Path: Gamma 1,2,3 2015-06-17 16:03:42 +02:00
Jacob Storen
2c980e6b1b Linux compile fixes 2015-06-17 05:51:22 -07:00
Jacob Støren
422a682b27 Added the missing ST-components,
Added calculation of principal ST,
Used POR = 0 when undefined in calculation of ST
#320, #319
2015-06-17 14:22:14 +02:00
Jacob Støren
ff79f1a8ba Added calculation of S1, S2 and S3 of Geomechanical stress tensor
See #320
2015-06-17 13:07:48 +02:00
Jacob Støren
2cef1b8e3c Removed obsolete code 2015-06-16 14:48:51 +02:00
Jacob Støren
33614b30bc Added calculation of Total Stress (ST)
Seems to work ok, but the nubers are not yet verified.
2015-06-15 12:15:00 +02:00
Jacob Støren
e10bc01532 Added a "NS" field result variable
#318 Geomechanical sign on stress components
The NS name can be changed in the GUI, but we need to distinguish S from NS in the reader/calculation system
2015-06-15 10:33:28 +02:00
Jacob Støren
b99b334fc8 Removed the obsolete code from odb reader etc. 2015-06-15 09:21:26 +02:00
Jacob Støren
406379e544 Results are now loaded pr field, and not pr component
To increase speed, and to pave way for derived results.
New methods in OdbReader fixed, and is now operational.
Must delete obsolete stuff now.
2015-06-15 08:25:23 +02:00
Jacob Støren
bd67047f57 Some small refactoring. Preparing for Derived results 2015-06-15 08:10:07 +02:00
Stein Dale
c22119e6a3 Now allocating the correct amount of memory for results data
The data size was multiplied by the number of components, which is wrong
for the current interface.
2015-06-12 20:02:35 +02:00
Jacob Storen
5f1b7f2fad Temporal linux compile fix 2015-06-12 06:32:29 -07:00
Stein Dale
0899824694 WIP - added functions that return all result components in one call
Addded 3 new functions to the geo mech interface and the ODB reader.
Work in progress. Not tested yet.
2015-06-12 14:34:08 +02:00
Jacob Støren
3226254d4b Merge branch 'dev' of https://github.com/OPM/ResInsight into dev 2015-06-12 10:41:39 +02:00
Jacob Støren
d3adea34c2 Added a Tensor class skeleton 2015-06-12 10:38:57 +02:00
Stein Dale
58c2e60d48 Got rid of potential memory leak
Made sure that it is safe to call RifOdbBulkDataGetter::data() multiple
times.
2015-06-12 09:38:20 +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
Jacob Støren
2c186a4972 Added method to calculate characteristic element size in Fem parts
Needed for well path pipe radius #312
2015-06-11 13:15:36 +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
05315bc7a9 OdbReader: Made sure metadata are available before using them
Fix of #308,
Also avoid loading any results when selecting an empty/none-existing
result (Partial fix of #316)
2015-06-09 11:23:24 +02:00
Jacob Støren
7201e3330b GeoMech result textures: Handle empty results 2015-06-09 11:09:11 +02:00
Jacob Støren
0130a01ca2 IJK-Slice context menu commands for GeoMech
#306
Added picking source data to the viz model
Generalized the picking methods in RiuViewer, but there is more serious
refactoring needed.
2015-06-05 15:17:02 +02:00
Jacob Storen
3e06028690 Linux compile fixes 2015-06-04 07:46:33 -07:00
Jacob Støren
adb6d965de Missing non const access function 2015-06-04 16:36:48 +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
Jacob Støren
60c9b72671 Avoid exposing RigFemScalarResultFrames
Preparations to handle statistics across all parts better
2015-06-04 16:25:05 +02:00
Stein Dale
ac700e0c54 Added functions for element sets
The geomech interface and the ODB reader now have functions that return
element set names for a given part, and that return a vector of element
indexes for a given element set.
2015-06-04 16:16:35 +02:00
Stein Dale
e5e36f43b9 Converting ODB bulk data from double to float if needed
Added helper class RifOdbBulkDataGetter, which is now used when getting
bulk data from the ODB API. Converting from double to float if needed.
2015-06-04 14:20:16 +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
Stein Dale
bd6e6acc53 Changed interface of openFile()
The error message string pointer does now not have a default value any
more (NULL).
2015-06-04 13:05:36 +02:00
Stein Dale
fcfd2603e0 Disabled warnings from compilation of ODB API
Disabled a couple of more warnings from compilation of ODB API.
Pushing/popping pragmas before and after inclusion of ODB API headers.
2015-06-04 13:02:49 +02:00
Stein Dale
be1759835e Refactored ODB results metadata
Added private class RifOdbResultKey which is now used as a map key and
as a parameter in results related methods.
2015-06-04 11:14:12 +02:00
Jacob Støren
db13843276 Removed obsolete code 2015-06-03 15:23:19 +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 Storen
9f87011ddd Linux compile fixes 2015-06-03 04:22:34 -07: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
842e3d385f Picking results metadata from the second frame
Picking results metadata from the second frame of the first step.
2015-06-03 12:02:34 +02:00
Stein Dale
9eebcb1899 Optimized building of results metadata
Reading results metadata from the first frame of the first step only,
assuming that the results metadata are the same for all steps/frames.
2015-06-03 11:37:13 +02:00
Stein Dale
fd571091b4 Changed return value of RifOdbReader::stepFrame()
Made sure that RifOdbReader::stepFrame() returns a const reference to
the given frame.
2015-06-03 11:15:05 +02:00
Stein Dale
4e61f0774b Removed unused function
Removed static function which has now been replaced by
RifOdbReader::resultsMetaData().
2015-06-03 10:58:29 +02:00
Stein Dale
82afb3bd04 ODB API usage optimizations
Using const references to avoid unnecessary copying of memory. Also
releasing each frame when not needed any more when building results
metadata.
2015-06-03 10:51:00 +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 Storen
0bdc8916d7 Linux compile error/warning fixes 2015-05-29 02:27:23 -07:00
Jacob Støren
cdcfd62163 Geomech range : Improve Finding IJK = 000
Now the ijk assignment algorithm works for both test files.
Needed to use my first idea on how to detect element corresponing to IJK
= 000
2015-05-29 09:24:31 +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 Støren
8a6e1ae65a Geom Range WIP
Store face in neighbor
Oposite face lookup
Start of finding grid corner element
2015-05-27 15:36:20 +02:00
Jacob Storen
f6e8bb4a1a Fixes of linux compile errors and warnings 2015-05-27 05:50:12 -07:00
Jacob Støren
0d56ee060e Neighbor calculation and invisible face removal
As a step on the road to range filtering of Geomech cases, the removal
of internal faces is implemented, and fairly optimized.
We might consider paralellization, but reading the elements is the real
bottleneck.
Memory usage should be looked at.
2015-05-26 14:02:25 +02: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
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
2c7a741805 Renamed the files of RimReservoirView to RimEclipseView 2015-05-21 10:34:38 +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
5e44826206 Fixed bug in parallell quad gen.
Cut paste error.
2015-05-15 21:09:47 +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
8c12c8bcf7 Performance: Temp estimate of vx count
to fit generation of all faces for all elments
2015-05-13 20:22:37 +02:00
Jacob Støren
8813d8da6d Performance: Avoid increasing memory. Parallell quad gen. 2015-05-13 14:27:39 +02:00
Stein Dale
860151074b RedHat build fix: Fixed case in include filename
"RigGeomechCaseData.h" -> "RigGeoMechCaseData.h"
2015-05-13 11:54:58 +02:00
Jacob Støren
a74a8114f4 FemGeomGen: Removed obsolete code 2015-05-12 14:35:35 +02:00
Jacob Støren
d3baa09774 OdbReader: Cleaned up elmtype functions a bit 2015-05-12 14:35:11 +02:00
Jacob Støren
0d0b2f9609 Introduced correct integration point result order 2015-05-12 14:22:26 +02:00
Jacob Støren
92a9bf9994 Fixed error in integration point res mapping
Wrong vertex to result index used
2015-05-11 23:22:55 +02:00
Stein Dale
6b79c92f68 Fixed building of geo mech lib and odb reader unit tests
Changed cmake files and unit tests after recent changes that had broken
the builds. Geo mech lib now links with new library
ResultStatisticsCache.
2015-05-11 14:42:41 +02:00
Stein Dale
a958184daf RedHat compilation fixes
Added includes.
2015-05-08 15:51:18 +02:00
Stein Dale
23f4f05b99 RedHat compilation fixes
Added stdlib includes, to be able to compile on RedHat.
2015-05-08 15:51:16 +02:00
Stein Dale
29e40e242d ODB reader lib now compiles on RedHat
Added compilator flags and definitions, and added list of dynamic libs,
for RedHat.
2015-05-08 15:51:15 +02:00
Stein Dale
a91962b1a2 Linux compilation fixes
Did some changes to be able to build on RedHat. Stopped using auto for
iterator types.
2015-05-08 15:51:14 +02:00
Stein Dale
1b8944516f Linux compilation fix
Added include
2015-05-08 15:51:13 +02:00
Stein Dale
5fe54c6c8d Instance count, initialize/finalize ODB API
Using a static instance count member to determine when to initialize or
finalize ABAQUS ODB API.
2015-05-08 15:51:12 +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
93d92e5cb5 Added statistics etc. access in GeomechCaseData 2015-05-08 10:35:49 +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
d405643d60 Fem-results caching now up and running
Still work in progress. Statistics not complete
2015-05-07 10:12:54 +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
Stein Dale
746e9d402d Added unit tests 2015-05-07 09:31:33 +02:00
Stein Dale
d03cd6ef4c Added unit tests
Added some unit tests for verification of result values.
2015-05-07 09:25:57 +02:00