Commit Graph

420 Commits

Author SHA1 Message Date
Andreas Lauser
1083db48a3 test_LinearisedOutputTable: include config.h unconditionally
this is already the case for the vast majority of the other OPM code.
2018-03-03 13:23:37 +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
Sveinung Rundhovde
22ebda2ea7 Add wells to arguments for region keywords
Applying efficiency factor to region keywords requires a list of wells
having completions inside the region.

Authored by Sveinung Rundhovde and Lars Petter Hauge
2018-02-20 10:03:59 +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
55ed844438 Add cell data in perforation cells to data::well::completion
With this no cell data is needed in opm-output
2018-02-07 14:32:01 +01:00
Tor Harald Sandve
3f85198032 Fix merge conflict 2018-02-06 14:47:35 +01:00
Tor Harald Sandve
5822c362f5 Communicate well data 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
dec7e0068d fix typo 2018-02-05 14:44:11 +01:00
Tor Harald Sandve
06b7afc9be Remove data::Solution cells from Summary 2018-02-05 14:23:19 +01:00
Tor Harald Sandve
8a5062ae27 Pass pointers of region and block data to eclIO 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
Tor Harald Sandve
45267477b4 Get Region and Field values from simulator
Avoid cell based computations in opm-output as it could slow down the
MPI run.
2018-02-05 14:19:50 +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
6a7412af7e Increased tolerance when testing TEMP in restart test. 2018-02-01 08:41:41 +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
Joakim Hove
da70718beb Merge pull request #230 from lars-petter-hauge/support_fprp
Add support for FPRP
2018-01-17 09:03:39 +01:00
Lars Petter Øren Hauge
37709e9e04 Add support for FPRP 2018-01-17 08:54:38 +01:00
Joakim Hove
c4346cd065 Removed travis integration. 2018-01-16 20:12:42 +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
Lars Petter Øren Hauge
257e5fd983 Add FV(I/P)(R/T) keywords 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