Commit Graph
100 Commits
Author SHA1 Message Date
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 Støren d8ffcedd7a Shifted version number to 1.3.4-dev 2015-06-08 08:28:29 +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 ebc0475787 cvf::CellRangeFilter: Added hasIncludeRanges() 2015-06-05 15:35:36 +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
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
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 3ba140abde Avoid multiple qt connections anim-control->toolbar 2015-06-03 12:14:34 +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
Jacob Støren a338c6abda Improved documentation of the progressbar class 2015-06-03 12:07:35 +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 d82d88d592 Removed a ; 2015-05-21 14:33:10 +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 710f3d6c62 Adjusted cmake messages 2015-05-19 21:27:29 +02:00
Jacob Støren a7991ac151 Merge pull request #290 from OPM/dev-geomech
Geomechanics into ResInsight dev
2015-05-18 15:45:16 +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 23fcd78093 Updated the version number to 1.3.3-dev 2015-05-18 10:15:11 +02:00
Jacob Støren 33148edef4 VizFwk: Discrete log legend: Added missing clamping 2015-05-16 09:36:03 +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 7a2640b52f Discrete legend: Fix of discrete texture and end colors
Added changes from ChList 2078-2081
2015-05-13 20:51:44 +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
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
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
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
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