Commit Graph

299 Commits

Author SHA1 Message Date
Joakim Hove
08d6cbcafa Added test for SHUT well 2014-10-07 12:12:15 +02:00
Joakim Hove
6a16b0f1e5 Removed 'dead' data at the end of test data. 2014-10-07 12:11:17 +02:00
Kai Bao
ee265f5cb5 Changing the tolerance for blackoilfluid tests.
Using the original strict relative tolerance for other properties than viscosity.
2014-09-23 14:38:32 +02:00
Kai Bao
ad54f1aa62 Fixing test_wetgas in test_blackoilfluid. 2014-09-22 13:19:35 +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
be26c0af18 Fixing the blackoilfluid test. 2014-09-22 12:29:40 +02:00
Andreas Lauser
88df84157d blackoil fluids test: add section markers to make EclipseState happy
this is necessary because tables now must be queried using
EclipseState instead of directly. This implies that EclipseState can
be instantiated in the first place...

TODO (?): allow EclipseState instatiation for decks without a grid.
2014-09-19 15:27:12 +02:00
Andreas Lauser
bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Bård Skaflestad
9784df8024 Merge pull request #641 from atgeirr/fix-warnings
Fix warnings
2014-08-28 16:11:12 +02:00
Bård Skaflestad
1ce427433b Move local type tags out of individual tests.
This fixes build on GCC 4.4.
2014-08-28 15:00:49 +02:00
Bård Skaflestad
e77ebf8d22 Use less restrictive test predicate
This commit replaces uses of BOOST_REQUIRE_* with corresponding
BOOST_CHECK_* facilitites.  This allows greater test coverage if an
individual test fails.

Suggested by: [at] atgeirr
2014-08-28 14:15:57 +02:00
Atgeirr Flø Rasmussen
5059f66bad Squash warnings by removing or commenting out unused parameters. 2014-08-28 14:14:22 +02:00
Bård Skaflestad
37dfc4a3b5 Add facility for accessing active subset of global data array
This commit introduces a fairly general mechanism for accessing the
active subset of a global grid (property) array.  Essentially, this
takes on the role of translating the active cell index through the
"global_cell" mapping when accessing, e.g., the net-to-gross data
value.

The primary component is class template

    Opm::GridPropertyAccess::Compressed<DataArray,Tag>

which implements a read-only

    value_type operator[](const int c)

that encapsulates and performs the compressed-to-global cell index
translation.  Template parameter "DataArray" is intended as a policy
parameter that for instance wraps access to a "GridProperty<T>" from
module opm-parser (with a fall-back default value if the data is not
specified on input).  The "Tag" parameter is a provision for type
safety--e.g., to prevent passing a region ID into a function that
requires a porosity value.
2014-08-27 21:19:41 +02:00
Atgeirr Flø Rasmussen
f74a0bb3e6 New class MinpvProcessor, and test. 2014-08-25 15:20:01 +02:00
Atgeirr Flø Rasmussen
393e7af8b2 Use new constructor for EclipseGrid. 2014-08-22 19:54:26 +02:00
Atgeirr Flø Rasmussen
557fa6167c Remove unnecessary grid from fluid test. 2014-08-21 14:18:41 +02:00
Tor Harald Sandve
c323345d3b Changes in the ref. solution in the DeakAllDead test 2014-08-12 07:08:57 +02:00
osae
9b30660d1e Correcting the equil test. 2014-08-11 13:19:17 +02:00
Robert Kloefkorn
39e0a2b7c4 Make code compile with dune trunk version (ie 3.0-git). This should include support for
dune 2.3.
2014-08-06 14:00:54 +02:00
Andreas Lauser
493650d2b1 EclipseWriter: Don't use the deck directly anymore
instead, use Opm::EclipseState. This requires to pass the PhaseUsage
object to the EclipseWriter, as this one cannot be recovered from
EclipseState (yet?).
2014-07-18 11:20:28 +02:00
Andreas Lauser
dc5fc64e98 EclipseWriter: pass an EclipseState to it and use it where possible 2014-07-16 14:34:24 +02:00
Andreas Lauser
d8e9b5be21 EclipseWriter: add unit test 2014-07-16 10:41:25 +02:00
Atgeirr Flø Rasmussen
ace1e3306a Merge pull request #607 from osae/swatinit
Scaling of capillary pressure / initialisation from kw SWATINIT.
2014-07-07 14:10:02 +02:00
Bård Skaflestad
83b1cc7438 well_controls: Add deep-copy (clone) support
New function well_controls_clone(), implemented in terms of the
public API only, mirrors the objective of function clone_wells(),
only for well control sets.  Add a basic test to demonstrate the
function too.
2014-07-03 16:09:56 +02:00
osae
89137e8cd0 Make use of EclipseState for EQLNUM and SWATINIT. 2014-06-26 14:46:57 +02:00
Andreas Lauser
0c47d27827 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.
2014-06-11 13:48:49 +02:00
Andreas Lauser
f96dfc2e0f fix the equilibration test by using new values
thanks to @bska for the hints.
2014-06-04 13:26:37 +02:00
Andreas Lauser
947d1644bd 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...
2014-06-04 11:35:24 +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
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
Joakim Hove
a9d11675d4 Fixed error in testdata tests/CORNERPOPINT_ACTNUM.DATA 2014-04-29 09:19:07 +02:00
Andreas Lauser
1d7ed18419 convert the examples and the tests to opm-parser 2014-04-25 14:25:54 +02:00
Joakim Hove
0fd91e0c16 Changed the data files used for testing:
1) Added RUNSPEC section
2) Replaces DEPTHZ keyword with TOPS keyword.
2014-04-24 15:26:39 +02:00
Joakim Hove
0c9212a605 ERT-601: Added GridManager() constructor which takes a Parser::EclipseGrid instance 2014-04-22 17:16:11 +02:00
Joakim Hove
8260d945fa Added function grid_equal() to compare two UnstructuredGrid instances. 2014-04-22 15:13:54 +02:00
Bård Skaflestad
f9249b1d5d Merge pull request #572 from andlaus/add_tabdims_to_some_decks
add the missing TABDIMS keyword to the live oil and wet gas unit test data files
2014-04-16 13:48:56 +02:00
Andreas Lauser
e1cde4f4ab add the missing TABDIMS keyword to the live oil and wet gas unit test data files
these are required for the new parser. (without them, these files
would be invalid AFAICT, but I'm not an Eclipse file format expert...)
2014-04-16 11:16:58 +02:00
Atgeirr Flø Rasmussen
ef5a21d710 Add (all-zero) initialisation of new EquilRecord fields. 2014-04-15 13:41:10 +02:00
Bård Skaflestad
f3ebd78296 Merge pull request #538 from blattms/parallel-solver-support
Added support for parallel dune-istl solvers
2014-04-08 00:17:35 +02:00
Atgeirr Flø Rasmussen
a47c9c7330 Merge pull request #544 from osae/equil-init
Equil init
2014-04-04 22:39:37 +02:00
Markus Blatt
67fffa0951 Fix matrix size and symmetry for parallel runs. 2014-04-04 21:01:32 +02:00
Markus Blatt
3375e313e5 Merge remote-tracking branch 'upstream/master' into parallel-solver-support
Removed conflicts in:
	opm/core/linalg/LinearSolverIstl.cpp
2014-04-04 20:38:52 +02:00
osae
04d8322fa0 Some additional tests: live gas, RSVD and RVVD 2014-04-03 09:07:00 +02:00
osae
d0da7a9437 Update tests and provide some eclipse output. 2014-03-31 15:32:06 +02:00
Kai Bao
e5761412ba Added the test code and test data.
Added TESTTIMER.DATA and test_timer.cpp
2014-03-26 17:53:06 +01:00
osae
5df819d509 Merge branch 'master' of git://github.com/OPM/opm-core
Conflicts:
	CMakeLists_files.cmake
2014-03-26 14:51:06 +01:00
Joakim Hove
20468d1987 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2014-03-25 18:57:58 +01:00
Atgeirr Flø Rasmussen
86ed298439 Merge pull request #540 from joakim-hove/wellsmanager-well-properties
Changed the access method to well rates/properties
2014-03-21 08:58:07 +01:00