Commit Graph

96 Commits

Author SHA1 Message Date
Magne Sjaastad
f9985af7e9 Added source groups in CMake to improve file organization in generated projects
p4#: 21330
2013-04-18 07:33:45 +02:00
Magne Sjaastad
e9743257ea Check if file pointer is present before creating a new file pointer
p4#: 21295
2013-04-16 08:25:43 +02:00
Jacob Støren
a246e288ba Renamed some methods and variables in the eclipse result file access system
To make things more readable and understandable
p4#: 21218
2013-04-10 11:02:10 +02:00
CeetronResInsight
1cfd103f30 Linux compile warning fixes
p4#: 21189
2013-04-09 07:59:41 +02:00
Magne Sjaastad
6c9f5d1978 Added reading of grid dimensions
p4#: 21154
2013-04-07 16:33:45 +02:00
Magne Sjaastad
32d67d9978 Updated ERT from https://github.com/Ensembles/ert/commits/master to version
4a78d88f1dc7bbc86f173c5adb825bbca29fa116
p4#: 21120
2013-04-04 08:24:40 +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
Magne Sjaastad
4101c3cd85 Removed obsolete file
p4#: 21048
2013-03-22 10:10:34 +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
50206b9dc4 Various linux fixes and missing includes
p4#: 20976
2013-03-20 06:11:45 +01:00
Magne Sjaastad
a411a8ae59 Removed obsolete code from interface
Use time steps from source case with largest time step count
p4#: 20954
2013-03-19 08:21:55 +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
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
f6fa801607 Use raw pointers in file readers to avoid circular references
p4#: 20826
2013-03-08 08:24:40 +01:00
Magne Sjaastad
ec825145df Fixed invalid active global index
p4#: 20816
2013-03-07 13:13:34 +01:00
Magne Sjaastad
02c7cc2b06 Fixed filenames for dynamic result access
p4#: 20762
2013-03-05 13:49:34 +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
4c955ece4a Improved statistical data infrastructure
p4#: 20694
2013-03-02 15:32:38 +01:00
Magne Sjaastad
5ed0e5a725 Linux fixes
p4#: 20691
2013-03-02 10:18:27 +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
Magne Sjaastad
1a05676551 Fixed missing open of INIT file
p4#: 20666
2013-02-28 11:27:37 +01:00
Magne Sjaastad
3dbc8a9d57 Improved multi case initial reading
When creating a multi case group from multiple files, read grid from first file.
The main grid from the first case is reused for the other cases.
NOTE: Metadata and well information is not read for the other cases
p4#: 20655
2013-02-27 15:27:33 +01:00
Magne Sjaastad
3dc027e29e Fixed issue related to reading data after close
p4#: 20647
2013-02-27 14:30:32 +01:00
Magne Sjaastad
d628973f56 Rename and improvements related to close
p4#: 20645
2013-02-27 14:13:37 +01:00
Magne Sjaastad
7694c5d02d Added support for lazy file parsing and improved closing of files
p4#: 20644
2013-02-27 14:01:36 +01:00
Magne Sjaastad
092974a7fa Rename, reject update of active cell data if number of cells is not matching
p4#: 20641
2013-02-27 11:54:32 +01:00
Magne Sjaastad
df281ccb2b Added reading of active cell data from EGRID file directly
p4#: 20640
2013-02-27 11:27:02 +01:00
Magne Sjaastad
2b5bea7a4a Cleaned up and improved how files are included from CMakeLists_files.cmake
p4#: 20616
2013-02-26 09:38:33 +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
a0b2be3dee Added framework for statistical calculation reader
p4#: 20591
2013-02-21 08:48:26 +01:00
Magne Sjaastad
b6abc0c6ea Added CMakeLists_files.cmake in FileInterface folder
p4#: 20590
2013-02-21 08:46:09 +01:00
Magne Sjaastad
a09dba2670 File rename from RigReservoir to RigEclipseCase
p4#: 20503
2013-02-13 13:33:35 +01:00
Magne Sjaastad
ec8817e207 Renamed RigReservoir to RigEclipseCase
p4#: 20500
2013-02-13 13:24:39 +01:00
Magne Sjaastad
b1cb8a6716 Moved result value vectors from MainGrid to Reservoir
p4#: 20499
2013-02-13 13:10:54 +01:00
Magne Sjaastad
a0d6890aa3 Removed obsolete code
p4#: 20492
2013-02-13 11:24:36 +01:00
Magne Sjaastad
1a17875dc1 Restructured data access objects, added factory method
p4#: 20471
2013-02-12 14:46:45 +01:00
Magne Sjaastad
6c7dc10791 Removed functions from MainGrid
p4#: 20459
2013-02-12 12:55:58 +01:00
Magne Sjaastad
2b4edf39d1 Use active cell info structure
p4#: 20455
2013-02-12 11:15:36 +01:00
Magne Sjaastad
8fd8a31aec Added RigActiveCellInfo
Started refactoring aiming for extracting all active cell information into RigActiveCellInfo.
p4#: 20445
2013-02-11 15:12:53 +01:00
Magne Sjaastad
d5e491b7e0 If K-value for a well is given in fracture grid, subtract NZ from K to get index in matrix grid.
p4#: 20429
2013-02-08 14:51:42 +01:00
Magne Sjaastad
0ed6c97ee3 Removed access method for time step texts, as it was not used
p4#: 20400
2013-02-07 08:41:40 +01:00
Magne Sjaastad
3906298cb6 Added support for reading more than one timestep per day. If this is detected, show hours and minutes in animation toolbar.
p4#: 20399
2013-02-07 08:35:04 +01:00
Jacob Støren
6fef9994db Improved progress bar smoothness.
Particularily when having many result files
p4#: 20392
2013-02-06 13:44:27 +01:00
Magne Sjaastad
cf5aa3e882 Rewrite of file acces helper class
RifEcliseOutputFileTools is now a class with only static functions
Moved some application logic from file readers to RifEcliseOutput
Added more tests for extracting metainfo related to results
p4#: 20368
2013-02-05 10:51:32 +01:00
Jacob Støren
69d8739c6c Removed pyramid cells when members of a coarse cell
p4#: 20357
2013-02-04 13:46:28 +01:00
Jacob Støren
3c9ac23534 Results from a case with Coarse cells is now finally ok.
p4#: 20344
2013-02-01 15:33:21 +01:00