babrodtk
2d252964ed
Fixed several warnings
2015-09-03 15:17:10 +02:00
Andreas Lauser
1ec3a6065a
SaturationPropsFromDeck: fix some array index screw-ups in the twophase case
...
I don't think the code gets more beatiful because of this, but it
seems like it does not crash anymore.
2015-09-02 12:29:18 +02:00
Andreas Lauser
7905894a0f
"fix" the satfunc unit test
...
the derivatives changed in some instances compared to the old
implementations. this patch updates them to the new versions.
thanks to [at]atgeirr for discovering this.
2015-09-02 12:29:18 +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
48d4abef1a
remove the now obsolete SatFunc* classes
2015-09-02 12:29:18 +02:00
Andreas Lauser
4a81a0acf1
SaturationPropsFromDeck: add the code to calculate all saturation properties using opm-material
...
also remove the now obsolete code in that class.
2015-09-02 12:29:11 +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
Atgeirr Flø Rasmussen
3db9d9062e
Fix bug in test program.
2015-08-19 13:12:14 +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
a002781998
Bugfix with THP for injection wells
2015-08-19 13:12:14 +02:00
babrodtk
ede4945282
Removed superfluous line
2015-08-19 13:12:14 +02:00
babrodtk
a743efe819
Refactoring
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
24f91aa248
Use the correct (new) method from the Group class for group RESV.
...
Production controls now are no longer initialised from injection control data.
2015-08-13 10:21:24 +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
Atgeirr Flø Rasmussen
23fd80d0b2
Bugfix: add forgotten setIndex() call.
2015-08-12 13:38:10 +02:00
Atgeirr Flø Rasmussen
5216550cdf
Suppress warnings.
2015-08-10 16:07:45 +02:00
Robert Kloefkorn
9c8460d471
TofDiscGalReorder and TofReader: remove warnings due to new boost version.
2015-08-07 12:02:59 +02:00
Atgeirr Flø Rasmussen
cb512ef10d
Merge pull request #839 from atgeirr/handle-new-umfpack
...
Define the UF_long type if necessary.
2015-08-07 11:11:23 +02:00
Joakim Hove
23b3670c1e
Updated to use ParseMode.
2015-08-06 15:56:51 +02:00
Atgeirr Flø Rasmussen
b80a202287
Define the UF_long type if necessary.
...
The UF_long type is deprecated in UMFPack, and actually seems
to be removed from the latest versions.
2015-08-06 09:54:05 +02:00
Atgeirr Flø Rasmussen
7b9bdb6017
Do not use pressure() until after init() in BlackoilState.
2015-07-08 17:58:38 +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
85cfd8da2a
use the multiplexer saturation function in SaturationPropsFromDeck
...
this makes it possible to switch to different saturation functions
again. So far the only supported function besides the default one is
the one which implements the "Stone 2" model.
2015-06-29 14:49:20 +02:00
Andreas Lauser
e3ab614c73
SaturationPropsFromDeck: make the jump to fluid states
...
this means the following changes:
- the "SatFuncGwseg" class is converted
- for now, Gwseg is the only saturation function supported by
SaturationPropsFromDeck. (will be changed in later commits.)
- the funcForCell() method of SaturationPropsFromDeck is removed as it
just occludes things
2015-06-29 14:49:20 +02:00
Andreas Lauser
2d5798f51a
SaturationPropsFromDeck: remove the 'SatFuncSet' template parameter
...
in any reasonable simulator which reads an ECL deck the deck is going
to decide which saturation function is to be used and not the outside
code. also, the table this which function will be using is not really the
calling code's business. (for any reasonable deck it is always going to
be a non-uniform table so it makes a lot of sense to avoid unnecessary
complexity IMO.)
this patch temporarily removes the ability to use anything except the
ECL default saturation function ("Gwseg"). this ability will be
restored later in this patch series.
2015-06-29 14:49:20 +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
Andreas Lauser
55786028fd
remove obsolete and empty file SaturationPropsFromDeck.cpp
2015-06-26 13:01:22 +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
Fredrik Gundersen
13f30e294a
Added support for WPIMULT
2015-06-02 13:24:37 +02:00
Atgeirr Flø Rasmussen
a5da86a9ec
Silence multiple warnings.
...
Also add more warnings to the disabling list of disable_warnings.h.
2015-05-28 14:05:09 +02:00
Markus Blatt
7f266458b5
Fix creation of initial value for computing the max (Fixes PR #805 ).
...
Bård spotet a bug after PR #805 was merged. Indead returning
-numeric_limits<type>::min() does not make sense for integral
values. This commit resorts to returning numeric_limits<type>::min().
Kudos to Bård for his attention.
2015-05-27 15:03:28 +02:00
Markus Blatt
baf76dc1bf
Test the global reductions for more types.
...
Previously, we only tested with int which left at least
one bug unreveiled. Now we test with unsigned integers
and floating point values in addition.
2015-05-27 14:49:30 +02:00
Markus Blatt
8fce12c526
Update copyright
2015-05-27 11:07:16 +02:00
Markus Blatt
a4e28119a3
Adds the possibility to compute a parallel inner product.
2015-05-27 11:07:15 +02:00
