Commit Graph
100 Commits
Author SHA1 Message Date
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 edda92182b Use active cell info struct instead of RigCell member function
p4#: 20613
2013-02-25 14:01:40 +01:00
Magne Sjaastad d8000be32a Use isActiveInMatrixModel instead of activeInMatrixModel
p4#: 20612
2013-02-25 13:27:38 +01:00
Magne Sjaastad f00152823f Consolidated cache data computations
Removed automatic insertion of grids into identical grid groups
p4#: 20607
2013-02-22 10:12:06 +01:00
Magne Sjaastad 49236839a3 Added menu item for multiple case import
Find EGRID files recursively in subfolders
p4#: 20603
2013-02-21 16:46:34 +01:00
Magne Sjaastad 0dc492da75 Added casecollection in grid case group
p4#: 20602
2013-02-21 15:37:51 +01:00
Magne Sjaastad 4a3bde5baa Moved statistical cases into statistics case collection
p4#: 20599
2013-02-21 12:00:49 +01:00
Magne Sjaastad f45c581dbc Added name to group case
p4#: 20595
2013-02-21 10:38:28 +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 9ad5ec5449 Add view from context menu of case
p4#: 20589
2013-02-21 08:39:50 +01:00
Magne Sjaastad e82aef5850 Imroved lifespan handling for reservoirs
p4#: 20526
2013-02-15 10:01:41 +01:00
Magne Sjaastad 73c9459276 Simplified adding of view
p4#: 20524
2013-02-15 09:21:28 +01:00
Magne Sjaastad c92e822f3f Added context menu items for adding new statistical case
p4#: 20523
2013-02-15 08:44:45 +01:00
Magne Sjaastad 67cab9448e Added statistical calculation framework
p4#: 20521
2013-02-14 15:27:35 +01:00
Magne Sjaastad 3490d07dd1 Added IdenticalGridCaseGroup, now displayed in tree view
p4#: 20518
2013-02-14 14:30:01 +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 46cb61e859 Rename
p4#: 20515
2013-02-14 10:19:27 +01:00
Magne Sjaastad b1531c5454 Initial version of RigGridCollection
p4#: 20514
2013-02-14 10:08:56 +01:00
Magne Sjaastad f344466037 Always use smart pointers
p4#: 20513
2013-02-14 10:02:49 +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 f04b4b0258 Use data access objects for cell edge visualization
p4#: 20489
2013-02-13 10:27:33 +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 3377f0ef90 Update .gitignore 2013-02-12 11:49:38 +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 c77f1879eb Upped to new internal version after pushing changes to main branch
p4#: 20444
2013-02-11 14:42:47 +01:00
Magne Sjaastad a0a1b5f7c3 Upped to 0.9.2
p4#: 20443
2013-02-11 13:58:58 +01:00
Magne Sjaastad e343dc73b4 Added hide all dockwidgets, used before executing regression tests
p4#: 20442
2013-02-11 11:47:45 +01:00
Magne Sjaastad 942cccfdcb Search for Eclipse data in project file folder in addition to the given case folder.
This allows for copy of a folder containing a project file and related Eclipse data
p4#: 20437
2013-02-11 08:16:51 +01:00
Magne Sjaastad 6017e6db35 Build new well pipe geometry when radius is changed
p4#: 20431
2013-02-08 14:59:27 +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 defc91ba08 As display of wells is dependent on timestep, do not reset timestep when no results are present.
This fix was reverted unintentionally.
p4#: 20423
2013-02-07 15:49:36 +01:00
Magne Sjaastad f8059880b8 As display of wells is dependent on timestep, do not reset timestep when no results are present.
p4#: 20411
2013-02-07 12:28:34 +01:00
Magne Sjaastad 7a88cf899b More robust creation of data access object
p4#: 20410
2013-02-07 12:16:04 +01:00
Magne Sjaastad 5e38c909cf Early exit when data fails to load
p4#: 20405
2013-02-07 10:12:59 +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 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
Magne Sjaastad 4f44afdac1 Added command line parameter to save snapshots for all views. Closes down the application after writing images to file.
p4#: 20390
2013-02-06 13:23:46 +01:00
Magne Sjaastad 7648a63f02 Added functions used to create 2D images from 3D views
p4#: 20385
2013-02-06 11:43:26 +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
Magne Sjaastad 3e4b0520d4 Show matrix/fracture selection only for models with fracture results
p4#: 20376
2013-02-05 14:45:35 +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
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
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 578e3f7db3 Use data access object
p4#: 20336
2013-02-01 13:34:27 +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
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 f57ed233a1 ERT: Added NULL pointer check
p4#: 20292
2013-01-30 07:27:54 +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 4e0cb26a82 More robust handling of progress info when running from unit tests
p4#: 20257
2013-01-25 16:35:43 +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
Magne Sjaastad e9c3634c37 Include sources so the files show up in cmake generated project
p4#: 20219
2013-01-23 08:41:42 +01:00
Magne Sjaastad e74be2283d Do not exclude *.cmake
The file ResInsightVersion.cmake was not commited due to this ignore
2013-01-22 11:32:54 +01:00
Magne Sjaastad 56e61ea468 Integrated visualization modules to changelist 20202
p4#: 20204
2013-01-21 16:01:46 +01:00
Magne Sjaastad 6f257f7dba Updated to ERT version 67a38b6899f6935cb13b092105c90274f2b632f5
p4#: 20199
2013-01-18 15:27:32 +01:00
Magne Sjaastad 825be4e8d0 Removed file with norwegian characters
p4#: 20196
2013-01-18 09:15:46 +01:00
Magne Sjaastad bdfd9c543e Added missing files for ERT revision a39d4b4a9e597532b2dbf845751a70ffe1de3805
p4#: 20195
2013-01-18 09:00:23 +01:00
Magne Sjaastad 2cf0e32d4b Updated ERT to GIT version a39d4b4a9e597532b2dbf845751a70ffe1de3805
p4#: 20194
2013-01-18 08:53:37 +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 1be475306d Updated version to 0.9.0
p4#: 19312
2012-10-25 14:08:39 +02:00
Magne Sjaastad 3019bd9f9c Removed debug output
p4#: 19304
2012-10-25 07:39:42 +02: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 15044a4db4 Improved menu texts
p4#: 19299
2012-10-24 13:53:03 +02:00
Magne Sjaastad e5c3418c02 Allow reading of Eclipse Ascii without ACTNUM
p4#: 19298
2012-10-24 13:46:42 +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 54dc3a5d37 Style object must follow lifespan of RIViewer
p4#: 19288
2012-10-24 11:01:41 +02:00