Commit Graph

254 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
99df6acb8d Remove deprecated SimDataContainer pointer 2016-11-10 11:01:27 +01:00
Joakim Hove
ac4640effe Check that completion corresponds to active cell. 2016-11-04 15:24:59 +01:00
Joakim Hove
cd2ee0e897 Merge pull request #127 from joakim-hove/crate-inactive-index
Check if cell is active while building RegionCache
2016-11-02 14:06:33 +01:00
Joakim Hove
ec4d320959 Merge pull request #128 from jokva/fgmwin-fgmwpr
{F,G}MW{IN,PR} support and minor internal renaming
2016-11-02 14:06:05 +01:00
Jørgen Kvalsvik
8a907be17b Replace function aliases with names for parameters
Several functions were aliased to hide the fact that they shared the
same templated function, but with different specialisations. By
introducing aliases for producer and injector some readability is gained
and some (clumsy) aliases are removed, in favour of passing the
interesting aspect along with the general base name.
2016-11-02 12:35:11 +01:00
Jørgen Kvalsvik
c167dc4e62 {F,G}MW{IN,PR} support
Add support for the FMWIN, FMWPR, GMWIN and GMWPR keywords.
2016-11-02 12:18:39 +01:00
Joakim Hove
000c9b5479 Merge pull request #125 from jokva/phase-in-runspec
Read phase information from EclipseState.runspec
2016-11-02 11:52:19 +01:00
Joakim Hove
c4f064f791 Check if cell is active while building RegionCache 2016-11-02 11:49:32 +01:00
Joakim Hove
2032592d17 Fixup for completion rate units for inactive cell. 2016-11-02 09:59:09 +01:00
Jørgen Kvalsvik
e06d591dd3 Read phase information from EclipseState.runspec 2016-11-01 11:19:59 +01:00
Joakim Hove
8656268f3c Pass NUM == 1 in when determining units. 2016-11-01 10:19:00 +01:00
Jørgen Kvalsvik
77d1c4464d Return zero when simulator does not provide FIP 2016-10-31 14:08:59 +01:00
Jørgen Kvalsvik
f2c895c701 Return zero for non-existing well/completion
To be consistent with the general summary behaviour and more input
tolerant, 0.0 is returned when some phase, completion or well is
requested that isn't provided by the simulator.

Solves the issue discussed in https://github.com/OPM/opm-output/pull/122
and extends the test input deck to trigger this behaviour.
2016-10-31 11:49:56 +01:00
Jørgen Kvalsvik
b338943962 FOIP+FGIP support 2016-10-28 15:45:22 +02:00
Jørgen Kvalsvik
06b2eb2cd3 Look up correct fluid-in-place keyword 2016-10-28 14:23:36 +02:00
Jørgen Kvalsvik
84b18faf49 RGIP support 2016-10-28 12:48:12 +02:00
Jørgen Kvalsvik
9181a260e8 GWCTH support 2016-10-28 12:19:07 +02:00
Jørgen Kvalsvik
cc73c9d95f GGORH support 2016-10-28 12:18:55 +02:00
Joakim Hove
1b3fd64924 Support for region production. 2016-10-28 11:36:31 +02:00
Joakim Hove
2def85a70c Fixed bug in summary output of completion rates. 2016-10-26 19:50:17 +02:00
Joakim Hove
08d89858af Extended data::Wells to inherit from std::map. 2016-10-26 19:50:17 +02:00
Joakim Hove
776094aa2c Added ROIP / ROIPL / ROIPG summary keywords. 2016-10-26 19:50:17 +02:00
Joakim Hove
64f5c9d13e Added completion list to RegionCache. 2016-10-26 19:50:17 +02:00
Joakim Hove
a8d82221a8 Added small class RegionCache. 2016-10-26 19:50:17 +02:00
Anders Matheson
2f411b208e Add phases to summary_deck.DATA 2016-10-26 15:33:36 +02:00
Joakim Hove
045cd37a44 RFT writer will check for SGAS. 2016-10-26 10:56:14 +02:00
Atgeirr Flø Rasmussen
8eef0c98a6 Remove unnecessary shadowing aliases.
Warning-generating aliases like:
    const auto& es = this->es;
were removed. The rest of the code would not need any change since
then 'es' would refer directly to the data member, but in keeping with
the usual ways in this module I changed them to explicitly reference
'this->es', thereby restoring the visual clue that the member is used.
2016-10-25 14:20:49 +02:00
Atgeirr Flø Rasmussen
72c09a80b9 Silence some false-positive warnings. 2016-10-25 14:20:49 +02:00
Atgeirr Flø Rasmussen
8eb2a84983 Merge pull request #116 from jokva/exchange-completions-as-vector
data::Well::Completion is vector, not map
2016-10-25 13:58:42 +02:00
Jørgen Kvalsvik
30ef5a6099 data::Well::Completion is vector, not map
The data exchanged in data::Well::Completions is now a vector, more
closely matching the disk format and the order exposed by the simulator.
Zero'd wells and complations are still written for shut wells, or wells
the simulator does not provide any information for; however, all
non-closed wells (according to the schedule) will be restored. The
completions are written and restored in the same order as CompletionSet
from parser.
2016-10-24 16:52:26 +02:00
Joakim Hove
2cb15a3023 Will printf the number of keywords when error. 2016-10-23 23:22:52 +02:00
Jørgen Kvalsvik
ac9ed4ec5c OPM_IWEL Restart support 2016-10-21 12:50:17 +02:00
Jørgen Kvalsvik
b43461cb49 Prefer named data members over vectors in OPM_XWEL
Change the structure used to populate OPM_XWEL to use a plain map of
data::Wells objects rather than dumping a series of vectors to
data::Wells. Tests are added for serialising and restoring wells.
2016-10-21 12:50:17 +02:00
Jørgen Kvalsvik
38f9103e43 Widen rates bitmask to 32 bits. 2016-10-21 12:13:20 +02:00
Joakim Hove
0cb12fff56 Merge pull request #112 from joakim-hove/solution-default-arg
Using constructor in default argument creation.
2016-10-20 19:38:18 +02:00
Joakim Hove
9336045966 Using constructor in default argument creation. 2016-10-20 18:20:50 +02:00
Jørgen Kvalsvik
9f41044447 Remove CornerpointChopper.hpp 2016-10-19 13:44:33 +02:00
Jørgen Kvalsvik
c07fe44d5e Update to shared_ptr-less parser interface. 2016-10-19 13:44:33 +02:00
Atgeirr Flø Rasmussen
a8639b8822 Merge pull request #105 from andlaus/opm-parser_units
adapt to the rename of the unit system header in opm-parser
2016-10-18 15:25:32 +02:00
Jørgen Kvalsvik
8ac5dc553f Implement Solution via std::map 2016-10-17 07:06:23 +02:00
Joakim Hove
79e7ce643d Using data::Solution for simulator <-> output.
Will use one common container for both the solution data required for the
restart, e.g. PRESSURE and SWAT and also the auxillary data like KRG and
FIP which is intended as extra information in the restart file, or
alternatively the summary file.
2016-10-17 07:04:06 +02:00
Joakim Hove
79a03c26d0 Using CelldataConatiner in opm-output. 2016-10-17 07:01:51 +02:00
Joakim Hove
c60f21af84 New class for simulator -> output data exchange. 2016-10-17 06:59:00 +02:00
Andreas Lauser
117af55887 adapt to the rename of the unit system header in opm-parser 2016-10-10 17:27:18 +02:00
Joakim Hove
eb929077a2 Moved Cells.hpp and Wells.hpp opm/output/data/ 2016-10-06 16:29:20 +02:00
Jørgen Kvalsvik
f94ecc09a3 Schedule::getGroup returns reference, not pointer 2016-10-05 14:52:25 +02:00
Joakim Hove
2cf038e3b7 Merge pull request #94 from totto82/output_solvent
Output SSOL to restart file if present
2016-09-29 12:43:27 +02:00
Tor Harald Sandve
f3b9c88a53 Add support for output of solvent in summary file
The following keywords are implemented
[F,G,W,C]N[P,I][R,T]
FNPR, WNIR etc.
2016-09-28 15:03:15 +02:00
babrodtk
9ad8fcae19 Ignore non-restart variables when writing restart 2016-09-28 09:11:48 +02:00
babrodtk
231613c32a Added boolean flag for writing cell data to restart files 2016-09-28 09:11:48 +02:00