Commit Graph

90 Commits

Author SHA1 Message Date
Sveinung Styve Rundhovde (IT SI SIB)
72a08beb39 Add WGPRS+WGPRF keywords 2017-11-17 09:36:05 +01:00
Lars Petter Øren Hauge
1e776429f5 Add GGPRS+GGPRF keywords 2017-11-15 12:02:42 +01:00
Joakim Hove
21a2944885 Extract Schedule and SummaryConfig. 2017-10-03 09:29:25 +02:00
Tor Harald Sandve
c96f1cd6ca Fix RPR summary output
- weight RPR by hydrocarbon pore volume
2017-09-06 12:47:10 +02:00
Joakim Hove
23e3bd8d4b Using Schedule::getWells( group, time_step)
When evaluating a group variable, like e.g. GOPR we need to traverse the
group tree all the way down to the leaf nodes, i.e. wells.
2017-07-26 09:24:48 +02:00
Joakim Hove
9ffc7ebab2 Will insert RESTART header in summary files. 2017-06-30 10:22:42 +02:00
Joakim Hove
9120c67cf8 Ability to pass misc values to summary writer. 2017-06-06 15:40:34 +02:00
Joakim Hove
ac70c34c68 Write (incorect) TCPU value to summary files. 2017-05-30 06:33:46 +02:00
Tor Harald Sandve
01c56deb3f PV weight FPR 2017-05-10 10:03:31 +02:00
Arne Morten Kvarving
5a5d82fb86 throw runtime error if caller passes wrongly sized arrays to output 2017-02-06 14:11:56 +01:00
Joakim Hove
4d1693d027 Changes in the loading of restart files.
The main content of this commit is that the loading of restart files is
based on map of keys passed in from calling scope. This way the
selection of keywords to save and load is fully under control of calling
scope, but in addition there are many small refactorings:

 - The EclipseWriter class and implementation has been renamed
   EclipseIO.

 - The loading and saving of restart files has been moved to file and
   namespace RestartIO, which contains two loose functions load( ) and
   save( ).

 - The Summary() and RFT( ) data get their own copies of the data::Cells
   vector.

 - Removed some abstractions and wrrappers around C / ert
   datastructures. Using ecl_file_view when loading restart files,
   instead of bare ecl_file. Simplified opening of unified restart
   files.

 - Removed the ability to save restart keywords in double precision.
2017-01-17 16:58:56 +01:00
Atgeirr Flø Rasmussen
91879da04e Silence various warnings. 2016-12-29 13:51:07 +01:00
Joakim Hove
9a53243bd9 Added support for block variables in Summary. 2016-11-22 15:17:43 +01:00
Joakim Hove
0badeb68c7 Merge pull request #140 from jokva/foe
FOE support
2016-11-22 13:00:04 +01:00
Jørgen Kvalsvik
84690ce6b6 RGIPL+RGIPG support. 2016-11-21 12:35:23 +01:00
Jørgen Kvalsvik
fc789d489a FOE support
Field efficiency: (OIP(initial) - OIP(now)) / OIP(initial). The initial
OIP is cached, and FOIP is reused for OIP(now). Adds the
operator-(double,quantity) to make the formula obvious from the FOE
function.
2016-11-18 11:40:45 +01:00
Jørgen Kvalsvik
0253d1675d WellSet uses strings, not Well pointers 2016-11-17 12:48:54 +01:00
Jørgen Kvalsvik
8b1ca9803f FPR support 2016-11-10 11:01:27 +01:00
Jørgen Kvalsvik
d16436913c RWIP support 2016-11-10 11:01:27 +01:00
Jørgen Kvalsvik
7866e38c19 Region injection rates and totals
Support for ROIR, RGIR, RWIR, ROIT, RGIT and RWIT. The oil injection
keywords exist for symmetry.
2016-11-10 11:01:27 +01:00
Jørgen Kvalsvik
6ae9535c37 GGLR+GGLRH support 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
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
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
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
776094aa2c Added ROIP / ROIPL / ROIPG summary keywords. 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
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
Jørgen Kvalsvik
f94ecc09a3 Schedule::getGroup returns reference, not pointer 2016-10-05 14:52:25 +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
Jørgen Kvalsvik
2158ea92bf FWCTH support 2016-07-19 14:44:35 +02:00