Commit Graph

44 Commits

Author SHA1 Message Date
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
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
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
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
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
Atgeirr Flø Rasmussen
a9f5fcdfd5 Silence various warnings.
Mostly shadowing, also unused variable and unused argument.
2016-09-23 15:02:36 +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
babrodtk
ec43c9c86f Fixed warnings 2016-09-06 07:54:21 +02:00
Joakim Hove
2aa9dfbf48 Added optional argument simProps to writeTimestep.
The simProps argument is vector of field properties which have been
initialized / calculated by the simulator. Examples of such properties
include the relative permeabilites KRG, KRO and KRW and the fluid in
place vectors FIPOIL and FIPGAS.
2016-08-20 19:26:35 +02:00
Joakim Hove
4bfacb144d Moved argument 'sub_step' to 2. in argument list. 2016-08-20 19:26:35 +02:00
Joakim Hove
ec0978f00e Writing INT properties to INIT file.
Refactor: Made helper functions templates functions.
2016-07-14 11:46:46 +02:00
Joakim Hove
53625baf26 Write DEPTH and DX,DY,DZ keywords to INIT file. 2016-07-12 13:56:35 +02:00
Joakim Hove
b8ae72b8c5 Cleanup: Will remove test area. 2016-07-12 13:56:28 +02:00
Joakim Hove
2333191908 Unrelated: Using C++ TestArea. 2016-06-29 13:10:35 +02:00
Joakim Hove
c0b56afb13 Removed NNC argument to EclipseWriter constructor. 2016-06-29 13:10:35 +02:00
Joakim Hove
4b11d9a059 Rename wrietInit -> writeInitAndEgrid() 2016-06-29 13:10:35 +02:00
Joakim Hove
b232c568af writeInit() - can optionally take properties. 2016-06-29 13:10:35 +02:00
Joakim Hove
3d460f16a5 Moved 'INIT' keyword in testdata. 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
038007b431 Remove opm-core dependency in EclipseWriter test 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
929e470af0 Set basename so that there is a filename to create 2016-05-02 10:07:04 +02:00
Kjell W. Kongsvik
8cc923e2b4 Use tmp area for running EclipseWriterIntegration test
Due to old files on disk test did not fail as it should have
2016-04-29 15:45:40 +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
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