OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 07:03:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,066 Commits 27 Branches 60 Tags 289 MiB
d20c0fc004
Commit Graph

8462 Commits

Author SHA1 Message Date
Jacob Støren
cdd5997f76 Updated regressiontest help text 
p4#: 20435
 2013-02-08 17:15:29 +01:00
Jacob Støren
9b00d3ce9f Linnux compile fixes 
p4#: 20434
 2013-02-08 17:08:37 +01:00
Jacob Støren
0c437a0121 Added a regression test system to ResInsight. 
Based on image comparison. Command line invocation.
p4#: 20433
 2013-02-08 17:04:35 +01:00
Jacob Støren
baeba974bf Fixed compiler warning 
p4#: 20432
 2013-02-08 16:57:54 +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
Jacob Støren
09544f082b Guard against missing well results 
When project file has settings for wells but there are no well results
p4#: 20416
 2013-02-07 13:44:18 +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
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
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
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
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
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
87a120dc39 Static results: Fixed crash when going to timestep > 0 
p4#: 20356
 2013-02-04 13:45:46 +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
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
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
Jacob Støren
32b5af2033 Added code to output cell corner coordinates when picking. Disabled by default. 
p4#: 20305
 2013-01-30 14:51:31 +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
f5da271c17 Fix of missing well data from separate restart files. 
p4#: 20234
 2013-01-24 10:41:09 +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
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
Jacob Støren
80b34bd7f8 Startup script now adjusted to start Resinsight with the users cwd as default file open path 
p4#: 19320
 2012-10-26 14:03:57 +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
Jacob Støren
2b85dbd264 Well visibility is now independent of the surface and mesh visibility, and will be visible even if both mesh and surface are turned off. 
p4#: 19292
 2012-10-24 12:54:57 +02:00
Jacob Støren
6a4f15368c Mesh/Surface style is now made independent so it is possible to show the mesh lines without the surface geometry. 
A new mesh style "Faults only" is also added making it possible to show the mesh lines on the faults only
p4#: 19289
 2012-10-24 11:23:40 +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
CeetronResInsight
6792ce1f4a Removed wrong assert causing arbitrary crashes 
p4#: 19286
 2012-10-24 10:31:46 +02:00
CeetronResInsight
59afd98167 Added missing initialization 
p4#: 19276
 2012-10-23 13:36:48 +02:00
Jacob Støren
a1feaa1acf Put the statistical parameters into a table in the 3D info text 
p4#: 19269
 2012-10-23 12:40:55 +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
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
Jacob Støren
875d7b7d12 Resinsight: Made Home path the default path for file dialog browsing, and added remembering of the last opened path. 
Added -startdir command line argument to override the default file browse path
p4#: 19263
 2012-10-23 09:59:57 +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
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
5f9de8644e Use slider for property filter range 
p4#: 19096
 2012-10-09 16:19:49 +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
Jacob Støren
7c63cccc8d ResInsight: Linux compile fixes 
p4#: 18783
 2012-09-18 15:34:50 +02:00
Magne Sjaastad
01ee943155 Improved integer slider editor 
Use sliders for cell range filter
 2012-09-14 15:48:49 +02:00
Magne Sjaastad
03fc06e6a4 Changed keyword name as an Xml attribute is not allowed to start with a digit 2012-09-13 15:17:59 +02:00
Magne Sjaastad
18a5501601 Get Qt DLLs from bin instead of lib. Do not include Linux shell script for Windows packaging. 2012-09-13 13:14:07 +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
ad95533d2f Change 18604 on 2012/09/11 by magne@magne_at_MAGNE 
Added check for NULL pointer
 2012-09-11 10:16: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
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
282e6b9115 Minor typo 2012-09-09 12:11:38 +02:00
Joakim Hove
d8a5f2cf7e Updated FileInterface_UnitTests/CMakeLists.txt to support ERT in arbitrary locations 2012-09-09 12:09:50 +02:00
Joakim Hove
ada6d0b488 Have added CMAKE configuration options for where the ERT distribution is located. 2012-09-09 11:25:59 +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
047ca6d380 Add libpthread link to ReservoirDataModel_UnitTests 2012-08-27 15:28:35 +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
Ivar Ursin Nikolaisen
b0c60f0e4a Fix libQtCore link failure because of missing libz 
libQtCore often, but not always includes the required functionality from
libz. This is needed for example on openSUSE 12.1 and 12.2.
 2012-08-27 13:34:00 +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