Commit Graph
100 Commits
Author SHA1 Message Date
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
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
Magne Sjaastad 786e12cfd9 Show tool tip for checkbox labels
p4#: 19281
2012-10-24 09:14:56 +02:00
Magne Sjaastad 1d90bd680e Removed instrumentation code
p4#: 19267
2012-10-23 11:19:02 +02:00
Magne Sjaastad f833244b68 Added close on context menu for reservoir case
p4#: 19266
2012-10-23 11:12:47 +02:00
Magne Sjaastad f4a328b4cb Fixed memory leak
p4#: 19265
2012-10-23 10:42:46 +02:00
Magne Sjaastad ac26fd8e0c Moved menu item New Property View to View menu
p4#: 19262
2012-10-23 08:34:06 +02:00
Magne Sjaastad 618fdb1377 Debug info box in 3D view set to default off
p4#: 19261
2012-10-23 08:27:49 +02:00
Magne Sjaastad 0946849a79 Added more instrumentation to socket
p4#: 19224
2012-10-19 10:05:55 +02:00
Magne Sjaastad 8957a92830 Disable rendering of overlay items in software rendering (no shaders supported reported by OpenGL context)
p4#: 19222
2012-10-19 08:35:04 +02:00
Magne Sjaastad 32944e660c Upped to 0.8.8
p4#: 19186
2012-10-16 10:40:41 +02:00
Magne Sjaastad a8b5d9cee2 Updated ERT to SVN 4117 for Linux 64
p4#: 19185
2012-10-16 09:12:03 +02:00
Magne Sjaastad 427a7cb8c5 Updated ERT to SVN 4117 for Windows 32/64
p4#: 19184
2012-10-16 08:40:44 +02:00
Magne Sjaastad 7fb59205c8 Introduced Octave socket reading state to fix communication issues between Octave and ResInsight
p4#: 19181
2012-10-15 15:13:41 +02:00
Magne Sjaastad 346db45afc Added default Z scale factor and default gridlines on/off when creating a new view
p4#: 19177
2012-10-12 15:05:42 +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 b4ae324d9b Added script folder to Octave function search path. This makes it possible to recursively call other functions from an Octave script.
p4#: 19164
2012-10-12 12:08:38 +02:00
Magne Sjaastad fc5dda4957 Use static_cast
p4#: 19154
2012-10-12 10:14:45 +02:00
Magne Sjaastad 0df00dc2fa Removed stop button from animation toolbar
p4#: 19121
2012-10-11 07:10:53 +02:00
Magne Sjaastad 5f9de8644e Use slider for property filter range
p4#: 19096
2012-10-09 16:19:49 +02:00
Magne Sjaastad a4ff9bd41c Added slider editor for double values
p4#: 19089
2012-10-09 11:26:50 +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 03ede069c1 Avoid initializing progress bar if called from unit test framework
p4#: 19042
2012-10-05 15:58:06 +02:00
Magne Sjaastad f144134701 Use simplified compile of Octave plugins on non-Windows
p4#: 19012
2012-10-04 12:28:31 +02:00
Magne Sjaastad 1622df540b When compiling 64-bit Windows, establish 32-bit Visual Studio 2010 environment and compile Octave plugin using this environment.
p4#: 19011
2012-10-04 12:12:58 +02:00
Magne Sjaastad 2e9f842072 Use CMAKE to change working directory to Octave binary directory before compiling Octave plugins. This way dependent libraries are found without manipulating path.
p4#: 19006
2012-10-03 14:53:51 +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
Magne Sjaastad 082560b2a5 Updated README 2012-10-02 10:04:42 +02:00
Magne Sjaastad c4e5d9e842 Do not include Octave plugin for Windows 64-bit, as no precompiled Octave 64-bit is available.
p4#: 18838
2012-09-20 15:15:43 +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 01ee943155 Improved integer slider editor
Use sliders for cell range filter
2012-09-14 15:48:49 +02:00