Jørgen Kvalsvik
04d605159f
Change Deck access methods/types to references
...
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.
https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00
Joakim Hove
83a32061f7
Removed opm_memcmp_double() - use cmp from common.
2016-02-14 21:41:51 +01:00
Jørgen Kvalsvik
50c1bbdc85
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.
2016-01-21 09:42:51 +01:00
Joakim Hove
718ec8e791
Changed to use new table api from opm-parser.
2016-01-08 14:47:09 +01:00
Tor Harald Sandve
f24dcf1957
Use cell depths based on averaging cell corners
2015-11-24 10:17:12 +01:00
Atgeirr Flø Rasmussen
c0cd038e97
Merge pull request #920 from totto82/interpolation_points
...
Change the number of integration points in the initialization
2015-11-09 16:52:30 +01:00
Tor Harald Sandve
3086e67ee2
Change the number of integration points in the initialization
...
The number is changed from 100->2000 to increase accuracy.
2015-10-30 08:14:10 +01:00
Arne Morten Kvarving
5674635125
fix Equilibration test by adding some fuzz
...
Backports parts of a7b1e69a45c14ec88a82b92ee704424f1ea1b41c
2015-10-26 11:21:26 +01:00
Andreas Lauser
d41f989a78
use the error macros from opm-common
2015-10-08 11:42:15 +02:00
Joakim Hove
d54899ba07
Fxied bug in table-container use.
2015-10-05 15:59:08 +02:00
Joakim Hove
adb333177d
Merge pull request #886 from joakim-hove/table-container
...
Changed Table code to use TableContainer
2015-10-05 14:46:49 +02:00
Joakim Hove
2dc7d1cef7
Changed Table code to use TableContainer
2015-10-05 09:59:29 +02:00
osae
04107a1955
Support for equil-initialisation for datum depth outside oil zone.
2015-09-21 18:22:11 +02:00
Robert Kloefkorn
8163137b2c
WellState: move typedefs into public section and include string.
2015-09-16 12:36:05 +02:00
Robert Kloefkorn
50bf1d7e62
WellState: add assertion on wells->name[].
2015-09-16 09:48:43 +02:00
Robert Kloefkorn
14d7ce43a6
WellState: move mapping from well name to well index to here from autodiff's WellStateFullyImplicitBlackoil.
2015-09-16 09:48:43 +02:00
Bård Skaflestad
99368d73d2
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
}
2015-09-15 15:33:22 +02:00
Bård Skaflestad
b5ba068309
convertSats(): Transpose loop nest for locality of data
2015-09-15 15:33:22 +02:00
Bård Skaflestad
7090b58f03
Mark non-template functions in headers as 'inline'
2015-09-15 15:33:22 +02:00
Robert Kloefkorn
67200b54e6
SimulatorState: export num_cells_ and num_faces_ and allow to register data from any
...
class. This is needed in the parallel output class. A formal interface for the state
class needs to be introduced.
2015-09-14 12:57:36 +02:00
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