Commit Graph

169 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
b0692304d5 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
2016-01-26 13:30:58 +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
Liu Ming
0470428cab fix relperm diagnostics tests issue. 2016-01-11 16:05:33 +08:00
Joakim Hove
8ff67bd4a1 Removed erroneous test data. 2016-01-05 11:47:20 +01:00
Atgeirr Flø Rasmussen
186d77867a Silence warnings in test programs. 2015-12-14 15:25:27 +01:00
Atgeirr Flø Rasmussen
c8a1492ca9 Merge pull request from totto82/minpv_pinch
compatibility of MINPV and PINCH
2015-12-14 11:33:20 +01:00
Tor Harald Sandve
96b0f2e8cb Bugfix. Fix face direction in the pinchprocessor 2015-12-14 10:48:26 +01:00
Tor Harald Sandve
ca3e48d099 Adapt to changes in the NNC class 2015-12-08 13:03:15 +01:00
Tor Harald Sandve
5a3ee3b961 Adapt to changed API in the pinch-processor 2015-12-08 09:25:35 +01:00
Tor Harald Sandve
04b0321f13 Fix to account for the combination of minpv and pinch 2015-12-08 09:21:51 +01:00
Liu Ming
db103c7868 Merge remote branch 'remotes/opm/master' into relpermDiagnostics
Conflicts:
	CMakeLists_files.cmake
2015-12-08 16:08:02 +08:00
Joakim Hove
d7913c4173 Added out-of-range tests. 2015-12-03 16:19:43 +01:00
Joakim Hove
364dbf809f Added regression test for norne PvtLiveOil PVT. 2015-12-03 14:16:04 +01:00
Liu Ming
bff9920814 Add simple tests. 2015-12-02 10:59:13 +08:00
Andreas Lauser
5d37b61a77 fix build for newish boost versions
my boost is 1.58. once more, boost seemed to have become more picky on
where a semicolon must be placed and where not.
2015-11-27 16:09:01 +01:00
Atgeirr Flø Rasmussen
682f53fdc5 Remove unused arguments in PinchProcessor methods.
This silences warnings. It also makes it clear that
the cell thicknesses are not used in the current
algorithm, the doc comment has been updated to
reflect this.
2015-10-21 11:52:31 +02:00
Atgeirr Flø Rasmussen
852693b72c Merge pull request from qilicun/pinchprocessor
PinchProcessor
2015-10-19 10:22:44 +02:00
Atgeirr Flø Rasmussen
10b4d6c6f7 Merge pull request from totto82/crossflow
Add boolean flag to determine whether crossflow is allowed in a well
2015-10-14 09:36:27 +02:00
Liu Ming
2f7f54982b use PinchMode instead of string. 2015-10-09 16:30:39 +08:00
Liu Ming
10e9df4bd1 Add tests case for pinch processor. 2015-10-09 10:33:21 +08:00
Tor Harald Sandve
40ec39fa71 Add boolean flag to determine whether crossflow is allowed in a well
This PR adds allow_cf to the wells structure that determine whether
crossflow is allowed or not. An extra argument is added to addWell(..)
to specify the allow_cf flag.
2015-10-06 15:54:20 +02:00
Joakim Hove
197dda9ee0 Relocated warning headers. 2015-10-06 11:39:14 +02:00
Atgeirr Flø Rasmussen
3d27454c6b 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.
2015-10-01 15:20:08 +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
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
Atgeirr Flø Rasmussen
3db9d9062e Fix bug in test program. 2015-08-19 13:12:14 +02:00
babrodtk
9458fcc498 Fixed several compiler warnings 2015-08-19 13:12:14 +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
5216550cdf Suppress warnings. 2015-08-10 16:07:45 +02:00
Joakim Hove
23b3670c1e Updated to use ParseMode. 2015-08-06 15:56:51 +02:00
Atgeirr Flø Rasmussen
7b9bdb6017 Do not use pressure() until after init() in BlackoilState. 2015-07-08 17:58:38 +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
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
Arne Morten Kvarving
a87b46a037 fix tests
- cannot use BOOST_CHECK_CLOSE around 0 due to a relative test
- slacken a tolerance significantly
2015-04-24 10:49:13 +02:00
Atgeirr Flø Rasmussen
fb983a44b1 Add default producer BHP control when not given in deck.
Default limit is 1 atm.
2015-02-04 10:30:15 +01:00
Atgeirr Flø Rasmussen
9cb9ec50b1 Rename directory opm/core/tof -> opm/core/flowdiagnostics. 2015-02-03 21:44:24 +01:00
Markus Blatt
aac4cb7d66 Correctly compute the minimum and maximum values.
As there are no functors for computing the minimum and maximum,
we convert the std::max and std::min function pointers to
functors (which is not really nice.) Previously we were somehow
tricked into using std::greater and std::less, which of course do
return true or false and not what we need. Additionally, do more
excessive testing with different ranges.
2015-01-23 20:48:53 +01:00
Bård Skaflestad
6d8c89abea Merge pull request from blattms/global-reductions
Added methods for computing global reductions.
2015-01-23 17:28:12 +01:00
Markus Blatt
d137b0c144 Calm warnings about excessive semi-colons, unused variables, and missing declarations. 2015-01-23 16:36:48 +01:00
Markus Blatt
7bce15c04b Added methods for computing global reductions.
We need to compute quite a few global reductions in the
Newton method of opm-autodiff. This commit adds the functionality
to compute several reductions combined using only one global
communication. Compiles and test succeeds with one or more process.
2015-01-21 16:19:35 +01:00
Atgeirr Flø Rasmussen
77ae151be9 Added calculation of flow diagnostics quantities.
New functions:
 - computeFandPhi()
 - computeLorenz()
 - computeSweep()

Also a unit test has been added for the new features.
2015-01-21 14:58:44 +01:00
Joakim Hove
80423a0188 Pure white-space change 2015-01-12 12:43:44 +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
Tor Harald Sandve
d50ec0d4d1 Modify the well manager test as we now support stopped wells.
We no longer expect an exception when we meet stopped wells.
2015-01-09 09:10:10 +01:00
Tor Harald Sandve
0d044eada0 Add test case for stopped wells
The test check that the rates are set to zero for stopped wells.
2015-01-09 09:10:10 +01:00
Atgeirr Flø Rasmussen
10d4d228d1 Use dummy test if anisotropic eikonal solver unavailable. 2015-01-07 10:20:49 +01:00
Atgeirr Flø Rasmussen
4c12bf485d Modify test to succeed.
No longer test for (unattainable) exact values. Use actual
computed value instead. This makes the test a regression
test rather than a truth test.
2014-12-29 12:28:29 +01:00