OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 20:20:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,031 Commits 26 Branches 61 Tags 288 MiB
04d70a9204
Commit Graph

134 Commits

Author SHA1 Message Date
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
Stein Dale
4d9753ecce Interface for element node and integration point results 
Added interface for element node and integration point results.
 2015-05-07 09:23:48 +02:00
Stein Dale
bd3758d026 Added part index parameter to RifOdbReader::resultItemCount() 
Made sure that RifOdbReader::resultItemCount() takes part index into
account.
 2015-05-06 13:32:14 +02:00
Stein Dale
5a3603bf43 Error message on file open 
Added optional error string parameter to openFile(). Made sure that
exceptions are handled. Returning false on file open error.
 2015-05-06 13:22:09 +02:00
Stein Dale
3bbe7ec2dd Removed enum 
Removed enum for result position which now is replaced by a private enum
in the reader class.
 2015-05-06 13:00:13 +02:00
Stein Dale
520823c267 Made result position enum private 
Made enum RifOdbResultPosition private. Renamed it to PesPos.
 2015-05-06 11:09:37 +02:00
Stein Dale
4f9f322f2e Refactored results metadata 
Using two levels of maps for results metadata, with result positions on
the top level.
 2015-05-06 10:22:45 +02:00
Stein Dale
06a6630cc8 Got rid of warnings 
Added a couple of #pragma directives to get rid of warnings from
compilation of ODB API.
 2015-05-06 09:59:24 +02:00
Stein Dale
2ddc6677ff Unit tests 
Fixed wrong parameters in a couple of unit tests.
 2015-05-06 09:49:07 +02:00
Stein Dale
5ad9cf80e3 Results per part instance 
Improved reading of results. Made sure that field subsets for the
correct part instance are used. Keeping id to index maps for elements
and nodes, which are used when reading results. Note: Geometry must have
been read before reading results.
 2015-05-06 09:47:19 +02:00
Stein Dale
64bbcc04f8 Reading element node and integration point fields 
Implemented RifOdbReader::readScalarElementNodeField() and
RifOdbReader::readScalarIntegrationPointField(). Needs verification.
Test files with element nodal fields needed.
 2015-05-05 09:41:59 +02:00
Stein Dale
d5eb383abd Results metadata 
Building results metadata data member on metadata request.
 2015-05-05 09:41:59 +02:00
Stein Dale
8a3763f4b3 Added openFile() and made some methods non-const. 2015-05-05 09:41:58 +02:00
Stein Dale
eb30a51e54 Cleaned up odb interface. 
Cleaned up interface. openFile() must be called before getting metadata,
results, or geometry. Running unit tests for only one reader instance
for the test file.
 2015-05-05 09:41:57 +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
4e9f91274c Fixing assert due to m_odb not set 
There still are troubles closing two instances accessing same file.
 2015-04-30 16:35:21 +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
1f51eb92b3 Add elmNodeResultIndex access 
Renamed somewhat to make things clearer in FemTypes/part
 2015-04-30 14:28:05 +02:00
Stein Dale
be2f261f9d Made some functions private. 
Made static member functions initializeOdbAPI() and finalizeOdbAPI()
private. Consider removing finalizeOdbAPI() since we don't use it.
 2015-04-30 14:22:20 +02:00
Stein Dale
5a9f22bfd2 Renaming of geo mech interface, separated results reporting for different result positions 
Reporting nodal, element nodal, and integration point result names
separately. Some functions in the geo mech interface were renamed.
Renamed "result" to "field" in function and parameter names in the
interface. TODO: Consider if we should report integration point results
as element node results too, and extrapolate when requested, if needed.
Fixed map handling in RifOdbReader::componentIndex().
 2015-04-30 14:22:18 +02:00
Stein Dale
ebfad85b5b Basic ODB reading, including results 
Now reading nodal results and displacements. Reporting results meta data
(names with components).
 2015-04-30 10:36:17 +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
936d6553cf Improved CMakeSetup for OdbTest app 
Cleaned away the hardcoded paths. Made options instead.
 2015-04-28 10:45:00 +02:00
Jacob Støren
1e88b38e69 Moved the testfile path to the CMake setup 
Edit from the Cmake GUI
 2015-04-28 09:22:31 +02:00
Jacob Støren
0560457cd2 Added C3D8 elements. Removed unused close() 
Close (or something similar) will be added when needed.
 2015-04-28 09:21:27 +02:00
Jacob Støren
8be93ae448 Moved the element type functions into a static class 2015-04-27 15:04:05 +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
ea3d2dc40d Fixed missing conversion to node indices from node ids 2015-04-27 13:47:41 +02:00
Jacob Støren
f9ca3d5e54 Renamed to RivFemPartPartMgr 2015-04-27 10:52:48 +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
c3ec79d6e1 Working ResInsight with Odb linked, hacklish 2015-04-25 08:54:08 +02:00
Jacob Støren
a538be1775 GeoMech with OdbReader Included in ResInsight Build 
Preliminary, first shot.
Added first iteration on basic visualization code.
 2015-04-24 16:04:12 +02:00
Jacob Støren
6dad519f30 Got elements and nodes from odb in the unit test 2015-04-23 15:43:11 +02:00
Jacob Støren
4737807b7b GeoMech data model and reader unit test framework. 2015-04-23 13:24:15 +02:00