Commit Graph

242 Commits

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