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
Magne Sjaastad
8f50b90216
Added grid collection and reuse of MainGrid if the grids are equal
...
p4#: 20517
2013-02-14 13:16:56 +01:00
Magne Sjaastad
b1531c5454
Initial version of RigGridCollection
...
p4#: 20514
2013-02-14 10:08:56 +01:00
Magne Sjaastad
b4a6cccfb0
Added include of math.h
...
p4#: 20508
2013-02-13 14:59:30 +01:00
Magne Sjaastad
b8e663da03
Added list of files in CMakeLists_files.cmake
...
Do not use precompiled headers for ReservoirDataModel files
p4#: 20506
2013-02-13 14:50:37 +01:00
Magne Sjaastad
33a6157906
Cleanup of comments
...
p4#: 20504
2013-02-13 13:50:37 +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
f14c03f172
Fixed index bug in data access
...
p4#: 20498
2013-02-13 11:47:29 +01:00
Magne Sjaastad
a0d6890aa3
Removed obsolete code
...
p4#: 20492
2013-02-13 11:24:36 +01:00
Magne Sjaastad
e99c1cbfb1
Moved computation of geometry bounding box from main grid to reservoir
...
p4#: 20490
2013-02-13 11:04:45 +01:00
Magne Sjaastad
1a17875dc1
Restructured data access objects, added factory method
...
p4#: 20471
2013-02-12 14:46:45 +01:00
Magne Sjaastad
d45aded7f7
Removed more functions from MainGrid
...
p4#: 20468
2013-02-12 14:00:39 +01:00
Magne Sjaastad
6c7dc10791
Removed functions from MainGrid
...
p4#: 20459
2013-02-12 12:55:58 +01:00
Magne Sjaastad
ea2c890b95
Moved active cell computation from main grid to socket server
...
p4#: 20458
2013-02-12 12:05:41 +01:00
Magne Sjaastad
6101209d40
Moved functionality from main grid to active cell info
...
p4#: 20457
2013-02-12 11:50:23 +01:00
Magne Sjaastad
996f2fc7eb
Release active cell info if no fracture cells is present.
...
p4#: 20456
2013-02-12 11:43:36 +01:00
Magne Sjaastad
99f5299030
Release active cell info if no fracture cells is present.
...
p4#: 20456
2013-02-12 11:26:33 +01:00
Magne Sjaastad
2b4edf39d1
Use active cell info structure
...
p4#: 20455
2013-02-12 11:15:36 +01:00
Magne Sjaastad
0bc3d9f205
More tests and moved more functions
...
p4#: 20447
2013-02-12 07:11:32 +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
7a88cf899b
More robust creation of data access object
...
p4#: 20410
2013-02-07 12:16:04 +01:00
Magne Sjaastad
dbeb61bd53
Added test to make data access more robust.
...
p4#: 20403
2013-02-07 09:06:37 +01:00
Magne Sjaastad
d1f8110deb
Added missing test for fracture result data item count
...
p4#: 20383
2013-02-06 10:07:35 +01:00
Magne Sjaastad
f9dca273af
Added missing computation of active cell count to mock models
...
p4#: 20382
2013-02-06 10:02:50 +01:00
Jacob Støren
487ee03212
Rearranged members a bit in preparations to split out active info
...
p4#: 20381
2013-02-05 16:35:04 +01:00
Magne Sjaastad
77b43847c7
Added const to active cell count methods
...
p4#: 20364
2013-02-04 15:32:37 +01:00
Magne Sjaastad
a1788740aa
Added const access
...
p4#: 20361
2013-02-04 14:33:28 +01:00
Jacob Støren
9d9f8d45c0
Removed obsolete code regarding introduction of coarse cells
...
p4#: 20345
2013-02-01 15:34:27 +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
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
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
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
f5da271c17
Fix of missing well data from separate restart files.
...
p4#: 20234
2013-01-24 10:41: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
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
CeetronResInsight
8a5ac934c8
TP #3805 : Fixed bug related to computation of SOIL based on SGAS/SWAT
...
p4#: 20152
2013-01-15 15:40:09 +01:00
Magne Sjaastad
fa2fceccf4
Do not compute SOIL if none of SGAS or SWAT is present
...
p4#: 19303
2012-10-25 07:25:43 +02:00
Magne Sjaastad
73c370a299
Use TOPS as property name for top face of cells. Use positive K for BOTTOM, use negative K for TOPS.
...
p4#: 19294
2012-10-24 13:05:42 +02:00
Magne Sjaastad
ddc555d590
Compute DEPTH, DX, DY, DZ, TOP and BOTTOM if not present. Added flag in Preferences to control if ResInsight automatically computes these values. Improved statistical computations by skipping HUGE_VAL.
...
p4#: 19287
2012-10-24 10:52:44 +02:00
Jacob Støren
a8b4d35b4f
ResInsight: Added mean value to 3D info text
...
p4#: 19268
2012-10-23 12:08:46 +02:00
Magne Sjaastad
e8da3510ec
Compute SOIL if one or none of SGAS or SWAT is present
...
p4#: 19173
2012-10-12 14:27:43 +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
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
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
047ca6d380
Add libpthread link to ReservoirDataModel_UnitTests
2012-08-27 15:28:35 +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