Commit Graph

185 Commits

Author SHA1 Message Date
Tor Harald Sandve
b935697838 add missing include directives 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
Kari B. Skjerve
09e572a15e changes after pull to opm/opm-core 2013-10-09 13:23:24 +02:00
Kari B. Skjerve
97bdba139f Only output NTG if not synthetic 2013-10-08 17:39:42 +02:00
Kari B. Skjerve
d53e06ec7c Changed EclipseGridParser and CornerpointChopper to handle NTG 2013-10-08 16:33:19 +02:00
Andreas Lauser
23f215bec4 convert users of MESSAGE to OPM_MESSAGE 2013-09-05 13:04:38 +02:00
Andreas Lauser
c25ec5999e convert users of the ASSERT and the ASSERT2 macros to standard assert() 2013-09-05 13:04:37 +02:00
Andreas Lauser
19e5d5cea2 convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
Andreas Lauser
d11db08084 include iostream in the files which use std::cerr or std::cout
for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.

While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
2013-09-05 13:04:37 +02:00
Andreas Lauser
70949c6edb use std::shared_ptr instead of boost::shared_ptr
our policy is that we only use boost if necessary, i.e., if the oldest
supported compiler does not support a given feature but boost
does. since we recently switched to GCC 4.4 or newer, std::shared_ptr
is available unconditionally.
2013-08-08 13:25:58 +02:00
Bård Skaflestad
2dac509c97 Merge pull request #289 from andlaus/make-gcc44-mandatory
Make gcc44 mandatory
2013-07-30 13:25:35 -07:00
Andreas Lauser
562bcf2e7d replace boost::array by std::array
GCC 4.4 supports std::array, so there is not much point in keeping
compatibility with ancient compilers...
2013-07-30 17:46:32 +02:00
Joakim Hove
0595269934 Added static_cast<void> to avoid warnings about unused variables 2013-07-30 15:41:32 +02:00
Joakim Hove
bdd587bf93 Minor merge fixup - sorry 2013-07-30 14:56:21 +02:00
Joakim Hove
07ed1a19f1 Merge remote-tracking branch 'upstream/master' into save-eclgrid-after-deactivating-cells
Conflicts:
	opm/core/io/eclipse/EclipseGridParser.cpp
	opm/core/io/eclipse/EclipseGridParser.hpp
2013-07-30 14:49:37 +02:00
Júlio Hoffimann
8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Joakim Hove
9cc3d4dd2d Changed EclipseGridParser::saveEGRID() to take globalCells as input 2013-07-25 12:08:08 +02:00
Joakim Hove
8c32146093 Rewritten EclipseGridParser to use input actnum instead of ACTNUM from deck 2013-07-24 14:42:40 +02:00
Markus Blatt
68eb3fbcb1 Changed std::tr1 occurences to boost.
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
2013-07-04 16:04:35 +02:00
Atgeirr Flø Rasmussen
d42bccaa8e Unit conversion factor of RS is not 1 for FIELD units. 2013-05-30 14:37:48 +02:00
Joakim Hove
1281d17b60 Changed writeECLDate() to write UNFORMATTED restart files. 2013-05-02 19:06:43 +02:00
Joakim Hove
a6e3bbd610 Updated calls to ecl_util_fmt_file() - result is by reference 2013-05-02 19:04:09 +02:00
Andreas Lauser
884c5ab027 make config.h the first header to be included in any compile unit
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen
c1657b427a Finished unification of linear interpolation.
The functions of linInt.hpp are now used everywhere, but:
 - linInt.hpp -> linearInterpolation.hpp (better name)
 - linearInterpolationExtrap() -> linearInterpolation() (extrapolate by default)
2013-03-22 15:33:07 +01:00
Atgeirr Flø Rasmussen
a8097317a5 Make all codes use the same linear interpolation routines. 2013-03-22 15:28:16 +01:00
Atgeirr Flø Rasmussen
f84fa2c4bd Moved the VAG code to namespace Opm. 2013-03-21 15:01:17 +01:00
Atgeirr Flø Rasmussen
19767d5d97 Fix syntax error. 2013-03-19 11:17:24 +01:00
Atgeirr Flø Rasmussen
9a2f2c48fd Fixed conditional compilation issues with UMFPACK.
This should fix the issue reported in #208 introduced in #203.
2013-03-19 10:30:27 +01:00
Joakim Hove
1781d1fb65 Added integer flag to ecl_file_open: To allign with ert commit: bd542a45c5e72 2013-03-14 16:15:28 +01:00
Atgeirr Flø Rasmussen
c1700e663e Changed overlooked include path. 2013-03-12 13:36:29 +01:00
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
ee271caae1 Moved opm/core/vag_format/ -> opm/core/io/vag/ 2013-03-08 07:54:56 +01:00
Atgeirr Flø Rasmussen
25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00