Commit Graph

39 Commits

Author SHA1 Message Date
Joakim Hove
7163807296 Change method names 2018-05-16 12:31:14 +02:00
Joakim Hove
3c18add696 Verify that the extra container has THPRES 2018-05-15 23:08:30 +02:00
Joakim Hove
593af1c678 Pass dimension information for extra fields in restart 2018-05-14 16:12:52 +02:00
Joakim Hove
e6f318aa28 Add key string to RestartKey 2018-05-14 16:12:52 +02:00
Joakim Hove
d078a96eae Use RestartValue container for Eclipse output 2018-05-14 16:12:52 +02:00
Arne Morten Kvarving
7f79101fb2 changed: let the build system handle the dynamic boost test defines 2018-02-14 16:03:57 +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
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
6a7412af7e Increased tolerance when testing TEMP in restart test. 2018-02-01 08:41:41 +01:00
Joakim Hove
21a2944885 Extract Schedule and SummaryConfig. 2017-10-03 09:29:25 +02:00
Joakim Hove
cf67d56dba Dsiable test when running travis. 2017-06-10 11:19:31 +02:00
Arne Morten Kvarving
0b68a2f69e changed: make RestartValue constructor explicit
update code which previously relied on the implicit cast
2017-06-09 11:57:48 +02:00
Joakim Hove
9120c67cf8 Ability to pass misc values to summary writer. 2017-06-06 15:40:34 +02:00
Atgeirr Flø Rasmussen
ada3e302b8 Silence shadowing warnings. 2017-04-12 10:31:53 +02:00
Joakim Hove
621b94235c RestartIO::load( ) can specifiy optional keys. 2017-04-11 14:35:10 +02:00
Joakim Hove
ace3e10ac5 RestartIO::load extra keys can be marked optional. 2017-03-09 14:49:34 +01:00
Joakim Hove
3d2a0a6368 Changes to restart IO.
- Will throw an exception if solution data has wrong size.
 - struct ResatrtValue used as RestartIO::load( ) return value.
 - RestartIO can take arbitrary double vectors as extra data.
2017-03-03 08:21:44 +01:00
Joakim Hove
00d7f7e155 Added ability to save restart fields in double. 2017-02-22 18:24:10 +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
Jørgen Kvalsvik
e06d591dd3 Read phase information from EclipseState.runspec 2016-11-01 11:19:59 +01:00
Joakim Hove
08d89858af Extended data::Wells to inherit from std::map. 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
Joakim Hove
fc1a11af70 Use ecl_util_make_date() to create time_t value. 2016-09-19 19:28:06 +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
4bfacb144d Moved argument 'sub_step' to 2. in argument list. 2016-08-20 19:26:35 +02:00
Joakim Hove
c0b56afb13 Removed NNC argument to EclipseWriter constructor. 2016-06-29 13:10:35 +02:00
Joakim Hove
791da336fe Removed unchecked calls to writeInit(). 2016-06-29 13:10:35 +02:00
Jørgen Kvalsvik
7c82e69a00 Copy and save a Grid copy in Writer; apply actnum
Simulators might modify the grid post EclipseState creation, so the Grid
fetched from there is unreliable. Copy the Deck-provided grid and apply
the manipulations at EclipseWriter construction time to ensure it uses
the same dimensions and has the same properties as the simulator.
2016-06-16 14:30:27 +02:00
Jørgen Kvalsvik
0f1a1d7ede NNC variable not defaulted in writeInit 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
e2a5c01a8b Read sim start time from EclipseState
Reading the start time from EclipseState means it's no longer required
as a parameter to every method, and that the current time can be
calculated as start time + time elapsed.
2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
91d5cad61e Remove unused argument from writeInit 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
0e9238a175 Remove opm-core dependency in Restart test; rename
Removes the opm-core dependency in the restart test, and renames the
file to be more in style with the new test set.
2016-06-07 08:40:40 +02:00