Commit Graph
100 Commits
Author SHA1 Message Date
Jacob Støren 09d14c8ee2 Support Octave-4.0.0 on windows.(#325)
The modifications is also working in the old 3.6.1 version of octave,
so they should be good in the versions between too.
2015-07-01 07:44:51 +02:00
Jacob Støren b2fb9ae2c8 Fixed wrong CaseTypeId in octave GetCases. Introduced by the GeoMech Case.
(#325)
2015-07-01 07:44:50 +02:00
Jacob Støren 70b84957f9 Changed the oct-file build system to also handle octave-4.0.0 (#325) 2015-07-01 07:44:50 +02:00
Jacob Støren 2b1e2bb157 Fix of #321 and #284 Crash when setting data from octave into an input case 2015-06-29 17:06:55 +02:00
Jacob Støren e33caeab36 Fix of #301 Missing riTRANS/MULTXYZ when NTG is missing 2015-06-29 14:45:30 +02:00
Jacob Storen 3bd9360911 Linux compile fix.
Needed to move the implementation of copyByType() out of the class definition.
2015-06-29 03:37:02 -07:00
Jacob Støren 00f8743cef Fixed an assert and wrong behavior:
When selecting a result field "heading", after selecting one of its components.
2015-06-29 12:17:30 +02:00
Jacob Støren 948f4d5d58 Fwk: Added missing "setupBeforeSave" when copying.
This fixes #110 Copy view function resize/move grid in ResInsight
2015-06-29 10:48:25 +02:00
Jacob Støren 985afce261 #329 "Copy/Paste View" added for Geomechanics 2015-06-29 10:48:17 +02:00
Jacob Støren 55c1d5de71 Made help menu entry point directly to documentation, not the home-page 2015-06-29 10:48:10 +02:00
Jacob Støren 9269950263 Set version number to 1.3.5-dev 2015-06-25 08:10:04 +02:00
Jacob Støren 1cdd5262f8 Cleaned up PropertyFilter classes. 2015-06-24 15:03:55 +02:00
Jacob Støren 5b17c27b51 Fixed errors in 2b881f2cb8.
Statistics were not calculated properly for early timesteps when directly accessing a late timestep.
2015-06-24 14:13:00 +02:00
Jacob Støren fddef6d32c Turned on parallell GeoMech prop. filter visibility calculation 2015-06-24 13:15:34 +02:00
Jacob Støren 4fabc509a0 Missing updates of property filtered cells
1. When Rangefilters changed
2. When the rangefilter collection was turned off
2015-06-24 12:05:07 +02:00
Jacob Støren 2b881f2cb8 Avoid repeatedly recalculation of statistics of HUGE_VAL-only results 2015-06-24 12:05:01 +02:00
Jacob Støren 7d075999af Removed obsolete ifdefs 2015-06-24 12:04:55 +02:00
Jacob Storen eb2515b8c2 Linux compile fixes 2015-06-23 04:34:25 -07:00
Jacob Støren 515fb8b8d7 #314 Connected the Property filter code together.
Now working !
2015-06-22 21:57:52 +02:00
Jacob Støren 8f2090eccf Refactored GeoMechView createDisplayModel
Made adding well paths less obfuscated
Preparing for #314 Property Filter
2015-06-22 14:04:36 +02:00
Jacob Støren 088bc12459 Preparing for property filter. #314
Prototype code for property filter visibility
Refactoring the VizLogic class to make the responsibilities clearer
2015-06-22 08:18:54 +02:00
Jacob Støren e9fe03f63a Moved Fem visibility calculator to a separate file
Preparing for GeoMech Property filter
2015-06-22 08:18:48 +02:00
Jacob Støren 74efc8da1a Use the new RigCellSetEnum instead of unsigned char
Preparing for property filter
2015-06-22 08:18:42 +02:00
Jacob Støren 0377461da0 #323, #318 Geomechanical sign on Stress/Strain
Now they are presented as S and E, and the native Abaqus values are hidden.
2015-06-19 14:38:31 +02:00
Jacob Støren e740bdc618 #324, 323 -E and GammaNN derived results 2015-06-19 14:05:33 +02:00
Jacob Støren cfb0bfeb55 Moved RivCellSetEnum to a separate file.
Preparations for property filtering
2015-06-18 14:17:03 +02:00
Jacob Støren 8bf90ec27c Renamed enum type for Cell Sets (previously called ReservoirGeometryType) 2015-06-18 14:16:58 +02:00
Jacob Støren 09152ad363 Made internal enum private 2015-06-18 14:16:53 +02:00
Jacob Støren 919f2b61f3 Renaming and cleaning as preparations for GeoMech property filters
#314
2015-06-18 14:16:48 +02:00
Jacob Støren 2136c1b64c New DisableLightning icon 2015-06-18 14:12:44 +02:00
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 245feea95d cafTensor: Added a library cmake file 2015-06-17 13:07:43 +02:00
Jacob Støren 30d41b9251 Added a Tensor3-class to calculate principal values etc. 2015-06-17 13:06:50 +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
Jacob Storen 5f1b7f2fad Temporal linux compile fix 2015-06-12 06:32:29 -07: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
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
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 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