Commit Graph

2652 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
075df5bb1b Support shut wells in compressible tpfa solver. 2012-09-20 14:34:33 +02:00
Atgeirr Flø Rasmussen
8fdebccef6 Improve diagnostic output if crossflow is detected. 2012-09-20 14:33:57 +02:00
Roland Kaufmann
2e75b74909 Remove instructions for building DUNE from source
A large portion of the instructions was for building DUNE from source
without providing any real benefit for someone starting with OPM
development.

Instead provide a link to a repository where backports of the necessary
packages can be downloaded. This will hopefully enable beginners to get
up to speed faster.
2012-09-20 14:02:13 +02:00
Bård Skaflestad
b3265b0f0d Merge remote-tracking branch 'upstream/master' 2012-09-19 15:32:43 +02:00
Atgeirr Flø Rasmussen
9153c7f87b Merge branch 'master' into ert 2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
e00f208608 Merge remote-tracking branch 'upstream/master' 2012-09-14 20:56:30 +02:00
Atgeirr Flø Rasmussen
4110e40b62 Typo fix. 2012-09-14 20:56:08 +02:00
Bård Skaflestad
9571b30556 Merge pull request #28 from atgeirr/master
Change well property calculation + minor changes
2012-09-14 08:35:18 -07:00
Atgeirr Flø Rasmussen
a6fccb6790 Made initialization from SWAT/SGAS etc. more robust and general. 2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen
b90b803b80 Changed well initialization and property calculation.
Bhp is now initialized to bhp target for bhp-controlled wells.
Mobilities and pvt properties are now calculated from
well perforation pressure and injection specifications for
injectors, producers still use cell properties as before.
2012-09-14 09:53:11 +02:00
Atgeirr Flø Rasmussen
75382c7f9e Fix error message. 2012-09-14 09:52:13 +02:00
Atgeirr Flø Rasmussen
373f628095 Add output of surface volume. 2012-09-14 09:51:28 +02:00
Bård Skaflestad
ba8eab5ba4 Merge remote-tracking branch 'upstream/master' 2012-09-05 19:48:21 +02:00
Atgeirr Flø Rasmussen
d58314f624 Merge branch 'master' into reorder_tof 2012-09-05 14:21:47 +02:00
Atgeirr Flø Rasmussen
fa27792c45 Merge pull request #27 from xavierr/master
Fixes in compressible transport solver.
2012-09-05 05:19:42 -07:00
Xavier Raynaud
132880570b Fixed documentation. 2012-09-05 14:07:51 +02:00
Atgeirr Flø Rasmussen
00bbfa06a8 Merge branch 'master' into ert
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
2012-09-05 13:36:19 +02:00
Xavier Raynaud
e1fbe4430d Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Xavier Raynaud
04726d677d Fixed source term (measured at reservoir conditions). 2012-09-05 13:34:25 +02:00
Atgeirr Flø Rasmussen
e942b10be3 Merge branch 'master' into reorder_tof 2012-09-05 12:32:38 +02:00
Bård Skaflestad
c5cae3268d Merge remote-tracking branch 'upstream/master' 2012-09-05 11:46:54 +02:00
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