Commit Graph

48 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
5059f66bad Squash warnings by removing or commenting out unused parameters. 2014-08-28 14:14:22 +02:00
Andreas Lauser
db3a616a2f PvtLiveOil: fix ordering of arguments
the strange thing is that this worked as-is. The only explaination
which I have for this is that these code paths are unused...
2014-07-07 11:58:54 +02:00
Andreas Lauser
31c97ca172 change item names used to query the PVCDO keyword
That's similar to having fun with a vodoo doll...
2014-06-06 13:18:57 +02:00
Andreas Lauser
93f7a47062 add missing include
for some reason this seems to be only required by GCC 4.4
2014-06-05 14:32:58 +02:00
Andreas Lauser
2545b423fc handle the case that the compressed to logically cartesian array is NULL 2014-06-04 11:11:35 +02:00
Andreas Lauser
cbb5910a93 incorperate the review comments/decisions for multi-region PVT
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
2014-06-04 11:11:35 +02:00
Andreas Lauser
fbd8d42e8d Implement multi-region PVT for all property classes
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
2014-06-04 11:11:35 +02:00
Andreas Lauser
c1c3f9d2e0 remove the table_t type
that was an artifact only required for the old parser
2014-05-21 11:22:43 +02:00
Andreas Lauser
f96417e81c rename all "newParserDeck" objects to "deck"
The "new" parser is now "the" parser...
2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1 remove EclipseGridParser compatibility methods from all classes 2014-05-21 11:22:43 +02:00
Andreas Lauser
89f4a6db5b adapt to the renames of the table classes in opm-parser
basically, "Opm::SimpleTable" becomes "Opm::SingleRecordTable".
2014-04-28 18:47:28 +02:00
Andreas Lauser
7917295923 add opm-parser variants for the incompressible property classes 2014-04-25 14:25:54 +02:00
Atgeirr Flø Rasmussen
049df8bc60 Avoid signed/unsigned mismatch. 2014-04-15 13:39:44 +02:00
Andreas Lauser
693ac17aed fix typo: it's PVCDO, not PVDCO
(since the parser did not have a definition for this keyword until
_very_ recently, I severly doubt that these code paths have been used
recently...)
2014-04-11 11:56:27 +02:00
Atgeirr Flø Rasmussen
b07cd277a7 Merge pull request #561 from totto82/fix_viscosity_table
Fix undersaturated viscosity table
2014-04-04 22:41:11 +02:00
Tor Harald Sandve
4576917061 Fix undersaturatd viscosity table
Data is now correctly read from ununderdatTable instead of pvtgTable
2014-04-04 16:06:19 +02:00
osae
782a5934c9 Fixed Bg versus 1/Bg issue. 2014-03-28 17:14:16 +01:00
Andreas Lauser
5c55fb7341 fix densities for new parser in BlackoilPvtProperties
that is one of the more subtle differences between the old and the
new parsers. now, valgrind does not seem to complain anymore, so everything
should be All Right (TM) ;)
2014-03-18 20:42:40 +01:00
Atgeirr Flø Rasmussen
0eb32276fb Allow direct interpolation of props with new parser.
After transitioning to use the new parser, the SinglePvtDead class was never
used even when the 'samples' argument used to control usage was zero or negative.
The resulting construction of SinglePvtDeadSpline objects was then failing.

This change adds a new constructor to SinglePvtDead, and restores the ability
to control spline usage with the samples argument.
2014-03-03 09:17:11 +01:00
Andreas Lauser
ec4423cab7 remove needless inclusion of <iostream>
thanks to @bska for catching this one...
2014-02-10 14:40:37 +01:00
Andreas Lauser
4542a43dbf add variants of all methods which take a deck of the new parser to the PVT properties 2014-02-10 14:40:37 +01:00
Atgeirr Flø Rasmussen
543230c8cf Suppress warnings in unimplemented functions.
This prevents warnings from functions that are right now just
a throw statement. Also cleaned up a few whitespace issues nearby.
2014-02-05 14:27:51 +01:00
Tor Harald Sandve
06fbc93fef Fixing comments
The comment now currently say 1/Bg
2014-01-24 10:14:33 +01:00
Tor Harald Sandve
292b74e189 Change the extrapolation in the livegas pvts
The special extrapolation for pressure values above
the maximum table value is removed to sync with Mrst
2014-01-10 16:07:02 +01:00
Tor Harald Sandve
598c7a0cb8 Added pvt functionality for wetgas
The pvt interface is extended to handle wet-gas systems:
1. rvSat is added as a function in the PVT interface
2. SinglePvtLiveGas computes the pvt values and its derivatives
3. The old rbub variable is changed to rsSat for clearity
4. The new interface is tested in test_blackoilfluid with data from
liveoil.DATA and wetgas.DATA
2014-01-10 16:07:02 +01:00
Bård Skaflestad
9e1e50d159 Switch condition interface to phase presence facility
Commit a5a4d7b introduced density and viscosity evaluators into the
SinglePvtInterface that accepted an externally assignable condition
to distinguish saturated from unsaturated cases.  As a result of a
few low-level technical problems with that approach, this commit
changes those affected interfaces to use the black-oil specific
'PhasePresence' facility of commit a033329 instead.

Update tests and callers accordingly.

Suggested by: @andlaus
Approved by:  @atgeirr
2013-12-03 16:12:52 +01:00
Tor Harald Sandve
a5a4d7ba39 Added functions for b and mu with isSaturated as input.
Functions for volume factor and viscosity that explicitly take a boolean
variable indicating whether the fluid is saturated or not is added to
the SinglePvtInterface.

Corresponding changes are done in the dependent PVT files.

The new functionality is tested in test_blackoilfluid
2013-11-28 15:56:17 +01:00
Tor Harald Sandve
1d3be7b85a Equality is now treated as saturated
The calculated gas resolution factor is compared to
the tabulated resolution to check wether the oil is saturated
or not. The new test judges equality as saturated. This
is cruscial as the gas resolution is set to equal the tabulated value
for the saturated case in the appleyard process.
2013-11-28 15:56:17 +01:00
Roland Kaufmann
13d145fc1d Use unsigned when iterating through vector indices
A vector can of course never contain a negative number of elements, so
naturally size() returns size_t instead of a regular int. This costs us
a warning unless we also change the loop counter (since it is only used
to index that vector).
2013-10-09 15:09:14 +02:00
Atgeirr Flø Rasmussen
83c6d5255b Merge pull request #386 from totto82/propsMRST
Changes to the props in order to  sync with MRST (Eclipse)
2013-10-07 03:41:09 -07:00
Bård Skaflestad
fdc6c7b6ed Remove unused "typedef"s
CLang and recent versions of GCC warn about unused "typedef"s.  This
change-set removes currently known instances in opm-core.
2013-09-26 19:22:59 +02:00
Tor Harald Sandve
fa46810511 The old extrapolation code for the unsaturated table is no removed 2013-09-24 15:21:58 +02:00
Tor Harald Sandve
badc3c0e9e Extrapolate unsaturated function values as in Eclipse and Mrst 2013-09-24 11:14:22 +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
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
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
Tor Harald Sandve
01bb02f4cd Adds the new interface to SinglePvtLivGas 2013-05-27 11:14:39 +02:00
totto82
1c904aa451 Add new fluid interface
- in progress
2013-05-22 12:57:18 +02:00
Atgeirr Flø Rasmussen
280bf30a26 Add phaseUsage() method to BlackoilPropertiesInterface.
Also implement method in derived classes.
2013-05-13 16:20:00 +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
7f9a47d64c Use markup for parameter lists. 2013-03-22 11:09:38 +01:00
Atgeirr Flø Rasmussen
34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
fa31f17885 Moved fluid -> props and subdirs.
This is a non-compiling commit.
2013-03-14 09:56:48 +01:00