Jørgen Kvalsvik
04a368cfc6
Add missing opm-parser headers
...
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik
da411e49a5
Fixes includes wrt opm-parser PR-656
...
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2018-01-02 14:28:06 +01:00
Joakim Hove
0cf00f240b
Changed to use new table api from opm-parser.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
d77e33b5dc
Use cell depths based on averaging cell corners
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
ca902168ed
Change the number of integration points in the initialization
...
The number is changed from 100->2000 to increase accuracy.
2018-01-02 14:28:06 +01:00
Arne Morten Kvarving
e11257d8ce
fix Equilibration test by adding some fuzz
...
Backports parts of a7b1e69a45c14ec88a82b92ee704424f1ea1b41c
2018-01-02 14:28:06 +01:00
Andreas Lauser
b04db90cfe
use the error macros from opm-common
2018-01-02 14:28:06 +01:00
Joakim Hove
cbc41cfbf7
Relocated warning headers.
2018-01-02 14:28:06 +01:00
Joakim Hove
f7da1ca81c
Fxied bug in table-container use.
2018-01-02 14:28:06 +01:00
Joakim Hove
4e620e7eb6
Changed Table code to use TableContainer
2018-01-02 14:28:06 +01:00
osae
cb9d8709f9
Support for equil-initialisation for datum depth outside oil zone.
2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
ecb7dec752
Make grid in deck have larger number of cells.
...
This makes some tests succeed that use this deck only
for its properties and not its grid: if the grid in the
deck has fewer cells than the grid that is used for the
test we will fail in the SATNUM mapping.
2018-01-02 14:28:06 +01:00
Bård Skaflestad
b337714d4d
RegionMapping<>: Support arbitrary region IDs
...
This commit introduces a new public method, activeRegions(), that
retrieves those region IDs that contain at least one active cell.
We furthermore extend the cells() method to support lookup of
arbitrary region IDs. Non-active region IDs produce empty cell
ranges.
Intended use case is
for (const auto& reg : rmap.activeRegions()) {
const auto& c = rmap.cells(reg);
// use c
}
2018-01-02 14:28:06 +01:00
Bård Skaflestad
b08f89e68a
convertSats(): Transpose loop nest for locality of data
2018-01-02 14:28:06 +01:00
Bård Skaflestad
2cbf99fcde
Mark non-template functions in headers as 'inline'
2018-01-02 14:28:06 +01:00
babrodtk
f1e102a54e
Fixed several warnings
2018-01-02 14:28:06 +01:00
Andreas Lauser
973e89d4a4
InitStateEquil: fix valgrind complaint about uninitialized values
...
it seems that it was pure luck that this worked so far!
2018-01-02 14:28:06 +01:00
Joakim Hove
fd3a0ad136
Using TableManager to get tables.
2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
1375968541
Suppress warnings.
2018-01-02 14:28:06 +01:00
Joakim Hove
94ea28a2a0
Updated to use ParseMode.
2018-01-02 14:28:06 +01:00
Arne Morten Kvarving
9290cfe32e
fix tests
...
- cannot use BOOST_CHECK_CLOSE around 0 due to a relative test
- slacken a tolerance significantly
2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
fa53925642
Make some programs stricter about parameter parsing.
...
This applies to programs which always require at least one parameter.
2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
fedc92d1b4
Fix unneeded-internal-declaration warning.
...
Again related to anonymous namespace function only being used
in template functions.
2018-01-02 14:28:06 +01:00
Markus Blatt
a8ac4f053d
Put spaces around operators.
2018-01-02 14:28:06 +01:00
Markus Blatt
b4b9557b85
Rely on auto instead of querying the explicit type
...
via e.g. typename UgGridHelpers::Face2VerticesTraits<Grid>::Type
2018-01-02 14:28:06 +01:00
Markus Blatt
b942633b3c
Ported initStateEquil to using the GridHelpers.
...
Currently the keyword EQUIL is not supported by the fully
implicit blackoil simulator when using CpGrid. This
commit is a first step towards this as it makes the
implementation of initStateEquil generic.
2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
2770843d6f
Silence unused argument warning.
2018-01-02 14:28:06 +01:00
Andreas Lauser
baee24ecde
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...
2018-01-02 14:28:06 +01:00
Robert K
ab75ba3ee5
remove unused typedef to avoid compiler warning and keep code clean.
2018-01-02 14:28:06 +01:00
Andreas Lauser
87adfef018
adapt the the table related API changes of opm-parser
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
18dd2c6e39
Include goc and woc in the span for the phase pressure calculation
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
02f6d8f8eb
Remove fix for GOC and WOC above/below reservoir
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
efffb8c385
Fix sign error in the specified oil pressures at at WOC and GOC
...
The oil pressure at the contact for the special cases:
contact location po(contact)
GOC above -inf
GOC below +inf
WOC above -inf
WOC below +inf
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
11ac3d1ccd
Currectly handling GOC below and WOC above the reservoir The phase pressure of water and gas is set to inf when WOC and GOC is above and below the reservoir. This make sure the minimum saturation values are picked for these cases.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
a6b85d28a4
Fixes issues pointed out in the PR comments
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
151f967f4d
The water/gas pressures are only calculated if woc and goc lies within
...
the reservoar
The water/gas pressure is set to -inf when woc and goc is above or below
the reservoar.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
6038b4bb78
Changes in the ref. solution in the DeakAllDead test
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
3c7d481c8c
BUGFIX
...
Wrong placement of parentes
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
eb25a7bf5e
Implements initialization for constant capillary pressure functions
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
fe19d25bd6
Computes saturations based on depths
...
For constant capillar pressure function the saturation is
determined by cell depths:
Sg_max, Sw_min
----- goc ----
Sg_min, Sw_min
----- woc ----
Sg_min, Sw_max
2018-01-02 14:28:06 +01:00
osae
e4f3516fd3
Correcting the equil test.
2018-01-02 14:28:06 +01:00
osae
5be2c46aa8
Included inititalisation of surface volumes.
2018-01-02 14:28:06 +01:00
osae
9d9f5f003b
Make use of EclipseState for EQLNUM and SWATINIT.
2018-01-02 14:28:06 +01:00
osae
beffa1424c
Adjustments for vanishing oil phase.
2018-01-02 14:28:06 +01:00
osae
05b7347b1a
SWATINIT: Initialisation and capillary pressure scaling.
2018-01-02 14:28:06 +01:00
Andreas Lauser
9731539f6a
Glue in support for the grid property modifier keywords
...
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.
with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.
no ctest regressions have been observed with this patch on my machine.
2018-01-02 14:28:06 +01:00
Andreas Lauser
dcd79e787e
fix the equilibration test by using new values
...
thanks to @bska for the hints.
2018-01-02 14:28:06 +01:00
Andreas Lauser
0fc8fee4cc
add missing PVTW keywords to the decks used by the equil test
...
the test still fails, but the errors seem to be due to differences in
the saturation functions...
2018-01-02 14:28:06 +01:00
Andreas Lauser
8c8ed13c16
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.
2018-01-02 14:28:06 +01:00
Andreas Lauser
beed4544de
Implement multi-region PVT for all property classes
...
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
2018-01-02 14:28:06 +01:00