Commit Graph

37 Commits

Author SHA1 Message Date
Arne Morten Kvarving
7f79101fb2 changed: let the build system handle the dynamic boost test defines 2018-02-14 16:03:57 +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
8a5062ae27 Pass pointers of region and block data to eclIO 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
21a2944885 Extract Schedule and SummaryConfig. 2017-10-03 09:29:25 +02:00
Joakim Hove
9120c67cf8 Ability to pass misc values to summary writer. 2017-06-06 15:40:34 +02: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
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
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
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
Joakim Hove
b1920ef251 Merge pull request #43 from jokva/well-shared_ptr-deprecated
Well shared_ptr alias deprecated
2016-06-20 14:56:53 +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
04ea6c90a8 Well shared_ptr alias deprecated
The shared_ptr aliasing is deprecated, and in the Well case this has
been removed upstream.
2016-06-16 10:12:39 +02:00
Atgeirr Flø Rasmussen
61bc977d27 Suppress boost warnings. 2016-06-15 09:40:18 +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
6f90959d42 Remove opm-core dependency in writenumwells test 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
530407a3ad EclipseWriter header cleanup
Remove the unnecessary or unused includes. Consequence is well enum
conversions being no longer public static. To not break the tests the
functions have been implemented in writenumwells.
2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
1c89ba93a9 Replace WellState with data::Wells 2016-06-07 08:40:38 +02:00
Jørgen Kvalsvik
8776cc9c44 Output takes data::Solution over SimDataContainer
To break dependencies between modules, and to properly define the input
format for the output facilities, make writeTimeStep take data::Solution
over SimulationDataContainer.
2016-06-07 08:40:37 +02:00
Jørgen Kvalsvik
3a81e1bd3b writeTimeStep takes time parameters explicitly
Removes the dependency on SimulationTimerInterface, and instead expects
to get the raw values from caller.
2016-06-07 08:40:37 +02:00
Jørgen Kvalsvik
94f0dd92ed Replace SimulationTimer with time_t in writeInit
Instead of passing a massive and complex instance around, reduce
dependencies by directly passing the interesting time values to
writeInit.
2016-06-07 08:40:37 +02:00
Kjell W. Kongsvik
e7454e69db Remove phaseUsage parameter, get it from eclipseState 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
db87f24ebb Revert back code so that output grid is not recreated unsafely
Readded necessary parameters for this
2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
35e7507f3e Refactored tests
Move 2 decks from strings to seperate files

Started to make test_writeReadRestartfile more simple
2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
bd1d8dc576 Removed parameters to EclipseWriter
Paramater::ParameterGroup& params and numCells and compressedToCartesianCellIndex
These are now stored in the IOconfig object
2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
d622f6e04b Removed compressedToCartesianCellIdx parameter
Noted that internal calculation of compressedToCartesianCellIdx should be done in EclipseGrid
2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
c6bfcef5e6 Removed numCells parameter 2016-04-29 14:15:20 +02:00
Pål Grønås Drange
40d9a22a5f Using getInputGrid API from Parser 2016-04-19 16:52:40 +02:00
Kjell W. Kongsvik
e4df4dd48d Updated with changes from opm-core master 2016-03-29 14:45:48 +02:00
Kjell W. Kongsvik
68b5c38f3a Copy changes from opm-core
Ref 81f6c2dd8e
2016-03-17 12:45:29 +01:00
Kjell W. Kongsvik
51c8416e28 Moved OutputWriter to opm-output
Moved opm/core/io/* in opm-core to opm-output opm/output along with tests.
Is still dependant on opm-core.
2016-03-16 10:47:35 +01:00