Commit Graph

188 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
334dbe4e1f Initialize all struct elements. 2018-12-10 16:10:25 +01:00
Joakim Hove
c1ffeeef53
Merge pull request #557 from joakim-hove/actioncontext-summary-state
Actioncontext summary state
2018-11-16 11:31:20 +01:00
Joakim Hove
8b8285ae2b
Merge pull request #556 from joakim-hove/summarystate-well-api
Summarystate well api
2018-11-16 09:42:01 +01:00
Joakim Hove
c35832b155 Changed exception to std::out_of_range 2018-11-09 21:14:03 +01:00
Joakim Hove
ca9da29c53 Add well_var methods to SummaryState 2018-11-09 20:45:20 +01:00
Joakim Hove
1ba51534ae Move SummaryState implementation to EclipseState/Schedule/ 2018-11-09 20:44:37 +01:00
Tor Harald Sandve
5d3125c532 Add output of well phase potential 2018-11-07 15:38:23 +01:00
Tor Harald Sandve
95179f393c Fix vappars and dr[sv]dt logic
The simulator should either use VAPPERS or dr[sv]dt, both the
combination drsdt and drvdt is allowed.
2018-11-05 13:38:42 +01:00
Lars Petter Øren Hauge
d958da6542 Include WPIMULT for CTFAC output 2018-10-29 09:12:50 +01:00
Bård Skaflestad
258bcbc186 Restart_Segment/Vectors_Present: Include SOFR Existence
We were checking "SGFR" twice due to copy-paste...

Pointy Hat: bska
2018-10-25 09:09:32 +02:00
Bård Skaflestad
f9eb32a235 Segment Summary: Test Read/Write Support
This commit completes the set of unit tests for the segment-related
summary vectors

    SOFR, SGFR, SWFR, and SPR

by adding a test (Restart_Segment/Write_Read) that serializes the
result of multiple Summary::add_timestep() calls for SOFR_TEST.DATA
and reads that summary file back in.
2018-10-25 09:09:32 +02:00
Bård Skaflestad
f275fd6089 Summary: Transmit Segment Values to "prev_state"
This commit makes the helper function find_wells() aware of summary
vectors defined on segments.  Previously, this helper function would
return an empty list of wells in the case of ECL_SMSPEC_SEGMENT_VAR
whence all segment-related summary vectors would be zero at all
times.

Add a small set of unit tests to verify that we transmit the known
(small) set of segment-related summary vectors (SOFR, SGFR, SWFR,
SPR) to the internal "prev_state" with correct output units and sign
convention (producing flow rates--reservoir to well--positive).
2018-10-25 09:09:32 +02:00
Jostein Alvestad
fe060c7f48 Changes to contribute to write segment data to summary file 2018-10-25 09:09:31 +02:00
Bård Skaflestad
80154e8f5f Serialization: Add Initial Support for Segment Information
This commit extends Opm::data::Wells to include a set of output
vectors for well segment information.  At present we define output
structures for segment rates and segment pressures.  The immediate
use case is properly assigning restart vector items RSEG[8 .. 11],
but these same values are also usable for outputting the summary
vectors SPR, SOFR, SGFR, and SWFR.  Future expansion is likely.
2018-10-25 09:09:31 +02:00
Lars Petter Øren Hauge
87e3beb601 Support CTFAC in output 2018-09-13 10:23:47 +02:00
Joakim Hove
45e81a02fa Use plain C api for temporary testarea 2018-09-07 05:53:20 +02:00
Bård Skaflestad
0be3f2c76f Unit Tests: Supply Enough Parameters for data::Connection
We must provide cell_pressure, cell_saturation_water,
cell_saturation_gas, and effective_Kh.

Forgotten in commit 687f108.
2018-07-12 00:46:46 +02:00
Lars Petter Øren Hauge
5c68a0aaa8 Support CCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
7a91bebd61 Support FCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
102bd6b728 Support GCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
fc3bc714fc Support WCI(R/T) 2018-06-29 09:45:14 +02:00
Bård Skaflestad
c3a11a2fb5 Summary: Calculate Independent Set of Vectors for Restart
This commit ensures that the following set of vectors are stored/updated in

    Summary::add_timestep()

for all active wells and well groups (including FIELD):

    - Production rates for Oil, Water, Gas, and Reservoir Volume
      (i.e., (O|W|G|V)PR).

    - Cumulative production totals for Oil, Water, Gas, and
      Reservoir Volume (i.e., (O|W|G|V)PT).

    - Injection rates for Water and Gas (i.e., (W|G)IR).

    - Cumulative injection totals for Water and Gas ((W|G)IT).

    - Producing Water Cut (WCT).

    - Producing Gas/Oil ratio (GOR).

We additionally capture the well bottom-hole pressure (WBHP) for all
wells that are active at the pertinent simulation step (sim_step).

Add an accessor function

    const SummaryState& Summary::get_restart_vectors() const

that returns the 'prev_state' which contains these summary vectors
and add a set of unit tests to exercise the new interface.
2018-06-25 14:04:11 +02:00
Joakim Hove
3975db2ff3 Rename CompletionSet -> ConnectionSet 2018-06-11 14:03:32 +02:00
Joakim Hove
6168a35512 Add SummaryState class to hold on to summary state. 2018-05-23 06:49:23 +02:00
Lars Petter Øren Hauge
bbf2ae26f1 Match timestep for well info
Decrement timestep where necessary to avoid well post-configuration.

Consider the following:

.
.
.

WELLSPECS
 'W1'  'G1' ... /

TSTEP
 2*1 /

WELLSPECS
 'W1'  'G2' .../

TSTEP
 2*1 /

In that case the parent group of W1 is changed after two timesteps. At timestep
two the Group parent will indicate G2, while the GOPT:G2 at timestep two should
be reported for what has progressed up until timestep two.
2018-03-13 08:16:07 +01:00
Lars Petter Øren Hauge
fdb06aa77f Apply efficiency factors
Efficiency factors are multiplied when specified at multiple levels of
the well/group hierarchy.

The factors are included as follows:

* Well Rate        - No efficiency factor
* Well Total       - WEFAC & GEFAC (whole hierarchy)
* Group Rate       - WEFAC & GEFAC (only subgroups)
* Group Total      - WEFAC & GEFAC (whole hierarchy)
* Field Rate       - WEFAC & GEFAC (whole hierarchy)
* Field Total      - WEFAC & GEFAC (whole hierarchy)
* Region Rate      - WEFAC & GEFAC (whole hierarchy)
* Region Total     - WEFAC & GEFAC (whole hierarchy)
* Completion Rate  - No efficiency factor
* Completion Total - WEFAC & GEFAC (whole hierarchy)

Authored by Sveinung Rundhovde and Lars Petter Hauge
2018-02-20 10:26:54 +01:00
Lars Petter Øren Hauge
dde1ccaae0 Fix minor name error 2018-02-20 10:03:59 +01:00
Atgeirr Flø Rasmussen
05c904a04e Merge pull request #250 from totto82/MoveWell
Some more cleaning in the output code  in opm-output, ewoms and opm-simulator
2018-02-19 15:05:24 +01:00
Arne Morten Kvarving
ae56723b7e Merge pull request #254 from akva2/dyn_boost_test_bs
changed: let the build system handle the dynamic boost test defines
2018-02-15 08:14:32 +01:00
Joakim Hove
1034c82fab Merge pull request #253 from GitPaean/adding_few_keywords
adding a few summary keywords
2018-02-14 21:37:13 +01:00
Arne Morten Kvarving
7f79101fb2 changed: let the build system handle the dynamic boost test defines 2018-02-14 16:03:57 +01:00
Kai Bao
43cb8e5739 adding a few summary keywords
WWVIR, WGVPR and WGVIR
2018-02-13 19:39:30 +01:00
Arne Morten Kvarving
e81784c9eb fixed: libecl recently enforced stricter filename rules
in particular, no mixed case. either all upper or all lower
2018-02-12 15:06:13 +01:00
Tor Harald Sandve
e2e38ddc0c Add write/read test for data::wells 2018-02-12 11:42:59 +01:00
Tor Harald Sandve
206241c9ae Store global index instead of active index in well completions
Fix bug in output of completion related stuff when run on mulitiple
cores.
2018-02-08 14:11:04 +01:00
Tor Harald Sandve
3f85198032 Fix merge conflict 2018-02-06 14:47:35 +01:00
Tor Harald Sandve
cbf61996d7 Remove unused stuff 2018-02-06 14:47:35 +01:00
Tor Harald Sandve
06b7afc9be Remove data::Solution cells from Summary 2018-02-05 14:23:19 +01:00
Tor Harald Sandve
890b2226b2 Get Block values from simulator
Avoids communication of the whole state
2018-02-05 14:23:19 +01:00
Tor Harald Sandve
ba29cfa81e Remove unused stuff 2018-02-05 14:23:19 +01:00
Joakim Hove
cb5a3bdcea Revert "Revert "Res vol keywords (WVPR + WVPT & WVPRT+FVPRT)"" 2018-02-02 12:11:23 +01:00
Joakim Hove
2f332ed702 Revert "Revert "Add support for keywords (WVIT+GVIR+GVIT) "" 2018-02-02 10:41:35 +01:00
Joakim Hove
a88561b010 Revert "Add support for keywords (WVIT+GVIR+GVIT) " 2018-02-02 09:00:04 +01:00
Joakim Hove
6094552b55 Revert "Res vol keywords (WVPR + WVPT & WVPRT+FVPRT)" 2018-02-02 08:59:15 +01:00
Joakim Hove
d39ad3a865 Merge pull request #238 from lars-petter-hauge/res_vol_keywords
Res vol keywords (WVPR + WVPT & WVPRT+FVPRT)
2018-01-31 23:58:23 +01:00
Sveinung Rundhovde
2d01813f01 Add support for GVIT keyword 2018-01-29 08:46:02 +01:00
Sveinung Rundhovde
db963b7286 Add support for GVIR keyword 2018-01-29 08:46:02 +01:00
Sveinung Rundhovde
c623452823 Add support for WVIT keyword 2018-01-29 08:46:02 +01:00
Lars Petter Øren Hauge
9a404c2e93 Support WVPRT+FVPRT 2018-01-26 08:03:19 +01:00
Lars Petter Øren Hauge
2343c5ada9 Support WVPR + WVPT 2018-01-26 08:02:44 +01:00
Lars Petter Øren Hauge
a8d6259514 Support FOPR(S/F) FOPT(S/F) 2018-01-23 14:36:56 +01:00
Lars Petter Øren Hauge
10f2f7d366 Add missing part of test WOPTS+WOPTF 2018-01-23 08:17:06 +01:00
Lars Petter Øren Hauge
f8cb32c7d2 Support WOPRS+WOPRF 2018-01-23 08:16:15 +01:00
Lars Petter Øren Hauge
37709e9e04 Add support for FPRP 2018-01-17 08:54:38 +01:00
Sveinung Rundhovde
5993cb7764 Add support for FGIPG keyword 2018-01-04 14:52:07 +01:00
Sveinung Rundhovde
dcfb0a4e47 Add support for FOIPL keyword 2018-01-04 14:52:06 +01:00
Sveinung Rundhovde
d0bf9753d9 Add support for FWIP keyword 2018-01-04 14:52:06 +01:00
Lars Petter Øren Hauge
130ec2f0a8 Add support for FGPT(F/S) 2018-01-03 14:46:58 +01:00
Lars Petter Øren Hauge
afbe8081f6 Add support for FGPR(F/S) 2018-01-03 14:46:46 +01:00
Lars Petter Øren Hauge
9497dfa1e5 Change unsupported keyword test
Support of FVIR is now implemented.
2018-01-03 13:56:15 +01:00
Lars Petter Øren Hauge
fc75de6fb0 Add tests for FV(I/P)/(R/T) 2018-01-03 13:56:15 +01:00
Sveinung Rundhovde
69c08ff677 Add support for GVPRT keyword 2017-12-20 16:32:19 +01:00
Sveinung Rundhovde
42befdfa4c Add suport for GVPT keyword 2017-12-19 10:23:02 +01:00
Sveinung Rundhovde
ffb85c98bf Add support for GVPR keyword 2017-12-19 10:22:55 +01:00
Sveinung Styve Rundhovde (IT SI SIB)
b3a994211c Add WTHPH+WBHPH keywords 2017-12-01 14:01:13 +01:00
Lars Petter Øren Hauge
efd108da56 Add GOP(R/T)(F/S)
Handling keywords to output rate and total for free and vaporized oil
2017-11-23 11:34:31 +01:00
Lars Petter Øren Hauge
8e6387456c Add GGPTS+GGPTF 2017-11-23 11:34:19 +01:00
Sveinung Styve Rundhovde (IT SI SIB)
3fffeda7d7 Add WOPTS+WOPTF keywords 2017-11-17 09:36:05 +01:00
Sveinung Styve Rundhovde (IT SI SIB)
ff3d0cda28 Add vaporized_oil to Rates 2017-11-17 09:36:05 +01:00
Sveinung Styve Rundhovde (IT SI SIB)
85eca28c84 Add WGPTS+WGPTF keywords 2017-11-17 09:36:05 +01:00
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
Joakim Hove
9a0e8a40ba Updated SummaryConfig constructor call. 2017-09-26 14:01:09 +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
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
5ca412291a Add tests for FPR 2017-05-10 13:38:38 +02:00
babrodtk
1ec5baeb2e Fixed auxillary=>auxiliary 2017-02-15 14:50:17 +01:00
Joakim Hove
f3a4029195 Added test of require3D functionality from Summary 2017-02-07 14:40:11 +01:00
Joakim Hove
d0dcba2d72 Updated test-data to use active cells. 2017-02-06 14:07:16 +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
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
c3bd468005 Pass grid to constructor in summary test. 2016-11-10 11:53:41 +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
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