Commit Graph

25 Commits

Author SHA1 Message Date
Roland Kaufmann
74ed3d54c0 Avoid comparing signed and unsigned integers 2013-11-25 14:14:46 +01:00
Roland Kaufmann
4a6e502869 Use integer for counter and cast to enumeration 2013-11-25 14:14:46 +01:00
Roland Kaufmann
2b1ad42b9e Hide internals in its own namespace
If we put them in the anonymous namespace, then we cannot have a
reference to the types in the header (because that would mean different
things in each compilation unit).
2013-11-25 14:14:46 +01:00
Roland Kaufmann
351043f76e Explicitly mention template parameter for base class
GCC 4.4 doesn't understand that EclipseHandle (without template
parameter) is supposed to refer to the base class and not a field.
2013-11-25 14:14:46 +01:00
Roland Kaufmann
1a0b6f0eb6 Eliminate dependency on UnstructuredGrid
The only thing it was needed for was the number of cells in the grid,
and the Cartesian dimensions, and those are already available from other
structures.
2013-11-25 14:14:46 +01:00
Roland Kaufmann
9dc4df625f Correct parameter sequence
ecl_grid_alloc_GRDECL_kw takes zcorn first, then coord (slightly
unintuitive if you ask me), and this is also the order that is used
in EclipseGrid::make; thus, the order should be consistent through
the constructor also.
2013-11-25 14:14:45 +01:00
Roland Kaufmann
5a914a2852 Initialize writer with directories gotten from params 2013-11-25 14:14:45 +01:00
Roland Kaufmann
98a36189d3 Conditionally use input file
If config.h is written, then the build system will also define
HAVE_CONFIG_H.
2013-11-25 14:14:45 +01:00
Roland Kaufmann
cdc45b2d56 Trim needless header includes 2013-11-25 14:14:45 +01:00
Roland Kaufmann
1cda556cb9 Remove dependency on ERT in header 2013-11-25 14:14:45 +01:00
Roland Kaufmann
5ce5975586 Coalesce called methods into init and timestep 2013-11-25 14:14:45 +01:00
Roland Kaufmann
572123675d Updated copyright statement at top 2013-11-25 14:14:45 +01:00
Roland Kaufmann
92fd082630 Remove now unused member holding starting time
If we restart from a later time, then the SimulatorTimer should be
restarted in that state as well, so it is already always a reflection
of how far we've progressed in the input file's schedule.
2013-11-25 14:14:45 +01:00
Roland Kaufmann
f637a0cea9 Replace summary variables with RAII type 2013-11-25 14:14:45 +01:00
Roland Kaufmann
cf8c58a33d Replace restart and solution handling with RAII type 2013-11-25 14:14:45 +01:00
Roland Kaufmann
b0a4881d45 Replace init setup with RAII type 2013-11-25 14:14:45 +01:00
Roland Kaufmann
3b8d42ca02 Make grid writing part of the grid type 2013-11-25 14:14:44 +01:00
Roland Kaufmann
2ae164a878 Replace grid construction with RAII type 2013-11-25 14:14:44 +01:00
Roland Kaufmann
97b0dcc3ac Centralize all time conversion
Remove duplicate code into a common helper function
2013-11-25 14:14:44 +01:00
Roland Kaufmann
f845163a0b Replace file name handling with RAII type 2013-11-25 14:14:44 +01:00
Roland Kaufmann
fa03df1e8b Replace data series handling with RAII type
The EclipseKeyword class takes care of cleaning up the handle after we
are done using it, and provides several convenience constructors that
make the code read easier.
2013-11-25 14:14:44 +01:00
Andreas Lauser
07ed5b4339 use bar instead of Pascal as the unit for the pressure field
Eclipse seems to write bars...
2013-11-01 11:36:06 +01:00
Andreas Lauser
f7864acc59 add some rates to the summary output, correct values
it turns out that the values within the WellState are surface volumes,
so they can be used directly once converted to daily rates...
2013-11-01 11:36:06 +01:00
Andreas Lauser
0123c3d700 write out water injection and oil production rates
Currently, it still writes out whatever conservation quantity which is
used by the solver (which is probably the mass of the oil/gas
mixture). TODO: convert these solver rates to "pure oil volume without
gas at the surface" and to "gas volume at the surface" rates.

thanks again to Joakim Hove for the pointers where to start kicking!
2013-11-01 11:36:06 +01:00
Andreas Lauser
a9929508a6 write out the reservoir state to the eclipse binary format
most code was shamelessly ripped from opm-core's EclipseGridParser,
but there are some additions (e.g. grids specified using the D[XYZ]V
Eclipse keywords can be used).

The code is located inside the new class "BlackoilEclipseOutputWriter"
(should probably renamed) and hooked up in
SimulatorFullyImplicitBlackoil and sim_fibo_ad.cc.

Also be aware that, to make this code work properly, the newest master
version of ERT is required (i.e. one which includes commit
5e4e9661720). In this context, I would like to thank Joakim Hove for
his support!
2013-11-01 11:36:06 +01:00