Commit Graph
108 Commits
Author SHA1 Message Date
Jacob Støren 0fed66deb2 Moved the statistical calculation algorithm code into a separate file.
Added unit test to these calculations, and fixed a calculation error.
p4#: 21140
2013-04-05 10:49:39 +02:00
Jacob Støren 75f089d0d4 Statistics UI is now functional, together with two percentile evaluation methods
Refurbished the calculation algorithm code somewhat
p4#: 21134
2013-04-04 16:53:34 +02:00
Magne Sjaastad cc8568cca6 Fixed inverted test for null pointer
p4#: 21127
2013-04-04 12:08:36 +02:00
Magne Sjaastad e49895ea65 Updated file headers
p4#: 21104
2013-04-03 09:09:53 +02:00
Jacob Støren f0174a02fa More file renaming:
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21070
2013-03-22 16:58:44 +01:00
Jacob Støren 27647248ea Rename of files:
RIBaseDefs	RiaBaseDefs
RIVersionInfo	RiaVersionInfo
RIMain	RiaMain
RIStdInclude	RiaStdInclude
p4#: 21067
2013-03-22 16:12:00 +01:00
Jacob Støren e493db37d0 Major renaming of classes. Filenames not done yet.
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21064
2013-03-22 15:43:42 +01:00
Jacob Støren bd33a64e84 Added a comment
p4#: 21063
2013-03-22 15:22:50 +01:00
Magne Sjaastad d85b0d4619 More checking on null pointers
p4#: 21052
2013-03-22 11:46:54 +01:00
Magne Sjaastad 3cd92973af Missed one file in previous rename
p4#: 21046
2013-03-22 09:44:41 +01:00
Magne Sjaastad 21065176f2 Rename of functions in RigActiveCellInfo
p4#: 21045
2013-03-22 09:32:42 +01:00
Jacob Støren 326cd79754 Result Storage: Finally things have come together, and seems to behave.
Refactored the loadProject system to make loading of statistical cases work as they should.
Got the update of references regarding grid and unionActive cells work
Introduced a bool to keep track of what cell results to store.
Introduced a clear method in ActiveCellInfo.
Renamed a bit
p4#: 21036
2013-03-21 15:31:47 +01:00
Magne Sjaastad a5fb1e1764 One shared active cell info for all statistical cases
Invalidate existing statisticsCases when adding/removing source cases
Moved computation of active cell union from RigStatistics to RimIdenticalGridCaseGroup
Recompute active cell union when opening project file
p4#: 21023
2013-03-21 10:31:58 +01:00
Magne Sjaastad 50206b9dc4 Various linux fixes and missing includes
p4#: 20976
2013-03-20 06:11:45 +01:00
Magne Sjaastad f0fa445f7a Set main grid on eclipse case and cell results
p4#: 20955
2013-03-19 08:28:25 +01:00
Magne Sjaastad 5db5c14230 Added possibility to read out scalar result index having most time steps
p4#: 20952
2013-03-19 08:14:35 +01:00
Jacob Støren 9da6b0a10b Results Storage: Fixed the Previous build error by moving the RigStatistics class.
Cleaned up a bit in the ApplicationCode/CMakeList.txt
p4#: 20946
2013-03-18 14:51:31 +01:00
Jacob Støren f7248f3999 Results Storage: A huge refactorisation to make way for storing generated properties to an internal file.
This does not yet compile due to a unfortunate mix of perforce, cmake setup and unit_test project shortcomings.
Need to move RigStatistics into ProjectDataModel and rename it before this is running again.
p4#: 20945
2013-03-18 14:34:29 +01:00
Magne Sjaastad 62e4cac4b0 Added inherited object of MimeData to carry model index list
p4#: 20926
2013-03-18 11:40:39 +01:00
Magne Sjaastad 160456106a Use raw pointers instead of ref count
Added more asserts and cleanup
p4#: 20891
2013-03-13 14:43:27 +01:00
Magne Sjaastad d33a27a082 Fixed ref counts
p4#: 20890
2013-03-13 14:41:54 +01:00
Jacob Støren 3c446c4018 Removed out-commented code from the ActiveCellInfo refactoring
p4#: 20886
2013-03-13 13:42:27 +01:00
Jacob Støren 8a604aca24 Refactored RigActiveCellinfo to only have one set of information.
Fracture and Matrix separated information thus needs two such obejcts.
There still needs to remove some out-commented code
p4#: 20877
2013-03-13 11:50:31 +01:00
Magne Sjaastad 449b22c681 Do not use smart pointer in this class
p4#: 20875
2013-03-13 11:39:27 +01:00
Magne Sjaastad 99917c60ad Compute SOIL for each time step
Added support for computing statistics for derived SOIL
p4#: 20873
2013-03-13 10:29:47 +01:00
Magne Sjaastad 06460424af Check for empty source cases
p4#: 20871
2013-03-13 08:03:26 +01:00
Magne Sjaastad 766996a9fd Include static properties when computing statistics
p4#: 20870
2013-03-13 07:58:49 +01:00
Jacob Støren 9ab0a397ef Removed the m_isWellCell member from RigCell, to make the grid data completely independent of case / result data
p4#: 20859
2013-03-12 10:03:25 +01:00
Magne Sjaastad 94065f29ed Removed obsolete code
p4#: 20857
2013-03-12 09:59:33 +01:00
Magne Sjaastad 61e8115141 Fixed indentation issues
Renamed and added asserts
p4#: 20846
2013-03-11 14:04:48 +01:00
Jacob Støren 0a5102894b Calculate statistics for all available properties in main case by default
p4#: 20832
2013-03-08 10:49:33 +01:00
Magne Sjaastad 9605a1eec9 Added clear method to make sure all objects are destroyed.
p4#: 20828
2013-03-08 08:36:30 +01:00
Magne Sjaastad 208e904f57 Rebuild geometry after computing new active cell info, and update views
p4#: 20821
2013-03-07 14:57:28 +01:00
Magne Sjaastad 1bf1d5a7cf Rebuild geometry after computing new active cell info, and update views
p4#: 20821
2013-03-07 14:56:52 +01:00
Magne Sjaastad 05b6c1ad18 Compute active cell info grid by grid
p4#: 20817
2013-03-07 13:20:15 +01:00
Jacob Støren 77d5b810ca Fixed errror regarding LGC and missing results
p4#: 20794
2013-03-06 15:13:37 +01:00
Magne Sjaastad e94264a39f Added support for building of metadata from existing time steps
Improved statistics calculation for opening single time step files
Close all dynamic access files when a time step statistics is complete
p4#: 20756
2013-03-05 13:10:26 +01:00
Magne Sjaastad 452b08db3a Added progress info
p4#: 20755
2013-03-05 13:03:52 +01:00
Magne Sjaastad debb8e132f Linux fix
p4#: 20715
2013-03-05 08:39:50 +01:00
Magne Sjaastad 7174049aed Use time step dates from first source case when creating a statistical result
p4#: 20713
2013-03-05 08:34:45 +01:00
Magne Sjaastad a6c9d9d0f0 Linux fix
p4#: 20696
2013-03-02 15:39:33 +01:00
Magne Sjaastad a63c656a48 Added RigStatistics
p4#: 20695
2013-03-02 15:33:27 +01:00
Magne Sjaastad 42f3f0b2d2 Fixed invalid check
p4#: 20692
2013-03-02 15:10:10 +01:00
Magne Sjaastad 27a8088421 Compute global count based on active cell vectors
p4#: 20688
2013-03-01 16:13:37 +01:00
Jacob Støren 1181d62b75 Reviewed and simplified DataAccess classes.
Includes some const changes and some renaming
p4#: 20687
2013-03-01 16:00:34 +01:00
CeetronResInsight c0a578678d Linux compile fixes
p4#: 20663
2013-02-28 09:59:36 +01:00
Magne Sjaastad 0993a8984d Fixed unit tests
p4#: 20659
2013-02-28 08:04:43 +01:00
Jacob Støren ad082254af Well pipe size now is based on min characteristic I, J cell size
p4#: 20628
2013-02-26 14:08:30 +01:00
Magne Sjaastad 1a235529ac Removed active cell info from RigCell
Set all cells active for mock models
p4#: 20614
2013-02-25 14:07:59 +01:00
Magne Sjaastad d8000be32a Use isActiveInMatrixModel instead of activeInMatrixModel
p4#: 20612
2013-02-25 13:27:38 +01:00