osae
841acacf78
RV is back in business.
2014-01-29 08:42:33 +01:00
osae
fa470063ca
Saturation table scaling and hysteresis.
...
This commit implements some additional scaling keywords. This includes
the ISWL-family that provide hysteresis behaviour via alternative
scaling of the tables. The old parser has been somewhat extended for
testing purposes. The commit also includes a slight refactoring of the
SatFunc-family where a new base class has been introduced.
2014-01-28 16:36:55 +01:00
Tor Harald Sandve
ed9e4e376a
Initialization using the RV keyword
...
The initial Rv value is specified using the RV keyword in the Parser.
The Rv values are used in the computation of the initial surface
volumes.
2014-01-10 16:07:02 +01:00
Arne Morten Kvarving
f1ba3d4b70
added: nonstandard 'RHO' field in eclipse grid parser
...
note that as this is a nonstandard field, there is no unit conversion
handling. use with caution
2013-12-12 12:43:30 +01:00
Roland Kaufmann
7d7470d36b
Add generic version of getXxxValue
...
This allows us to call getIntegerValue/getFloatingPointValue from
generic code where the type to be used is a template parameter.
2013-11-25 14:14:44 +01: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
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
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
a6e3bbd610
Updated calls to ecl_util_fmt_file() - result is by reference
2013-05-02 19:04:09 +02: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
25867007ed
Moved opm/core/eclipse/* to opm/core/io/eclipse/*.
2013-03-07 22:59:06 +01:00
