OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,581 Commits 9 Branches 35 Tags 15 MiB
85a8ef5ead
Commit Graph

2581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
d14943515e Merge pull request #25 from atgeirr/nonuniform_fluid_tables 
Nonuniform fluid tables
 2012-09-05 02:42:59 -07:00
Atgeirr Flø Rasmussen
2653a695bf Massive whitespace cleanup: entire fluid subdir. 2012-09-05 11:28:54 +02:00
Xavier Raynaud
417cd2fd0e Merge remote-tracking branch 'upstream/master' 2012-09-05 10:11:02 +02:00
Xavier Raynaud
19c7f516b1 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud
8ddbefd1ee Add initial guess in root solver for gravity residual. 2012-09-04 15:13:55 +02:00
Xavier Raynaud
783c97ef99 Use same search interval in computation of flux and gravity residuals. 2012-09-04 15:01:14 +02:00
Xavier Raynaud
8c9ba88454 Removed unappropriate conversion from water saturation to complete saturation. 2012-09-04 14:22:56 +02:00
Xavier Raynaud
964f61a438 Use porevolume of last step in computation of gravity residual. 2012-09-04 14:21:51 +02:00
Bård Skaflestad
8b9ddc639c Merge remote-tracking branch 'upstream/master' 2012-09-04 13:58:43 +02:00
Bård Skaflestad
25451498a4 Merge pull request #24 from atgeirr/three_phase_fluid_work 
Three phase fluid work.
 2012-09-04 04:50:13 -07:00
Atgeirr Flø Rasmussen
064d408b20 Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	opm/core/fluid/BlackoilPropertiesFromDeck.cpp
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
 2012-09-04 13:34:30 +02:00
Atgeirr Flø Rasmussen
95fac1074b Constified some local variables. 2012-09-04 13:15:26 +02:00
Atgeirr Flø Rasmussen
3fa259496b Fix stride bug in WellReport::push(). Use convert::to(). 2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
d8bc458631 Minor cleanup. 2012-09-04 13:08:30 +02:00
Atgeirr Flø Rasmussen
72e13ffd0d Fix stride bug in SGAS/SWAT init. 2012-09-04 13:06:13 +02:00
Atgeirr Flø Rasmussen
e25512a646 Changed std::copy() statements to account for n != 1. 
However, there are more changes needed to make the program
support n != 1, this is just to reduce the surprise factor a little.
 2012-09-04 13:00:51 +02:00
Atgeirr Flø Rasmussen
846f2a534e Added proper Doxygen tags. 2012-09-04 12:52:17 +02:00
Atgeirr Flø Rasmussen
d0ade9c7ad Updated doc to match new parameter names. 
New parameters are (default):
    pvt_tab_size (200)
    sat_tab_size (200)
    threephase_model ("simple") [also accepts "stone2"].
 2012-09-04 11:49:05 +02:00
Atgeirr Flø Rasmussen
a07d894500 Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
 2012-09-04 11:42:31 +02:00
Xavier Raynaud
b53c983fc4 Fixed order of arguments in function call. 2012-09-04 11:39:17 +02:00
Atgeirr Flø Rasmussen
47b40c034e Fixed spontaneous grid structs, avoid variable-sized arrays. 2012-09-03 16:01:07 +02:00
Bård Skaflestad
f78973ad87 allocate_grid_from_file(): Name magic constant (6) 
The constant 6 is the number of array dimensions needed to successfully
allocate a grid.  While unlikely, this number may change in the future
and it is better to have a manifest constant (in this case, GRID_NMETA)
than a hard-coded number.
 2012-09-03 15:30:41 +02:00
Atgeirr Flø Rasmussen
7adeb9b84a Documented parameters. 2012-09-03 15:09:55 +02:00
Atgeirr Flø Rasmussen
3e294a4a81 Formatting fixes. 2012-09-03 15:07:03 +02:00
Xavier Raynaud
eca2b4aea5 Merge remote-tracking branch 'upstream/master' 2012-09-03 14:57:11 +02:00
Xavier Raynaud
5aeb24433d Added missing initialization of gravity in constructor. 2012-09-03 14:55:19 +02:00
Atgeirr Flø Rasmussen
b93bb4fcf9 Added copyright and license statement. 2012-09-03 14:37:28 +02:00
Atgeirr Flø Rasmussen
592b1cf743 Minor warning, formatting and comment fixes. 2012-09-03 14:31:02 +02:00
Atgeirr Flø Rasmussen
5dd3b2a673 Minor formatting fixes. 2012-09-03 14:17:36 +02:00
Atgeirr Flø Rasmussen
dff5716718 Documented new constructor. Fixed layout. 2012-09-03 14:16:54 +02:00
Atgeirr Flø Rasmussen
055f2d5f19 Whitespace cleanup and adding a check for #phases <= 3. 2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
e37f003cb5 Added more checks in 3-phase init code. 2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen
142f186b81 Merge remote-tracking branch 'hnil/master' 2012-09-03 13:40:33 +02:00
Bård Skaflestad
f1de088af9 Merge remote-tracking branch 'upstream/master' 2012-09-03 13:27:50 +02:00
Atgeirr Flø Rasmussen
154571c768 Merge branch 'master' into nonuniform_fluid_tables 2012-09-03 13:12:11 +02:00
Xavier Raynaud
eef234b59a Removed redundant header file include. 2012-09-03 12:55:10 +02:00
Atgeirr Flø Rasmussen
736dc2a238 Merge pull request #23 from xavierr/master 
Changes needed by polymer solver.
 2012-09-03 03:27:56 -07:00
Xavier Raynaud
87dc7affc5 Fixed comment. 2012-09-03 12:26:22 +02:00
Xavier Raynaud
596c988126 Improve documentation. 2012-09-03 11:29:48 +02:00
Halvor Møll Nilsen
ed2aa9da38 Introduced posibility to change number of sample points for pvt. 
Did change the PVTW calculation so derivatives are exact.
Extended the test functions for pvt and relperm
 2012-08-31 17:01:07 +02:00
Bård Skaflestad
3ef78dff64 Add debugging assertions to check input in several routines. 2012-08-29 15:15:55 +02:00
Bjørn Spjelkavik
4294431584 Defined private member function 'getNumericErtFields' in class 'EclipseGridParser' 
The function stores data from one file from keyword IMPORT.
The file in 'fortio' format is read by ERT-functions.
 2012-08-29 13:36:57 +02:00
Bjørn Spjelkavik
8694794aae Added private member function getNumericErtFields 2012-08-29 11:28:23 +02:00
Xavier Raynaud
4d800cad3d Added functionality to compute porosity for compressible fluid. 2012-08-29 10:54:21 +02:00
Halvor Møll Nilsen
7b1501cead Added new SatFuncSimple fluid. 
Introduced a simple fluid which has no problem with strange black oil behavior.
Intended for testing, but for now it is used in SaturationPropsFromDeck.
 2012-08-28 16:41:06 +02:00
Bård Skaflestad
5b9c835510 Add a simple test to demonstrate grid input. 
Should be extended to test that the input is sane, too.
 2012-08-28 16:05:44 +02:00
Bård Skaflestad
e870c7726e Add a utility for creating a grid from textual representation. 
There is little to no error checking, and the importer assumes that the
grid is serialised more or less directly from the grid structure.

Intended use: Testing on non-uniform grids created in MRST.
 2012-08-28 16:03:26 +02:00
Halvor Møll Nilsen
16f6d71a4e Changed cmake file from listing all files to glob. 
Due to structure of the code some files need to be removed. This is not optimal.
AGMG support is not integrated.
The CMakeFile make it easy to use opm-core in qtcreator.
 2012-08-28 14:31:54 +02:00
Halvor Møll Nilsen
48360d23a1 Added param initializer on fluids with param to addjust table length. 
Moved internal class SatFunc to SatFuncStone2.
 2012-08-28 14:27:14 +02:00
Xavier Raynaud
84c75c5045 Corrected comment. 2012-08-28 13:12:54 +02:00