Commit Graph

633 Commits

Author SHA1 Message Date
Joakim Hove
0138fc43ef Merged upstream/master 2014-01-29 15:25:21 +01:00
Bård Skaflestad
f159aeaa7c Merge pull request #78 from atgeirr/seg-well-model
Segmented well model
2014-01-27 06:19:18 -08:00
Atgeirr Flø Rasmussen
d5ebe3c685 Use correct number of items in initialiser. 2014-01-27 10:42:35 +01:00
Atgeirr Flø Rasmussen
38a48dd149 Fix indexing error in if-test. 2014-01-27 10:42:17 +01:00
Atgeirr Flø Rasmussen
924080d8dc Proper memorymanagement in test program. 2014-01-27 08:32:24 +01:00
Atgeirr Flø Rasmussen
f9ea03fe67 Renamed SegmentedWellModel->WellDensitySegmented. 2014-01-24 15:54:01 +01:00
Atgeirr Flø Rasmussen
2f7697e00d Merge branch 'master' into seg-well-model 2014-01-24 15:48:49 +01:00
Atgeirr Flø Rasmussen
27e616e668 Merge pull request #77 from blattms/fix-debian-eigen
[cmake,bugfix] Corrects required version and make Eigen3 download work.
2014-01-24 06:29:45 -08:00
Atgeirr Flø Rasmussen
b9e392934f Merge pull request #74 from totto82/wetgas
Implemention of live gas
2014-01-24 06:25:47 -08:00
Tor Harald Sandve
cdd312fa55 Comment out unused code
Part of the code that is no longer in use is commented out.
2014-01-24 13:35:04 +01:00
Tor Harald Sandve
825c9be0db Fixed white spaces 2014-01-24 13:27:32 +01:00
Tor Harald Sandve
19f0a81db1 Fixed from bitwise to logical operator
The && is used instead of &
2014-01-24 13:15:29 +01:00
Tor Harald Sandve
b2ac4c7aac Fixed missing documentation 2014-01-24 13:14:08 +01:00
Atgeirr Flø Rasmussen
5d386f2a49 Bugfixes in treatment of perforation depths and final accumulation. 2014-01-23 12:42:57 +01:00
Atgeirr Flø Rasmussen
a4b2044e14 Modified test case to match MRST test case. 2014-01-23 12:42:17 +01:00
Atgeirr Flø Rasmussen
98371f660f Fix mixture calculation for volatile oil case. 2014-01-23 12:40:54 +01:00
Atgeirr Flø Rasmussen
ac6209640b Documented interface for SegmentedWellModel. 2014-01-22 13:55:22 +01:00
Atgeirr Flø Rasmussen
aa5d9d255b Added a test program for SegmentedWellModel.
The only currently tested case is a simple water injector.
2014-01-22 12:56:08 +01:00
Atgeirr Flø Rasmussen
ad81cc6a37 Initial version of segmented well model.
This computes pressure differences with respect to the bottom-hole pressure
for each well perforation, based on the well flows. It is explicit and not
implicit, using the previous time step's flow rates to calculate the necessary
densities.
2014-01-22 12:53:05 +01:00
Markus Blatt
35f0f5f5be [cmake,bugfix] Corrects required version and make Eigen3 download work.
At least on Debian requiring version 3.1 of Eigen3 is not sufficient
according to issue #25 the minimum version is 3.1.2. This patch fixes
the required version. In addition it skips the REQUIRED option passed
to find_package(Eigen3) to make the git download work.

Fixes #25.
2014-01-15 13:15:13 +01:00
Joakim Hove
37314fd284 Merge pull request #75 from flikka/update-parser-dep
parse function in libParser renamed, fixed in sim_fibo_ad
2014-01-13 01:38:10 -08:00
Kristian Flikka
b05630c310 parse function in libParser renamed, fixed in sim_fibo_ad 2014-01-13 08:43:39 +01:00
Tor Harald Sandve
ed02b4a91f Implementation of live gas
The simulator now handles live gas as well as live oil.
The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid
condition
State 1 Gas only (Undersaturated gas): Po, Sw and Rv
State 2 Gas and oil: Po, Sw and Sg
State 3 Oil only (Undersaturated oil): Po, Sw and Rs

This commit includes:
1. New interfaces for the vapor oil/gas ratios (Rv)
2. Modifications in the equations to handle rvs
3. New definition of ADI variable to handle changing primary variables
4. Modifications in the solution updates to handle changing primary
variable
5. Some changes in the appleyard process to sync with Mrsts livegas
implementation.

NOTE:
The implementation is tested on the liveoil cases SPE1 and a simplified
SPE9 and produces the same results as the old code.
The simulator is not yet able to converge on SPE3 with livegas present.
For SPE3 to converge a more robust well implementation is needed. The
current simulator reproduce the results of Mrst when a similar well
model is used in Mrst as is currently implemented OPM.
2014-01-10 16:07:32 +01:00
Tor Harald Sandve
3c5b0b9e73 Add interface for wet gas
The pvt interface is extened to handle wet gas
1. A function for rvSat is added to the interface
2. An interface that takes rv and the fluid condition as an input for
the gas properties is added. The old interface without rv and the fluid
condition is kept in the file.
3. The new interface is implemented in BlackoilPropsAd and
BlackoilPropsAdFromDeck.

A simulator that tests wet gas is not yet implemented.
2014-01-10 16:07:32 +01:00
Joakim Hove
ed23e017f9 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-10 13:05:20 +01:00
Bård Skaflestad
69b74fb580 Merge pull request #73 from joakim-hove/use_well_controls_api
Use well controls api
2014-01-09 03:44:20 -08:00
Joakim Hove
bd1417b164 Changed to use well_controls_get_current_distr(). 2014-01-09 12:09:19 +01:00
Joakim Hove
427f55940e Changed direct access to struct WellControls to use well_controls_get_xxx() api. NB: Do check the calls to well_control_iget_distr(). 2014-01-09 09:39:16 +01:00
Joakim Hove
37274035bc Changed direct access to struct WellControls to rather use well_controls_get_xxx() api. 2014-01-09 09:39:08 +01:00
Joakim Hove
4e65151271 Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate 2013-12-17 11:59:47 +01:00
Joakim Hove
691691b280 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-08 18:41:06 +01:00
Atgeirr Flø Rasmussen
671122e2e6 Merge pull request #65 from andlaus/implement_pc
include capillary pressure in the PDEs
2013-12-06 02:26:10 -08:00
Andreas Lauser
58afaa5069 fix the rebase fallout 2013-12-06 10:33:58 +01:00
Andreas Lauser
6f2fd5ae69 use the reference pressure to calculate the transmiscibility factors 2013-12-06 10:19:08 +01:00
Andreas Lauser
977395fccd include capillary pressure in the PDEs
I'm neither sure that this is fully correct nor that I found all
occurences (so far, the output writing code is missing in this patch),
but it seems to work for SPE1...
2013-12-06 10:17:58 +01:00
Joakim Hove
accd3e637d Merge pull request #71 from flikka/opm-parser-integrate
Fixed sim_fibo_ad, by adding EclipseWriter
2013-12-05 04:40:56 -08:00
Kristian Flikka
dba421316a Fixed sim_fibo_ad, by adding EclipseWriter 2013-12-05 13:38:40 +01:00
Atgeirr Flø Rasmussen
96454a8496 Merge pull request #70 from andlaus/improve_doc
make the phase-presence docstring understandable for mere mortals
2013-12-04 03:47:25 -08:00
Andreas Lauser
65d86c4dec make the phase-presence docstring understandable for mere mortals 2013-12-04 12:35:21 +01:00
Atgeirr Flø Rasmussen
32c2bb43f4 Merge pull request #69 from bska/match-reference/properties
Switch PVT Evaluators to Use Explicit External Condition Interface
2013-12-04 00:51:06 -08:00
Bård Skaflestad
cb483e92cc Switch condition interface to phase presence facility
Commit 4aa0eaf introduced density and viscosity evaluators into the
BlackoilPropsAdInterface that accepted an externally assignable
condition to distinguish saturated from unsaturated cases.  As a
result of a few low-level technical problems with that approach,
this commit changes those affected interfaces to use the black-oil
specific 'PhasePresence' facility of opm-core's commit a033329.

Update callers accordingly.
2013-12-03 18:12:54 +01:00
Bård Skaflestad
fc25415066 Merge branch 'mrst' of github.com:totto82/opm-autodiff into match-reference/properties 2013-12-02 17:00:15 +01:00
Joakim Hove
ba138afc2a Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-02 15:03:24 +01:00
Bård Skaflestad
ac74cf40bb Merge pull request #52 from andlaus/write_binary_ecl
write out the reservoir state to the eclipse binary format
2013-12-02 05:55:16 -08:00
Tor Harald Sandve
4aa0eaff67 Whether the fluid is saturated or not is explicitly passed to the pvts
The criteria for whether the fluid is saturated or not is moved from the
within the pvt calculations to the solver, and passed to the pvt
calculations as a array of boolean values.
2013-11-28 15:57:00 +01:00
Andreas Lauser
2cf32b6f4f Use EclipseWriter from opm-core
Note: The interface here requires opm/opm-core#424.
2013-11-27 15:45:45 +01:00
Joakim Hove
44e02ead25 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-11-27 14:07:36 +01:00
Joakim Hove
3eca4014a6 Merge pull request #66 from flikka/integration-tests-parser-dep
Integration tests , with a small usage of the new Schedule class
2013-11-27 04:55:05 -08:00
Kristian Flikka
35ce8d2932 Removed some debug code 2013-11-27 13:32:12 +01:00
Kristian Flikka
31b03a2572 Added new parser classes, simple step 1, loop through TSTEPS in Schedule 2013-11-27 13:32:12 +01:00