babrodtk
2d252964ed
Fixed several warnings
2015-09-03 15:17:10 +02:00
Andreas Lauser
750e9aedf4
use a .cpp instead of an _impl.hpp file for SaturationPropsFromDeck
...
this avoids having to include the "Evaluation.hpp" file as the first
thing in the morning.
2015-09-02 12:29:18 +02:00
Andreas Lauser
823f3a4032
InitStateEquil: fix valgrind complaint about uninitialized values
...
it seems that it was pure luck that this worked so far!
2015-09-02 12:29:18 +02:00
Andreas Lauser
97f62d5f6f
add a fluid state where scalars include the derivatives w.r.t. the saturations
2015-09-02 12:23:24 +02:00
Andreas Lauser
d57d121c38
ExplicitArraysFluidState: always make it appear threephase to the exterior, but also accept twophase arrays
2015-09-02 12:23:24 +02:00
Joakim Hove
08a77e36d0
Using TableManager to get tables.
2015-09-01 12:58:09 +02:00
babrodtk
6365579866
Fixed whitespace
2015-08-19 13:20:58 +02:00
Atgeirr Flø Rasmussen
68428ad856
Do thp init() differently.
2015-08-19 13:12:15 +02:00
babrodtk
60a66165f5
Minor fixes
2015-08-19 13:12:14 +02:00
babrodtk
9458fcc498
Fixed several compiler warnings
2015-08-19 13:12:14 +02:00
babrodtk
9d602f0cd0
Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table'
2015-08-19 13:12:14 +02:00
babrodtk
25155aefbb
More integration of VFP tables
2015-08-19 13:12:03 +02:00
babrodtk
92628187b0
Initial integration of VFP
2015-08-19 13:11:41 +02:00
babrodtk
c6311decdc
Fixed warning
2015-08-19 13:10:48 +02:00
babrodtk
ffac75a873
Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table'
2015-08-19 13:10:48 +02:00
babrodtk
83f6b02941
More integration of VFP tables
2015-08-19 13:10:48 +02:00
babrodtk
f320b04c4d
Initial integration of VFP
2015-08-19 13:10:48 +02:00
Atgeirr Flø Rasmussen
84acbc4601
Make saturation functions work with two phases again.
...
Note that this changes ExplicitArraysFluidState to take
a run-time argument for the number of phases.
2015-08-12 13:38:32 +02:00
Robert Kloefkorn
d3962fb7cf
SimulatorState: added copyright
...
BlackoilState: added copyright
Also, small docu fix.
2015-07-08 13:23:36 +02:00
Robert Kloefkorn
78c53fa1ed
SimulatorState: store all data in a vector to allow for flexibility when used with
...
derived states.
BlackoilState: adjusted to SimulatorState changes.
2015-07-08 13:23:36 +02:00
Atgeirr Flø Rasmussen
131bbd5846
Fix unused argument warnings.
2015-07-08 12:37:11 +02:00
Andreas Lauser
5af89a0e55
add some fluid state classes
...
namely BlackoilStateToFluidState which takes a BlackoilState object
and exposes it as a opm-material like fluid state object. Similar for
ExplicitArraysFluidState, which takes raw arrays.
since fluid states are a local API, the index of the cell to be used
for these two classes must be set externally. The advantage of this
concept is that it is possible to make "saturation functions" which
not only depend on saturations but also on arbitrary other quanties
(like temperature or phase composition) without having to change the
API of the "saturation" functions.
2015-06-29 14:49:20 +02:00
Atgeirr Flø Rasmussen
e8dc0a7148
Add missing include statement.
2015-06-22 13:04:14 +02:00
Edvin Brudevoll
b4e01187ff
OPM-188: Fixup after review
2015-06-17 09:41:00 +02:00
Markus Blatt
802895acaf
Allow to prevent SimulatorReport for printing to std::cout.
...
This commit adds a verbose flag to the constructor of
SimulatorReport to allow for deactivating any
output to std:cout. This is handy for parallel runs where we only
want to print statistics on one process.
2015-05-08 11:12:23 +02:00
Atgeirr Flø Rasmussen
928660ec0f
New method SimulatorReport::reportFullyImplicit().
...
It does not make sense to report transport and pressure separately
for fully implicit solvers. It still makes sense to separate solver
from init and output though.
2015-04-21 10:48:02 +02:00
Atgeirr Flø Rasmussen
2d534f0536
Fix property method calls.
...
Cell argument can not be null for BlackoilPropertiesFromDeck class.
2015-03-23 16:19:40 +01:00
Robert Kloefkorn
a77f681999
iostream --> ostream.
2015-03-04 14:48:50 +01:00
Robert Kloefkorn
e75551127f
SimulatorReport: add total number of newton and linear iterations to report struct.
2015-03-04 14:01:13 +01:00
Atgeirr Flø Rasmussen
8a1b35d4f6
Fix unneeded-internal-declaration warning.
...
Again related to anonymous namespace function only being used
in template functions.
2015-03-02 10:28:55 +01:00
Markus Blatt
7539a80ed2
Put spaces around operators.
2015-02-20 14:30:06 +01:00
Markus Blatt
c1d61705c9
Rely on auto instead of querying the explicit type
...
via e.g. typename UgGridHelpers::Face2VerticesTraits<Grid>::Type
2015-02-20 14:29:05 +01:00
Markus Blatt
5b8442d985
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.
2015-02-20 09:39:50 +01:00
Markus Blatt
95f62e6e12
Improve the documentation a bit.
2015-02-05 15:43:48 +01:00
Robert K
1f2a429a59
BlackoilState: added forgotten rv to equal method.
2015-01-29 11:07:24 +01:00
Tor Harald Sandve
880026e893
Fix comments.
2015-01-09 09:10:10 +01:00
Tor Harald Sandve
82eafbb510
Renaming well is shut to well is stopped.
...
Rename the the meaning for shut as whats used in Eclipse.
STOP: Well stopped off above the formation. I.e. allow for flow in the
well.
SHUT: Well completely isolated from the formation. The well is removed
from the well list.
2015-01-09 09:10:10 +01:00
Atgeirr Flø Rasmussen
06382498d2
Silence unused argument warning.
2014-12-02 09:17:11 +01:00
Andreas Lauser
64107ecc1b
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
Robert K
da6b4109ba
remove unused typedef to avoid compiler warning and keep code clean.
2014-10-24 12:51:57 +02:00
Andreas Lauser
36e3538b04
adapt the the table related API changes of opm-parser
2014-09-19 14:40:35 +02:00
Tor Harald Sandve
5c244bd94e
Include goc and woc in the span for the phase pressure calculation
2014-09-02 14:49:09 +02:00
Tor Harald Sandve
f960de4b0b
Remove fix for GOC and WOC above/below reservoir
2014-09-02 14:49:09 +02:00
Tor Harald Sandve
18de1c190a
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
2014-08-27 14:35:01 +02:00
Tor Harald Sandve
193872a1fe
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.
2014-08-27 10:10:55 +02:00
Tor Harald Sandve
c1fc8aeb7d
Fixes issues pointed out in the PR comments
2014-08-18 08:57:23 +02:00
Tor Harald Sandve
f3a9dac5bb
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.
2014-08-15 08:56:35 +02:00
Tor Harald Sandve
51b8b44e35
BUGFIX
...
Wrong placement of parentes
2014-08-11 12:45:52 +02:00
Tor Harald Sandve
91bdb7dde2
Implements initialization for constant capillary pressure functions
2014-08-11 11:23:15 +02:00
Tor Harald Sandve
bf635f3fe9
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
2014-08-11 11:22:47 +02:00
