OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-26 00:06:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,701 Commits 31 Branches 61 Tags 287 MiB
fb158b29bd
Commit Graph

290 Commits

Author SHA1 Message Date
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
Magne Sjaastad
e9b3759263 Removed asserts related to reading of inactive cell well data 
p4#: 20343
 2013-02-01 15:26:27 +01:00
Magne Sjaastad
644d201b37 Added porosity model to ResultDefinition 
Keep this property hidden from GUI until more testing is done
p4#: 20339
 2013-02-01 14:39:32 +01:00
Magne Sjaastad
e635bb5dbb Removed functions in RigGridBase due to changes in StructGridInterface 
p4#: 20335
 2013-02-01 13:10:31 +01:00
Magne Sjaastad
01f3fb8e94 Moved result interface from struct grid to struct grid scalar data access 
Use this concept to configure result data values to use for vizualization. Created data access object for RegGrid.
p4#: 20334
 2013-02-01 12:25:34 +01:00
Jacob Støren
66f0bc03bd Undo an unintended checkin 
p4#: 20323
 2013-01-31 17:21:30 +01:00
Jacob Støren
b33dd15372 Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d 
Had to remove a krsj.txt file that caused trouble (again)
p4#: 20320
 2013-01-31 15:55:49 +01:00
Jacob Støren
0ac6dc32a5 Long Pyramidish degenerated inactive cells are now sorted out as invalid TP#3345 
p4#: 20306
 2013-01-30 15:02:28 +01:00
Magne Sjaastad
ce95f13c10 Added reading of fracture model active index 
Lots of renaming
p4#: 20302
 2013-01-30 14:13:50 +01:00
Magne Sjaastad
4275e67a82 Compute active and fracture cell count for all grids 
Renamed numActiveCells on maingrid to globalMatrixActiveCellCount
p4#: 20295
 2013-01-30 10:39:45 +01:00
Magne Sjaastad
76721130eb Added fracture active index 
p4#: 20294
 2013-01-30 09:30:48 +01:00
Magne Sjaastad
1c8bb6e38e Prepare for dual porosity 
Renamed active to matrixActive
p4#: 20286
 2013-01-29 15:09:34 +01:00
Magne Sjaastad
cd9d94f5f9 Prepare for dual porosity data structures. 
Renamed from activeCellIndex to activeMatrixCellIndex
p4#: 20285
 2013-01-29 14:56:55 +01:00
Magne Sjaastad
66a41c1ab9 Use keywordsWithGivenResultValueCount to clarify what is done when asking for result keywords 
p4#: 20274
 2013-01-29 08:17:45 +01:00
Magne Sjaastad
5769034cdc Removed unused interface function 
p4#: 20258
 2013-01-25 16:42:30 +01:00
Magne Sjaastad
715e42b10b Produce valid K when invalid K for wells is detected 
When an invalid K index is detected, use K-index of the lowest active cell for given IJ location. Invalid K are seen for both well heads and well cells.
p4#: 20254
 2013-01-25 15:20:41 +01:00
Magne Sjaastad
571da22931 Removed obsolete USE_ECL_LIB, as ERT is now part of the source code tree 
p4#: 20253
 2013-01-25 14:28:42 +01:00
Jacob Støren
288c8bda71 Removed compiler warnings on linux as well. Now there are (nearly)only ERT warnings left. 
p4#: 20238
 2013-01-24 14:26:51 +01:00
Jacob Støren
0807261123 Fix of missing well data from separate restart files. 
p4#: 20234
 2013-01-24 10:41:28 +01:00
Jacob Støren
268b38aa65 Removed even more compiler warnings. 
p4#: 20220
 2013-01-23 10:56:09 +01:00
Jacob Støren
b938b14b5b Removed a lot of size_t/uint/int related compiler warnings. Still more to go. 
p4#: 20215
 2013-01-22 11:34:47 +01:00
Jacob Støren
96e1b7db0d Removed compiler warning 
p4#: 20205
 2013-01-21 16:14:31 +01:00
Magne Sjaastad
2cf0e32d4b Updated ERT to GIT version a39d4b4a9e597532b2dbf845751a70ffe1de3805 
p4#: 20194
 2013-01-18 08:53:37 +01:00
Jacob Støren
c74619e79a Fixed cmakelist for Reservoirdatamodel test project 
p4#: 20190
 2013-01-17 21:26:12 +01:00
Magne Sjaastad
04006370ac Added ERT as source code based on https://github.com/Ensembles/ert/ and commit 7b53b5f61f5b47e8169b72098b562071df394bc3 
This is SVN commit 4117
Updated ResInsight cmakelists to build ERT and link directly
Removed precompiled ERT binaries
p4#: 20183
 2013-01-17 13:33:59 +01:00
Magne Sjaastad
3019bd9f9c Removed debug output 
p4#: 19304
 2012-10-25 07:39:42 +02:00
Magne Sjaastad
e5c3418c02 Allow reading of Eclipse Ascii without ACTNUM 
p4#: 19298
 2012-10-24 13:46:42 +02:00
Magne Sjaastad
65acad250c Reduced loading time of Eclipse Ascii files by storing filepos for keywords 
QFile is used directly due to a bug with QTextStream fixed in 4.8.0
p4#: 19079
 2012-10-08 19:44:10 +02:00
Magne Sjaastad
9c1ce7591e Upgraded visualization libraries 
Major refactoring of color legend framework
Added discrete log color legend
p4#: 18989
 2012-10-02 10:17:52 +02:00
Joakim Hove
c002720509 Added CACHE settings to the ERT_ROOT_PATH variable 2012-09-22 15:59:15 +02:00
Magne Sjaastad
738d6cc8dc Use CMAKE_CL_64 to check if we are compiling Windows x64 
p4#: 18835
 2012-09-20 08:33:42 +02:00
Magne Sjaastad
8a8fd5a0d0 Fixed default location for ERT lib files for Windows 2012-09-13 11:51:03 +02:00
Magne Sjaastad
bf8a006c0e Updated ERT to SVN revision 4077 for Windows 32/x64 2012-09-13 11:41:48 +02:00
Magne Sjaastad
748f061a55 Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT. 2012-09-13 10:56:39 +02:00
CeetronResInsight
76cfde5ba6 Change 18611 on 2012/09/11 by magne@ResInsight_magne_RHE5 
Removed requirement for MAPAXES when reading an Eclipse Ascii file
 2012-09-11 13:04:24 +02:00
CeetronResInsight
b3c142cc9a Change 18603 on 2012/09/11 by fredrik@fredrik_MBP-BootCamp 
Added glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT); to get proper orientation of textures on point sprites
 2012-09-11 09:22:36 +02:00
Magne Sjaastad
2bbd48588e Fixes for Visual Studio 2012-09-10 11:34:11 +02:00
Joakim Hove
e1d669ec65 Linking to wrong util name 2012-09-09 12:14:12 +02:00
Joakim Hove
d8a5f2cf7e Updated FileInterface_UnitTests/CMakeLists.txt to support ERT in arbitrary locations 2012-09-09 12:09:50 +02:00
Alf Birger Rustad
1ef02299c1 Merge pull request #7 from Ivarun/build_fixes 
Build fixes
 2012-09-01 10:37:08 -07:00
Magne Sjaastad
27d8808c5c Version 0.8.6 2012-08-31 19:12:47 +02:00
Ivar Ursin Nikolaisen
94d00b4870 Replace tabs with spaces in conformance with style 2012-08-31 13:16:47 +02:00
Ivar Ursin Nikolaisen
bfb2a75a56 Add libz to unit test that requires it. 2012-08-27 15:25:03 +02:00
Ivar Ursin Nikolaisen
85c96b5567 Add libpthread link to unit tests that require it. 2012-08-27 15:22:03 +02:00
Roland Kaufmann
ec7057eb78 Use copy ctor instead of conversion through QChar* 
Versions of Qt < 4.7 do not have a QString constructor from QChar*
without specifying the size of the string. However, since the QString
is copy-on-write, the QString object can be passed to the copy
constructor of the return value directly!
 2012-07-06 12:29:36 +02:00
unknown
2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00