Commit Graph

46 Commits

Author SHA1 Message Date
Joakim Hove
ac4640effe Check that completion corresponds to active cell. 2016-11-04 15:24:59 +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
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
Atgeirr Flø Rasmussen
72c09a80b9 Silence some false-positive warnings. 2016-10-25 14:20:49 +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
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
c07fe44d5e Update to shared_ptr-less parser interface. 2016-10-19 13:44:33 +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
eb929077a2 Moved Cells.hpp and Wells.hpp opm/output/data/ 2016-10-06 16:29:20 +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
Joakim Hove
204ca5932b Outputwriter: use EclipseGrid
- The outputwriter will now take a a separate EclipseGrid instance as
  input argument, it is assumed that calling scope has already made sure
  ACTNUM and ZCORN are correct.

- All active/inactive cell mappings are based on the grid argument, the
  naked int* with global / active cell mappings has been completely
  removed.
2016-09-08 08:38:39 +02:00
Joakim Hove
33ae96f2af Summary will output region pressure: RPR 2016-08-26 12:50:40 +02:00
Pål Grønås Drange
7d2de9117c InitConfig is reference, use ref EclipseState constructor 2016-08-08 10:03:58 +02:00
Jørgen Kvalsvik
2158ea92bf FWCTH support 2016-07-19 14:44:35 +02:00
Jørgen Kvalsvik
fa7656bedf [Summary] Rate and rate-derived F-keyword
Support for rate or rate-derived keywords (i.e. sans pressure, sales
etc.) from the Field family of keywords.
2016-07-18 12:57:06 +02:00
Jørgen Kvalsvik
ef64026bce Cuts/ratios only apply to production
In line with Eclipse water cuts, gas-oil ratio etc. only applies to
production values, rather than all rates. This sparked some other
refactoring that moves the negative-else-zero logic into the rate
calculation.
2016-07-18 12:02:29 +02:00
Jørgen Kvalsvik
01ae50ba20 Completion production/injection rates/totals
A small set of the completion family of keywords, water/oil/gas
production and injection. The tests and example data file are updated
accordingly, with edge cases.
2016-07-15 15:20:56 +02:00
Joakim Hove
55f482b202 Add ParseContext argument to SummaryConfig. 2016-07-01 13:59:18 +02:00
Jørgen Kvalsvik
0c0a548219 New private Summary implementation
A rewritten Summary.cpp with some minor header modifications. Synposis
of the new implementation:

* Uses unordered_map< string, std::function > for dispatch, instead of
  multiple functions and a switch
* Some poor man's function composition support has been added
  (privately) to avoid a lot of reptition in the post processing.
* Functions assume they work over lists of wells instead of single wells
  being special cased - this means groups of well etc. can share
  implementation with single wells and field keywords.
* Unsupported keywords are not written in the Summary file.

Furthermore, some comments on special cases and overall approach and
a generally more declarative implementation. This change is invisible to
downstream developers. Users will obviously see no more garbage
keywords.
2016-06-30 09:54:40 +02:00
Joakim Hove
0f238d6552 Explicitly created output in subdirectory. 2016-06-24 19:39:46 +02:00
Joakim Hove
299b453b56 Using ERT::TestArea. 2016-06-24 19:39:17 +02:00
Jørgen Kvalsvik
87e24b91b6 Look up history rates at correct timestep
The input format and parser interacts non-intuitively, as the observed
rates for timestep N are written for timestep N-1.
2016-06-10 10:03:49 +02:00
Jørgen Kvalsvik
c87ffb1608 Base Summary test durations on days
Basing the dest durations on days over seconds make them less noisy,
more readable and closer to actual idiomatic use. Removes some subtle
complexities from the tests.
2016-06-07 08:42:30 +02:00
Jørgen Kvalsvik
887491e851 Summary takes secs_elapsed, not per-step duration
To stay consistent with the interface exposed by the other
eclipse-writer components, the summary facilities takes its time elapsed
since simulation start, not on a per-step basis.
2016-06-07 08:40:38 +02:00
Jørgen Kvalsvik
289021d823 Grouped tests into fewer, more elaborate cases
The tests requires some boilerplate setup and quickly became slow to
maintain and run. Rewrite so that the tests are grouped on topic instead
of immediate keyword family.
2016-05-24 10:31:14 +02:00
Jørgen Kvalsvik
d27b3db9fd Injection rate tests 2016-05-24 10:31:14 +02:00
Jørgen Kvalsvik
6cfb52ae69 Summary: Production is negative injection.
Represent simulator-provided data as production = negative injection,
and write rates accordingly. Tests updated.
2016-05-24 10:31:07 +02:00
Jørgen Kvalsvik
dcdcf99758 Support and tests for history matching G-keywords 2016-04-28 16:20:03 +02:00
Jørgen Kvalsvik
d8b9c88164 Well Injection history matching unit tests 2016-04-28 15:42:28 +02:00
Jørgen Kvalsvik
d7c5a43226 WGLR+WGLRH support 2016-04-28 09:46:01 +02:00
Jørgen Kvalsvik
eb7f6afae6 Rename gor to glr
This function doesn't care if the liquid is pure water, pure oil or a
mixture.
2016-04-28 09:44:57 +02:00
Jørgen Kvalsvik
e84c888d72 Support for SUMMARY configured output G-keywords
Add support for a set of G-family summary keywords; productions, rates
and ratios.
2016-04-27 10:50:33 +02:00
Jørgen Kvalsvik
e7a6ae5068 RAII cleanup of test files; WRITE removed
The WRITE test was a mere convenience to create and inspect a summary
file, but this should instead be moved to applications or examples, and
out of tests. The helper class setup now has a destructor that will
automatically attempt to clean up the files produced by ert.
2016-04-26 12:24:30 +02:00
Jørgen Kvalsvik
e09e7fea1f Support for SUMMARY configured output W-keywords
Support for the creation and output of ecl-compatible SUMMARY-section
configured files. Supports a set of Well keywords, with unit conversions
based on user request, and comes with a test suite.
2016-04-25 15:35:46 +02:00