Commit Graph

1496 Commits

Author SHA1 Message Date
Jacob Støren
5443582fec #313 Added Stress Path: Gamma 1,2,3 2015-06-17 16:03:42 +02:00
Jacob Støren
8773c54f17 #322 Result field name in info box 2015-06-17 16:03:37 +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
b5cfa8ab53 Renaming and improved some readability around well paths 2015-06-12 09:25:09 +02:00
Jacob Støren
a520a4322a Removed debug output from some well path code 2015-06-12 09:05:55 +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
3d0e0ace7a Linux compile fix 2015-06-11 13:15:59 +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
385fa55cdc Fixed one linux compile error and cleaned out some compiler warnings 2015-06-11 13:05:59 +02:00
Jacob Støren
4f77afe43c Implemented #310 Result info when picking
This included some refactorization to remove the command stuff out of
RiuViewer,
and to communicate the grid index via the source info struct, and not as
a cvfPart::id
2015-06-11 11:38:51 +02:00
Jacob Støren
24fb7ac584 Hack to be able to read synthetic odb related Eclipse cases 2015-06-10 10:34:05 +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 Storen
dc28fd81b9 Linux compile fixes 2015-06-05 06:47:30 -07: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
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 Støren
ba633bd847 Moved rangeFilterCollection to RimView 2015-06-05 10:05:40 +02:00
Jacob Støren
b74364087a Refactored IJKslot commands
Preparations to create IJK slice commands in 3Dview
2015-06-05 09:58:29 +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
e6231c0601 Histogram: Added float data input 2015-06-04 16:25:22 +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
e347249526 3DInfo : Made max and min values work 2015-06-03 15:24:28 +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
da5a1d8ff1 Geom Anim: Fixed missing setting of current timestep in anim toolbar 2015-06-03 12:14:42 +02:00
Jacob Støren
6e8692121d Varible rename 2015-06-03 12:14:38 +02:00
Jacob Støren
9582c27e97 Regression test system: Added 0.4% compare fuzzyness
To reduce differences introduced by hardware differences.
[RegTest Small+Large OK]
2015-06-03 12:14:30 +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
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
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 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
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
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
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
85f3c86814 Added hard rpath to odb libraries position 2015-05-19 21:27:33 +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
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
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
750fc5182c Refactor : Use allCases method instead of traversing
Preparations to allign Geomech and Eclipse cases
2015-05-15 08:18:11 +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
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
Jacob Støren
04c9639b0b Performance: Avoid regeneration of geometry on result change 2015-05-13 13:03:41 +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
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
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
85f62ec1d4 Moved code to new library: ResultStatisticsCache
Moved  RigStatisticsCalculator.h/.cpp, RigStatisticsDataCache.h/.cpp,
RigStatisticsMath.h/.cpp to new library ResultStatisticsCache.
ResInsight and some unit tests now link with this new library.
2015-05-11 13:25:05 +02:00
Stein Dale
ca17645499 Split classes in RigStatisticsCalculator.h/.cpp into separate files
New files:RigNativeStatCalc.h./cpp, RigMultipleDatasetStatCalc.h/.cpp.,
in addition to RigStatisticsCalculator.h/.cpp.
2015-05-11 10:56:33 +02:00
Stein Dale
da7035517f Added include - RedHat compilation fix
Added #include <limits.h>.
2015-05-11 09:48:55 +02:00
Stein Dale
a958184daf RedHat compilation fixes
Added includes.
2015-05-08 15:51:18 +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
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
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
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
41b0847041 GeoMechData lib needs USE_ODB_API define 2015-05-07 10:12:46 +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
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
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
Jacob Støren
f13f05709f Update legend and 3D info on display model gen 2015-04-30 14:27:57 +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
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
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
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
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
Jacob Støren
1f2bea106f Small guard RiuViewer 2015-04-21 08:37:32 +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
Jacob Støren
a5fba8f3f4 Fixes to match new Ert 2015-04-14 15:47:51 +02:00
Jacob Støren
02e47c6679 Guard against reading nnc data if none are available
See Issue #278. (Not fixing the issue, just improving code)
2015-02-24 14:57:23 +01:00
Jacob Støren
27ce1852ca Fix of #281: Crash while importing - cvfPlane.cpp Aborted 2015-02-24 13:34:03 +01:00
Magne Sjaastad
3b914c7ac0 Fixed missing dash in Linux startup script
https://github.com/OPM/ResInsight/issues/271
2015-01-25 22:14:20 +01:00
Magne Sjaastad
8de0f468ac Fixed invalid foreach syntax 2015-01-09 08:37:22 +01:00
Magne Sjaastad
9ded05212f Merge branch 'pr/268' into dev 2015-01-09 08:05:23 +01:00
Magne Sjaastad
053a9c4d78 Improved parsing of fault face text strings
See https://github.com/OPM/ResInsight/issues/263
2015-01-09 07:42:49 +01:00
Roland Kaufmann
4378f4886a Add application icon into the executable bundle 2015-01-01 19:46:25 +01:00
Roland Kaufmann
9fb9f84a7a Build resulting executable as a bundle on MacOS X
This will allow us to launch it from the Finder and add it to the dock
2015-01-01 19:46:25 +01:00
Roland Kaufmann
eac27f149a Enable in-package substitute of tr1/tuple
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
2015-01-01 19:46:25 +01:00
Roland Kaufmann
b25290bebd Complete instantiated types
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).

A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
2015-01-01 19:46:24 +01:00
Magne Sjaastad
0dcba178fd Do not show NNC text at all in progress bar when NNC import is disabled 2014-11-06 09:35:39 +01:00
Magne Sjaastad
619b7a211a Fix for dates before 1970 2014-10-29 09:34:57 +01: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
d9d4fdab3f Compute placeholder results when creating grid case group 2014-10-28 18:33:23 +01:00
Magne Sjaastad
043584b1b1 Faults : Improved robustness of fault names including space 2014-10-28 11:07:59 +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
55b5da018c Ternary : Clamp texture coordinates to avoid texture edge issues 2014-10-28 09:39:26 +01:00
Magne Sjaastad
da31522ae9 Removed invalid include 2014-10-27 14:09:19 +01:00
Magne Sjaastad
babe812ebc Fixed memory leak 2014-10-27 12:25:52 +01:00
Magne Sjaastad
5b5d0ffa5a Show generated static result for all time steps 2014-10-27 08:00:23 +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
2509fa974f Performance : Now possible to disable load of SOIL on load 2014-10-24 11:38:47 +02:00
Magne Sjaastad
a5e4e756af Updated ERT, now possible to read simplified MSW
Updated ERT to 3ac60303aa2dc58aed9420a24d9a881fec32076b
2014-10-24 11:19:54 +02:00
Magne Sjaastad
63a5dd24fe Added support for fault face using IJK in addition to XYZ 2014-10-09 20:36:27 +02:00
Magne Sjaastad
b93053b089 Updated ERT to 946e512ac17c1e2469892072a925428c0a012fa1 2014-10-09 20:13:04 +02:00
Magne Sjaastad
a8ce90e404 Always compute grid faults 2014-09-26 08:15:22 +02:00
Magne Sjaastad
b046a0354d Converted assert to if statement when no NNC data is present 2014-09-24 13:28:08 +02:00