Commit Graph

241 Commits

Author SHA1 Message Date
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
Jørgen Kvalsvik
687a4ca262 Removed unused private member. 2016-09-25 22:02:08 +02:00
Jørgen Kvalsvik
725aaac746 Overwrite UNRST file on first restart write.
Replaces checking if the report step is zero with maintaining some state
and determining if any given step is the first time an UNRST file is
written to or not. Extends the test to also cover this case. New
behaviour will remove all time steps from a pre-existing UNRST file from
the restart step being started from, but preserve all steps leading up
to that point.
2016-09-25 22:01:41 +02:00
Jørgen Kvalsvik
c0d99d2c5c Revert "Remove unused grid argument in RFT::writeTimeStep()."
This reverts commit 1a5f80ddf3bb0a86ba06f713ca71cf4bf044168f.
2016-09-25 22:00:30 +02:00
Atgeirr Flø Rasmussen
a9f5fcdfd5 Silence various warnings.
Mostly shadowing, also unused variable and unused argument.
2016-09-23 15:02:36 +02:00
Atgeirr Flø Rasmussen
07986d8fd4 Fix compile error: ambiguous call to std::abs(). 2016-09-23 15:01:42 +02:00
Atgeirr Flø Rasmussen
eb85e1b02c Remove unused grid argument in RFT::writeTimeStep(). 2016-09-23 15:00:16 +02:00
Tor Harald Sandve
bf892a7976 Output SSOL to restart file if present 2016-09-22 14:54:10 +02:00
Arne Morten Kvarving
ed9c800fa7 Merge pull request #90 from akva2/restructure_test_utilities_and_add_integration_test
Restructure test utilities and add integration test
2016-09-20 12:40:16 +02:00
Joakim Hove
fc1a11af70 Use ecl_util_make_date() to create time_t value. 2016-09-19 19:28:06 +02:00
Arne Morten Kvarving
a403a8d21c Changed to two applications for comparison
- restartRegressionTest, initRegressionTest was squashed to one
 application, which also supports integration test as well as test
 of restart files (non-unified) and .RFT files.

- summaryRegressionTest was renamed compareSummary -- now it can
 execute an integration test as well as regression test. Also other
 improvements were made.
2016-09-19 14:36:03 +02:00
Petter Taule
3bb1cda00c Added integration tests in compare libraries
- The compare library summaryIntegrationTest.cpp and header was added,
 which implements a integration test for summary files.

- The summary regression test was enhanced with extended
 functionality.

- EclFilesComparator.cpp with header file now includes an integration
 test for SGAS, SWAT and PRESSURE in UNRST files, and also the
 regression test was improved with cell volume check, as well as checks of more
 keyword types.
2016-09-14 13:09:38 +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
babrodtk
ec43c9c86f Fixed warnings 2016-09-06 07:54:21 +02:00