Commit Graph

222 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
3748e61b6e Changed behaviour of surfaceDensities(), now only returns densities of active components. 2012-01-05 11:40:29 +01:00
Atgeirr Flø Rasmussen
2899de390d Added class SaturationPropsFromDeck. 2012-01-05 11:17:52 +01:00
Atgeirr Flø Rasmussen
8f13a2d3c9 Added inline keyword for correct linkage. 2012-01-05 11:17:29 +01:00
Atgeirr Flø Rasmussen
c12d8c2e5d Moved active phase determination into own function. 2012-01-05 09:34:05 +01:00
Atgeirr Flø Rasmussen
265dfd0c2c Moved phase configuration state into PhaseUsage struct. 2012-01-05 09:28:57 +01:00
Atgeirr Flø Rasmussen
2b05b7b059 Disabling copying of BlackoilPvtProperties class. 2012-01-04 23:32:21 +01:00
Atgeirr Flø Rasmussen
6a0ad83c1f Added BlackoilPvtProperties class. 2012-01-04 23:28:54 +01:00
Atgeirr Flø Rasmussen
55dc2c667f Made all the SinglePvt* classes conform to new, more bare-bones interface. 2012-01-04 22:15:26 +01:00
Atgeirr Flø Rasmussen
2c5cf2c9e2 Copied and renamed basic building blocks for black oil pvt. 2012-01-04 15:44:53 +01:00
Atgeirr Flø Rasmussen
a3ba8c9afd Adding class BlackoilPropertiesFromDeck and test program. 2012-01-04 14:44:55 +01:00
Atgeirr Flø Rasmussen
380fdfae3b Adding virtual destructor. 2012-01-04 14:43:48 +01:00
Atgeirr Flø Rasmussen
90fbb97692 Initial version of suggested interface for fluid and rock properties. 2012-01-04 12:37:12 +01:00
Atgeirr Flø Rasmussen
0cce699a98 Stop using std::tr1::array<> since it is padded (alignment) on gcc 4.1 (CentOS 5.7). 2011-12-22 14:43:23 +01:00
Atgeirr Flø Rasmussen
e95d6a35df Blackoil fluid test programs now compile. 2011-12-22 12:59:42 +01:00
Atgeirr Flø Rasmussen
3aa4aeddc3 Merged in some black-oil fluid tests. 2011-12-22 10:40:14 +01:00
Atgeirr Flø Rasmussen
a04d13e967 Merged in UniformTableLinear.hpp and friends. 2011-12-21 13:22:57 +01:00
Atgeirr Flø Rasmussen
ca48cbe6a4 Work in progress on adapting to opm-core. 2011-12-21 13:22:26 +01:00
Atgeirr Flø Rasmussen
fcfbd0e2a2 Moved blackoil fluid classes to their proper place. 2011-12-21 13:09:12 +01:00
Atgeirr Flø Rasmussen
5e8b526824 Merged in blackoil fluid subsystem. 2011-12-21 13:06:23 +01:00
Bård Skaflestad
e7e5d94628 Compute perforation fluxes (no gravity adjustments).
Requires additional parameter 'pmobc' (phase mobilities per cell) in
public function cfs_tpfa_res_flux().
2011-12-20 02:13:50 +01:00
Atgeirr Flø Rasmussen
87989fd12b Merged. 2011-12-19 15:31:24 +01:00
Bård Skaflestad
99e5635af2 Impose outflow sign convention when assembling w->c contributions. 2011-12-19 14:09:27 +01:00
Bård Skaflestad
2b65e19c6f Only perform incompressible adjustment if there are no BHP wells. 2011-12-19 14:07:57 +01:00
Atgeirr Flø Rasmussen
8873ad5152 Imported items from dune-cornerpoint/dune/common. 2011-12-19 11:34:50 +01:00
Bård Skaflestad
e59110f5f4 Add field for specifying which surface volume fraction is injected. 2011-12-12 18:43:11 +01:00
Atgeirr Flø Rasmussen
3d499416cb Changed code to use new include path: <opm/core/...> 2011-12-12 11:28:09 +01:00
Atgeirr Flø Rasmussen
bb6f1de501 Moved code from opmcore/ to opm/core/ 2011-12-12 11:13:54 +01:00
Bård Skaflestad
f8a758054e Reference headers using canonical (installed) paths. 2011-12-08 16:18:33 +01:00
Bård Skaflestad
aff1ed1758 Incorporate OPMTransport into OPM core library directory structure. 2011-12-08 13:48:16 +01:00
Bård Skaflestad
556e8ec51d Import OPMTransport into OPM core libraries. 2011-12-08 13:35:54 +01:00
Bård Skaflestad
dfff0469a1 Move opmpressure/src into core library directory structure. 2011-12-08 12:52:57 +01:00
Bård Skaflestad
33444d6cdd Merge OPMPressure into OPM core library. Unmodified. 2011-12-08 12:25:56 +01:00
Bård Skaflestad
2ad508d58b Expand flux calculation interface to account for presence of wells. 2011-11-25 15:27:08 +01:00
Bård Skaflestad
a11c59f8dd Really remove all purported boundary condition handling. 2011-11-25 14:19:12 +01:00
Bård Skaflestad
b5ebb988da Don't pretend to support boundary conditions.
We don't.
2011-11-25 14:17:07 +01:00
Bård Skaflestad
634d168b3f Assemble well equation form contributions per completion.
We assemble one equation for each well, with the equation being
trivial for wells controlled by bottom-hole targets.  Moreover, at
present we only support BHP and RESV controls.  The infrastructure is
in place to support more general controls (i.e., surface rate
targets), but such wells are currently not part of the 'well.h'
module.
2011-11-25 14:02:15 +01:00
Bård Skaflestad
f45f6ea62c Prepare to assemble RESV control target. 2011-11-24 23:21:41 +01:00
Bård Skaflestad
1d4d16feab Assemble completion-to-cell contributions. Reestablish build. 2011-11-24 22:39:17 +01:00
Bård Skaflestad
fcbc068091 Check-point commit to mark half-way support for well assembly.
Does not build.
2011-11-24 18:57:38 +01:00
Bård Skaflestad
ffd1531f2e Implement csrmatrix_zero() in terms of vector_zero(). 2011-11-23 23:06:16 +01:00
Bård Skaflestad
4a158b89a9 Compute component fluxes across completions if the model includes wells.
This necessitates a public interface change whereby the caller is
required to pass the current well (bottom-hole) pressure values into
the assembler.
2011-11-23 19:25:47 +01:00
Bård Skaflestad
6ab5800483 Allocate backing store for well completion data.
Also, include well connections in system matrix.
2011-11-23 15:25:48 +01:00
Bård Skaflestad
a1df963169 Take initial steps towards including wells in assembly.
Specifically, accept (and currently ignore), a WellCompletions
structure into the constructor, and aggregate all driving forces
(source terms, boundary conditions and all well-related structures)
into an assembler-specific "force" structure.  Accept a pointer to
such a structure into the assemble() function.  Currently ignored
except for source terms.
2011-11-23 13:20:37 +01:00
Bård Skaflestad
9a9b47a49a Name the well_t and well_control_t structures. 2011-11-23 11:23:30 +01:00
Bård Skaflestad
51111176db Guard against 'bc' being NULL.
This is in preparation of introducing compressible boundary conditions
as represented by the 'compr_bc' module.
2011-10-25 19:34:32 +02:00
Bård Skaflestad
d1026c82d5 Don't use uninitialised variables. 2011-10-21 15:30:44 +02:00
Bård Skaflestad
afdb88678f Fix remaining bugs for incompressible flows driven by sources.
In particular:

  - Zero sufficient portion of the ->mat_row to hold all connections
    of a cell in addition to the accumulation term.

  - Don't write the residual into the accumulation term of the
    Jacobian matrix row.
2011-10-20 13:59:15 +02:00
Bård Skaflestad
9392b3700f Don't pretend that the time-step is always one. 2011-10-19 22:28:41 +02:00
Bård Skaflestad
98abee6a79 Account for flow-direction signs when accumulating fluxes. 2011-10-19 22:10:22 +02:00
Bård Skaflestad
fb1316802c Implement compressible (volume flux) source term assembly. 2011-10-19 20:09:51 +02:00