Commit Graph

3291 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
21771218b9 Ensures well rate initialization actually happens.
Do not use the well's comp_frac member, only rely on the control's distr
member for initialization. This forced a change to WellsManager's
initialization of the distr member.
2013-06-02 23:30:43 +02:00
Atgeirr Flø Rasmussen
9c890bc19a Bugfix in well rate init.
Do not always try to initialize, also initialize proper phase rates.
2013-06-02 22:19:43 +02:00
Atgeirr Flø Rasmussen
b3acdbb8de Refined well state initialization.
For SURFACE_RATE controlled wells, initialize wellRates() to match.
2013-06-02 21:58:30 +02:00
Atgeirr Flø Rasmussen
d42bccaa8e Unit conversion factor of RS is not 1 for FIELD units. 2013-05-30 14:37:48 +02:00
Atgeirr Flø Rasmussen
31dd4f707c Initialize rate-controlled well bhp with safety factor.
Safety factor is 1.01 (INJECTOR) or 0.99 (PRODUCER), similar to
mrst's ad-fi/utils/initWellSolLocal.m > initialize().
2013-05-30 11:03:08 +02:00
Atgeirr Flø Rasmussen
8f722702c6 Fix SatGwseg* to handle no-gas situation gracefully. 2013-05-29 00:30:50 +02:00
Atgeirr Flø Rasmussen
7bad081eb4 Merge remote-tracking branch 'totto82/newfluid2' into combined 2013-05-27 15:45:18 +02:00
Atgeirr Flø Rasmussen
af675fcc9d Created new initialization routine, using RS from deck. 2013-05-27 15:44:07 +02:00
Atgeirr Flø Rasmussen
3b69bef702 Added gasoilratio() to BlackoilState. 2013-05-27 12:53:06 +02:00
Tor Harald Sandve
01bb02f4cd Adds the new interface to SinglePvtLivGas 2013-05-27 11:14:39 +02:00
Atgeirr Flø Rasmussen
ddfbda7419 Added assert to guard against wrong usage. 2013-05-24 09:21:41 +02:00
Atgeirr Flø Rasmussen
897ec0e909 Fix bug in upwinding code.
Accidental usage of std::vector's operator< discovered.
2013-05-24 09:20:46 +02:00
totto82
1c904aa451 Add new fluid interface
- in progress
2013-05-22 12:57:18 +02:00
Atgeirr Flø Rasmussen
221bc7a468 Added wellRates() member. 2013-05-21 23:54:30 +02:00
Tor Harald Sandve
268a810eb3 Merge branch 'master' of git://github.com/OPM/opm-core 2013-05-16 12:11:02 +02:00
Bård Skaflestad
9401a482d6 Merge pull request #244 from atgeirr/add-phaseusage-to-interface
Add phaseUsage() to BlackoilPropertiesInterface
2013-05-16 02:21:11 -07:00
Atgeirr Flø Rasmussen
18a3c7fc91 Merge remote-tracking branch 'upstream/master' into add-phaseusage-to-interface 2013-05-15 10:10:18 +02:00
Bård Skaflestad
7add6048cc Merge pull request #240 from atgeirr/tof-improvements
Ensure (average of) tracers sum to one for DG1.
2013-05-14 02:28:21 -07:00
Atgeirr Flø Rasmussen
9f927ca6df Merge pull request #241 from bska/double-refpress
Always interpret 'ref_pressure' as a double
2013-05-14 01:40:13 -07:00
Bård Skaflestad
53b082af28 Always interpret 'ref_pressure' as a double
Otherwise, when specifying (e.g.)

   ref_pressure=1.0e-5

(1 Pascal in bars), the value gets reinterpreted as

   ref_pressure=1

which is one bar.
2013-05-14 10:19:12 +02:00
Tor Harald Sandve
80ec30c22f Merge branch 'master' of git://github.com/OPM/opm-core 2013-05-14 08:21:13 +02:00
Atgeirr Flø Rasmussen
6d1b47e419 Merge pull request #238 from rolk/238_dtd
Provide DTD schema to describe parameter file format
2013-05-13 07:21:38 -07:00
Atgeirr Flø Rasmussen
280bf30a26 Add phaseUsage() method to BlackoilPropertiesInterface.
Also implement method in derived classes.
2013-05-13 16:20:00 +02:00
Atgeirr Flø Rasmussen
238bd6b891 Ensure (average of) tracers sum to one for DG1. 2013-05-13 16:17:41 +02:00
Bård Skaflestad
7db46d507f Merge pull request #239 from rolk/239_stlcheck
Probe for library without using STL
2013-05-13 02:44:52 -07:00
Roland Kaufmann
229cf6d134 Probe for library without using STL
If dune-grid has been compiled with _GLIBCXX_DEBUG, linking the test
program will fail since probing doesn't get the flags that are specified
for the main project, and thus configuration halts. Instead, we use a
smaller test program which doesn't need proper STL linkage to compile
and link.
2013-05-13 11:28:37 +02:00
Roland Kaufmann
0fb4f14b28 Provide DTD schema to describe parameter file format
Notice that this definition specifies a superset of the actual format
as the ParameterGroup tag is context-dependent (which cannot be captured
by DTD schemata).
2013-05-13 10:50:22 +02:00
Atgeirr Flø Rasmussen
1d5e210822 Merge pull request #235 from joakim-hove/ert-master
Minor update to build opm-core with current ert master
2013-05-02 13:24:27 -07:00
Joakim Hove
1281d17b60 Changed writeECLDate() to write UNFORMATTED restart files. 2013-05-02 19:06:43 +02:00
Joakim Hove
a6e3bbd610 Updated calls to ecl_util_fmt_file() - result is by reference 2013-05-02 19:04:09 +02:00
Bård Skaflestad
0ed065586a Merge pull request #234 from atgeirr/tof-improvements
New and improved capabilities for time-of-flight and tracer partitioning computations.
2013-04-24 23:24:37 -07:00
Atgeirr Flø Rasmussen
61829dd238 Added limiter for tracer. 2013-04-24 11:27:04 +02:00
Atgeirr Flø Rasmussen
da5ea0ccae Add call to DG tracer computations if user requests.
Used to throw with an 'unimplemented' message.
2013-04-24 10:40:56 +02:00
Atgeirr Flø Rasmussen
1a84b4fe7d Add tracer computations (method solveTofTracer()).
Same interface as in class TofReorder.
2013-04-24 10:39:50 +02:00
Atgeirr Flø Rasmussen
3086d5d815 Update doc, only initialize tracerhead_by_cell_ if needed. 2013-04-24 10:36:52 +02:00
Atgeirr Flø Rasmussen
8552347080 Tracer computations are now fixed and robust.
- Handles noisy source terms.
 - Works with repeated solve calls (multi-cell block solves).
2013-04-23 15:35:47 +02:00
Atgeirr Flø Rasmussen
2fbf3bd7cb Implement solveMultiCell() with Gauss-Seidel. 2013-04-23 13:38:47 +02:00
Atgeirr Flø Rasmussen
fd4ac88334 Minor fix: do not read tracer heads unless compute_tracer is true. 2013-04-23 09:54:52 +02:00
Atgeirr Flø Rasmussen
8b6faffe00 Work in progress on tracers.
- Changed interface.
 - Read tracerheads (tracer start locations) from file in compute_tof_from_files.
 - Initialize tracerheads from wells in compute_tof.
2013-04-22 14:02:45 +02:00
Atgeirr Flø Rasmussen
a2125fee09 Fix typo and minimize formatting changes. 2013-04-22 11:29:59 +02:00
Atgeirr Flø Rasmussen
cf38c91f74 Removed experimental multi-cell solver code.
Since the Gauss-Seidel approach seems to be both simplest and
fastest, all parts dealing with assembling multicell systems
have been removed.
2013-04-22 11:22:23 +02:00
Atgeirr Flø Rasmussen
489c41d60d Optimize multi-cell solve and add new Gauss-Seidel variant. 2013-04-22 11:11:55 +02:00
Atgeirr Flø Rasmussen
7c172fe192 Make multidim upwind more forgiving of bad grids.
Now it will no longer trigger assertation failure when grids are not
edge-conformal (faulted cornerpoint grids processed by our code will
usually not be). Minor algorithm change to handle this.
2013-04-22 11:07:41 +02:00
Atgeirr Flø Rasmussen
3d3173d04f More refined and concise output of block info. 2013-04-17 13:18:22 +02:00
Atgeirr Flø Rasmussen
b7acc70ab7 Implement solveMultiCell() properly.
Interface change: solver now requires a linear solver (for the multi-cell blocks only).

Implementation uses new private method assembleSingleCell(), that is a modified copy
of solveSingleCell(). Should refactor.
2013-04-17 12:58:15 +02:00
Atgeirr Flø Rasmussen
88f4cd894d Bugfix: do not compute MDU terms for noflow faces. 2013-04-17 10:38:08 +02:00
Tor Harald Sandve
62246111db Merge branch 'release/2013.03' of git://github.com/OPM/opm-core 2013-04-17 10:33:29 +02:00
Roland Kaufmann
64e61739e1 Merge pull-request #232 from rolk/232_distrib 2013-04-16 14:13:11 +02:00
Roland Kaufmann
66b6dda219 Merge pull-request #232 from rolk/232_distrib 2013-04-16 14:07:50 +02:00
Roland Kaufmann
49606fc925 Corrected mismatched if-else-endif arguments 2013-04-16 14:02:00 +02:00