OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,699 Commits 29 Branches 61 Tags 290 MiB
ca2558bf20
Commit Graph

32 Commits

Author SHA1 Message Date
Jacob Støren
3022a40204 Renamed globalCell to reservoirCell etc. 2014-08-14 10:56:25 +02:00
Jacob Støren
1be9f1996f Moved GeometryTools w tests to ReservoirDataModel 2013-12-12 22:18:06 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce 
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
 2013-10-31 14:57:52 +01:00
sigurdp
bcc33397a3 Adapted cmake files to new directory structure 2013-09-20 16:21:46 +02:00
Magne Sjaastad
71187d5bbc Unit test for interpolation 
p4#: 21496
 2013-04-30 13:08:04 +02:00
Magne Sjaastad
6ef5205343 Added interpolation of observed values to statistics computation 
p4#: 21492
 2013-04-30 11:36:50 +02:00
Jacob Støren
0fed66deb2 Moved the statistical calculation algorithm code into a separate file. 
Added unit test to these calculations, and fixed a calculation error.
p4#: 21140
 2013-04-05 10:49:39 +02:00
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
3cd92973af Missed one file in previous rename 
p4#: 21046
 2013-03-22 09:44:41 +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
d33a27a082 Fixed ref counts 
p4#: 20890
 2013-03-13 14:41:54 +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
452b08db3a Added progress info 
p4#: 20755
 2013-03-05 13:03:52 +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
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
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
a09dba2670 File rename from RigReservoir to RigEclipseCase 
p4#: 20503
 2013-02-13 13:33:35 +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
0bc3d9f205 More tests and moved more functions 
p4#: 20447
 2013-02-12 07:11:32 +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
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
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
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
Ivar Ursin Nikolaisen
047ca6d380 Add libpthread link to ReservoirDataModel_UnitTests 2012-08-27 15:28:35 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00