Commit Graph

310 Commits

Author SHA1 Message Date
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