Bård Skaflestad
4c39a8a595
Add basic equilibration facility
...
This commit adds a simple facility for calculating initial phase
pressures assuming stationary conditions, a known reference pressure
in the oil zone as well as the depth and capillary pressures at the
water-oil and gas-oil contacts.
Function 'Opm::equil::phasePressures()' uses a simple ODE/IVP-based
approach, solved using the traditional RK4 method with constant step
sizes, to derive the required pressure values. Specifically, we
solve the ODE
dp/dz = rho(z,p) * g
with 'z' represening depth, 'p' being a phase pressure and 'rho' the
associate phase density. Finally, 'g' is the acceleration of
gravity. We assume that we can calculate phase densities, e.g.,
from table look-up. This assumption holds in the case of an ECLIPSE
input deck.
Using RK4 with constant step sizes is a limitation of this
implementation. This, basically, assumes that the phase densities
varies only smoothly with depth and pressure (at reservoir
conditions).
2014-01-21 17:54:46 +01:00
Kristian Flikka
691148122c
Merged from upstream/opm-parser-integrate
2014-01-21 13:05:59 +01:00
Tor Harald Sandve
0c6bf64a33
Phase pressure is used for surface volumes calculations
2014-01-10 16:07:02 +01:00
Tor Harald Sandve
9e2ec6e558
Initialization using the RV keyword
...
The initial Rv value is specified using the RV keyword in the Parser.
The Rv values are used in the computation of the initial surface
volumes.
2014-01-10 16:07:02 +01:00
Tor Harald Sandve
d5b47295e3
Added pvt functionality for wetgas
...
The pvt interface is extended to handle wet-gas systems:
1. rvSat is added as a function in the PVT interface
2. SinglePvtLiveGas computes the pvt values and its derivatives
3. The old rbub variable is changed to rsSat for clearity
4. The new interface is tested in test_blackoilfluid with data from
liveoil.DATA and wetgas.DATA
2014-01-10 16:07:02 +01:00
Kristian Flikka
2ffcb219bb
Changed phaseUsageFromDeck to use eclipseState
2014-01-10 13:43:02 +01:00
Joakim Hove
704382ac8c
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
...
Conflicts:
CMakeLists_files.cmake
2014-01-10 13:04:00 +01:00
Kristian Flikka
731fe7d3f4
Changed new WellsManager constructor to take in EclipseStateConstPtr instead of SchedulePtr
2014-01-08 16:10:55 +01:00
Joakim Hove
f00e3d5763
Comparing well names protects againts NULL.
2014-01-08 16:10:43 +01:00
Joakim Hove
d96b88742e
Removed commented out code.
2014-01-08 15:58:11 +01:00
Joakim Hove
ddf6a3c084
Removed access to internal variabel cpty.
2014-01-08 11:32:00 +01:00
Kristian Flikka
1f1c0ebcf3
New constructor for WellsManager that also takes the new parser as argument. New test comparing old and new
2014-01-07 16:10:45 +01:00
Kristian Flikka
41b7af408b
Merge from joakim/wellmanager
2014-01-07 16:09:35 +01:00
Joakim Hove
370f9f0458
Using && instead of &= in the functions comparing wells and well_controls.
2014-01-06 19:22:39 +01:00
Joakim Hove
9fa7362992
Removed explicit (struct WellControls *) cast to align with the rest of the code.
2014-01-06 19:09:36 +01:00
Joakim Hove
b22b3f9fe2
Moved struct WellControls to the implementation file well_controls.c.
2014-01-06 15:13:32 +01:00
Joakim Hove
c970363f5e
Implemented well_controls based on well_controls_get_xxx() functions.
2014-01-06 14:59:11 +01:00
Joakim Hove
8ef5b2b695
Implemented well_controls based on well_controls_get_xxx() functions.
2014-01-06 14:51:11 +01:00
Joakim Hove
027ffb3c5a
Implemented well_controls based on well_controls_get_xxx() functions.
2014-01-06 14:40:55 +01:00
Joakim Hove
8132954b85
Added functions to get type, target and distr of *current* control.
2014-01-06 14:40:03 +01:00
Joakim Hove
4db3a70e05
Implemented well_controls based on well_controls_iset_xxx() functions.
2014-01-06 14:19:09 +01:00
Joakim Hove
965c12a689
Implemented well_control based on well_controls_iset_xxx() functions.
2014-01-06 12:40:03 +01:00
Joakim Hove
2ee6331ac1
Implemented well_controls_add_new() with well_controls_iset_xxx() functions.
2014-01-06 12:24:32 +01:00
Joakim Hove
6098368d08
Added new function well_controls_iset_distr().
2014-01-06 12:22:15 +01:00
Joakim Hove
3d171bd961
Using new function well_controls_invert_current().
2014-01-06 12:08:29 +01:00
Joakim Hove
bf95c9f768
Added new functions to set target and type and invert value of current control.
2014-01-06 12:06:36 +01:00
Joakim Hove
8819f7f42c
Changes test_wells to use well_controls_get_xxx() functions.
2014-01-06 10:34:25 +01:00
Joakim Hove
efcb1103d1
Changed test_wellsmanager to use well_controls_get_xxx() functions.
2014-01-06 10:26:46 +01:00
Joakim Hove
d783028bcb
Using well_controls_get_num() and well_controls_get|set_current() in WellsManager
2014-01-06 10:12:11 +01:00
Joakim Hove
17b800796f
Temporarily added symbol HAVE_WELLCONTROLS before including well_controls.h - to get acces to the internal elements in struct WellControls.
2014-01-05 16:25:31 +01:00
Joakim Hove
3653404c41
Reimplemnted struct WellControls access to use the set/get functions in well_controls.c
2014-01-05 16:23:22 +01:00
Joakim Hove
aea54d073a
Added well_controls_get_xxx() and well_controls_set_xxx() functions. The well_controls_reserved() function is called from well_controls_add() and not explicitly.
2014-01-05 16:22:30 +01:00
Joakim Hove
fb8413960c
Removed #include <opm/core/well_controls.h> from wells.h and inserted explicit #include <opm/core/well_controls.h> where needed.
2014-01-05 15:03:30 +01:00
Joakim Hove
157d0870f2
Removed struct WellControlManagement and replaced with simple integer field cpty in the WellControls structure.
2014-01-05 14:54:56 +01:00
Joakim Hove
8acdf34653
Moved well_controls implementation to separate file well_controls.c.
2014-01-05 14:47:15 +01:00
Joakim Hove
0450e1bb77
Extracted everything related to well controls to separate header well_controls.h - to simplify introducing new parser.
2014-01-03 16:04:12 +01:00
Joakim Hove
ec71334d74
Added test calls to wells_equal() and well_controls_equal().
2014-01-03 16:01:15 +01:00
Joakim Hove
487ff810fd
Added test_wellmanager which loads wellmanager from deck and tests many values.
2014-01-03 16:00:57 +01:00
Kristian Flikka
e4a7a33598
Implementation (not finished) of wells_equal, well_controls_equal, and tests. To build a WellsManager test for old and new parser
...
Conflicts:
CMakeLists_files.cmake
2014-01-03 16:00:10 +01:00
Joakim Hove
42a4fa704e
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2013-12-08 18:38:38 +01:00
Bård Skaflestad
2a68bb0341
Add a facility for checking/assigning presence of free phases
...
This is intentionally black-oil specific because we presently do no
know how to handle other cases (e.g., more phases or number of phases
different from number of components).
2013-12-03 15:56:18 +01:00
Bård Skaflestad
8c8721064d
Include <limits> for std::numeric_limits<> template
2013-12-03 15:52:07 +01:00
Bård Skaflestad
c24cc87b26
Sort headers into logical groups.
...
This is an aesthetic-only change.
2013-12-03 15:43:06 +01:00
Tor Harald Sandve
c77d82a4ee
Change name to initBlackoilStateFromDeckUsingRS
...
The second input of initBlackoilStateFromDeck that computes surface
volumes based on gas/oil ratio is changed from
BlackoilPropertiesInterface to Props. To avoid duplication with the old
initBlackoilStateFromDeck its name is changed to
initBlackoilSurfvolUsingRS.
2013-11-28 15:56:17 +01:00
Tor Harald Sandve
c1b6d57d32
Compute initial saturations from surface volumes
...
Add new function is added that computes saturation from surface volumes
solving z = As for each cell. This function is used to compute an
intial guess to the saturations in initState_impl.hpp.
2013-11-28 15:56:17 +01:00
Joakim Hove
0c620fb72a
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2013-11-25 15:54:01 +01:00
Joakim Hove
1829acd201
Added very simple parser test to check a parser can be instantiated and a simple file parsed
2013-11-14 12:52:12 +01:00
Roland Kaufmann
1a1269d9d7
Extract common parts of blackoil and incomp. state
...
Put the identical parts of the simulator state into a base class that
they can be referenced from when adressing the common fields.
2013-11-13 13:48:28 +01:00
Kristian Flikka
3f970244de
Replaced include math.h with cmath, and changed from fabs to abs. Fixed an error in the testfile, a filename was wrong
2013-11-04 13:51:32 +01:00
Joakim Hove
5798b5f9f1
Added test with accompanying data for Blackoilstate::equals()
2013-10-28 17:43:29 +01:00
