Commit Graph
72 Commits
Author SHA1 Message Date
Stein Dale b4759ca06e Refactored cell property filter collection
Using caf::PdmPointersField as container.
2015-06-18 14:00:16 +02:00
Stein Dale 0ea699484c Changed tooltip for toolbar button (#311)
"Disable Lighting" -> "Disable Results Lighting"
2015-06-18 13:28:27 +02:00
Stein Dale 720de6c30c "Disable Lighting" toolbar button is always enabled if there's an active view (#311) 2015-06-18 13:26:50 +02:00
Stein Dale f55b6d2519 Removed ui update code that is not needed (#311) 2015-06-18 13:22:13 +02:00
Stein Dale 2ca5151c6c "Disable Results Lighting" field is always enabled (not read only) in a view (#311) 2015-06-18 13:20:54 +02:00
Stein Dale 3eff3708ed Added action and toolbar button for "Disable Lighting" (#311) 2015-06-18 12:23:28 +02:00
Stein Dale 04ad7ae44c Added icon for "Disable Lighting" (#311) 2015-06-18 12:23:28 +02:00
Stein Dale 8bdb957c8c Handling new field "Disable Lighting" in the view (#311) 2015-06-18 12:23:27 +02:00
Stein Dale 4b1a71fd91 Added new field "Disable Lighting" (#311) 2015-06-18 12:23:26 +02:00
Stein Dale 5e93b8ca1f Added option for disabling lighting (#311) 2015-06-18 12:23:26 +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
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
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
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
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
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
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
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
Stein Dale ed3d8b422a Removed ecl_lfs from target 2015-05-13 10:53:19 +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
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
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
Stein Inge Dale 5f497751e0 Update README.md 2013-10-25 11:00:15 +02:00
steinid 026dbc3c0f Update README.md 2013-10-25 09:36:07 +02:00
steinid af5ae63bc3 Update WellPaths.md 2013-10-24 16:50:06 +02:00
steinid 3c0aca8de1 Update WellPaths.md 2013-10-24 16:48:17 +02:00
steinid d123237c84 Update WellPaths.md 2013-10-24 16:35:10 +02:00
steinid 5f99bb5c2f Update UsersGuide.md 2013-10-24 16:34:36 +02:00
steinid 8246590f45 Update ReservoirViews.md 2013-10-24 16:07:11 +02:00
steinid 5c4be3c16d Update UsersGuide.md 2013-10-24 15:48:45 +02:00
steinid 030bcf0a38 Update UsersGuide.md 2013-10-24 15:47:52 +02:00
steinid fd7a5ebe1c Update UsersGuide.md 2013-10-24 15:45:43 +02:00
steinid 98568829f3 Update UsersGuide.md 2013-10-24 15:44:50 +02:00
steinid 80ed71ec6d Update UsersGuide.md 2013-10-24 15:40:17 +02:00