Commit Graph

69 Commits

Author SHA1 Message Date
Andreas Lauser
2a52c2926d add a wrapper for thermal water PVT objects 2015-03-17 12:40:07 +01:00
Andreas Lauser
0aa7620a0e PVT classes: do not implement temperature dependence directly anymore
instead, we will be going with wrapper classes around the PvtInterface
in the next commits. this considerably reduces the amount of
copy-and-paste required for temperature support.
2015-03-17 12:40:05 +01:00
Atgeirr Flø Rasmussen
13df6b91b7 Suppress unused argument warning. 2015-02-17 10:27:19 +01:00
Andreas Lauser
8dce4982fc PvtConstCompr: initialize the temperature vs viscosity table pointers in all constructors
this fixes opm-autodiff's "boprops_ad" unit test. thanks to
[at]atgeirr for pointing this out.
2015-02-03 15:44:25 +01:00
Andreas Lauser
c4ca344026 PVT classes: implement temperature dependent viscosity
this is implemented such that if the simulation is unchanged,
viscosities are assumed to be not temperature dependent. (only if
pvtObject->set{Oil,Wat}visctTables() is called, temperature dependence
is considered.)
2015-02-03 12:27:41 +01:00
Markus Blatt
fefd52a8be Fixes some unused variable warnings. 2015-01-23 20:58:37 +01:00
Andreas Lauser
e530ce03d8 PVT properties: allow them to be temperature dependent
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
2014-12-01 20:06:31 +01:00
Atgeirr Flø Rasmussen
91baeea8d3 Rename variable to avoid shadowing. 2014-11-24 10:54:30 +01:00
Kai Bao
ef3e524c30 Changing nColumns to nRows. 2014-09-23 13:17:47 +02:00
Kai Bao
175da5450f Changing the location of * in long formula. 2014-09-22 14:29:18 +02:00
Kai Bao
6a43935ea3 Deleting some commented lines. 2014-09-22 14:26:00 +02:00
Kai Bao
09404202da Changing the naming in PvtDead.
To be consistent with the naming int PvtLive.
2014-09-22 14:21:33 +02:00
Kai Bao
5d3017e6c6 Merge remote-tracking branch 'upstream/master' into PVT_viscosity_try 2014-09-22 13:01:13 +02:00
Kai Bao
ee73105c95 Using resize to allocate memory for 1/BMu. 2014-09-22 10:28:23 +02:00
Andreas Lauser
bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Kai Bao
2b18b8f27f Finshing changing Pvt_liveGas
Remains to be verfied.
2014-09-18 15:28:38 +02:00
Kai Bao
eadbffa99b Changing the PvtLiveOil to use 1/BV for viscosity.
Pssing the simple 2D test.
2014-09-18 12:46:45 +02:00
Kai Bao
0b69961d9e A little more comment about B and b. 2014-09-17 11:15:58 +02:00
Kai Bao
d393d147a4 Updating the calculation of mu and dmudp for PvtDead. 2014-09-14 17:33:43 +02:00
Kai Bao
d9acd0f3b8 Rewriting the d_mu_d_p for deadGas. 2014-09-14 16:24:37 +02:00
Kai Bao
d9eb3ea30f Chaning using the new interpolation for viscosity 2014-09-12 13:39:16 +02:00
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