Commit Graph

5386 Commits

Author SHA1 Message Date
Arne Morten Kvarving
a6f982b4e4 update packaging versions for final release 2015-11-04 13:13:54 +01:00
Atgeirr Flø Rasmussen
752790f150 Update package release tags. 2015-10-28 15:49:42 +01:00
Markus Blatt
6b97556a5f Make constructor taking one argument explicit. 2015-10-28 15:45:47 +01:00
Markus Blatt
958b9243bc Added comment about 9 entries in permeability tensor. 2015-10-28 15:45:28 +01:00
Markus Blatt
08b45c4203 Renamed well_index to well_index_on_proc and added comment.
This should prevent misunderstandings about what the
well_index_on_proc is. It is not the well_index according to
the eclipse state (on open wells count) but the index of the
wells that are stored on this process' domain.
2015-10-28 15:45:00 +01:00
Markus Blatt
0754573f2e Fix grammar and spelling in warning. 2015-10-28 15:44:38 +01:00
Markus Blatt
f35417a930 Fixes well manager for wells crossing into cells that overlap.
In the parallel run there are cases where wells perforate cells
that are neighbors of overlap/halo cells. On other process only
parts of the well are seen as perforations. These wells should be
ignored there. While the well was indeed ignored, the perforations
found where mistakenly added to the well found due not clearing the
wellperf_data[well_index]. This commit now does this clearing and
results in the right handling of wells for e.g. SPE9.
2015-10-28 15:44:17 +01:00
Markus Blatt
32a3d39fb7 Allow the rock properties to be zero initialized without a deck.
This is needed in parallel runs where the rock properties will not
be read from the deck but be communicated from a master process. Nevertheless
we need to be able to initialize the data structures with the correct
container size. In addition we need to be able to change the container values
from opm-autodiff's BlackoilPropsDataHandle.
2015-10-28 15:43:47 +01:00
Markus Blatt
b8933afd79 [bugfix] Fixes copyOwnerToAll.
Previously, we copied owner/overlap to all which is clearly wrong.
Now we copy from owner to all as the function name says.
2015-10-28 15:43:29 +01:00
Atgeirr Flø Rasmussen
c6ea63ffad Merge pull request #914 from akva2/release/2015.10
Backport dune.module and version.h changes
2015-10-26 12:32:30 +01:00
Atgeirr Flø Rasmussen
7fac2642d3 Remove version.[ch] files. 2015-10-26 11:19:01 +01:00
Atgeirr Flø Rasmussen
7922051e08 Bump version and unify format of dune.module.
Backports relevant parts of 40220994c7
2015-10-26 11:18:43 +01:00
Arne Morten Kvarving
0b4ec3ff11 update versions 2015-10-26 10:52:51 +01:00
Arne Morten Kvarving
a7b1e69a45 disable satfunc test as it is broken
fix equil test by adding fuzz to comparison
2015-10-26 10:52:38 +01:00
Atgeirr Flø Rasmussen
50814d88ce Merge pull request #905 from atgeirr/fix-timestep-bug
Fix timestep bug
2015-10-22 13:37:49 +02:00
Andreas Lauser
3dea26ece4 Merge pull request #910 from atgeirr/fix-twophase-sim
Fix twophase sim
2015-10-21 17:39:04 +02:00
Atgeirr Flø Rasmussen
62f59fa624 In sim_2p_incomp, avoid running everything twice.
There were loops (over all timesteps) both in the
main() function and the simulator class.

Note:
This simulator cannot properly handle changing
well configurations, and will now use only the
initial configuration (first report step), instead
of possibly crashing later.
2015-10-21 15:28:27 +02:00
Atgeirr Flø Rasmussen
d460952d08 Make SaturationPropsFromDeck work for two-phase cases. 2015-10-21 15:27:52 +02:00
Atgeirr Flø Rasmussen
d94e0fc0f7 Merge pull request #909 from atgeirr/silence-warning-pinchprocessor
Remove unused arguments in PinchProcessor methods.
2015-10-21 11:53:44 +02:00
Atgeirr Flø Rasmussen
8a455fbde8 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
d6a90c990d Merge pull request #906 from totto82/livegas
Complete undersaturated PVTG tables by extrapolating from existing data
2015-10-20 20:38:04 +02:00
Atgeirr Flø Rasmussen
3a69e10043 Merge pull request #908 from akva2/update_redhat_packaging
update redhat packaging
2015-10-20 18:33:08 +02:00
Tor Harald Sandve
8b94e7b0eb Make the code more readable 2015-10-20 16:09:04 +02:00
Arne Morten Kvarving
757289fe78 update redhat packaging 2015-10-20 15:49:23 +02:00
Tor Harald Sandve
2330cd615a Complete undersaturated PVTG tables by extrapolating from existing data
This PR copies equivalent code from PvtLiveOil
2015-10-20 11:29:20 +02:00
Atgeirr Flø Rasmussen
8df54df573 Bugfix: currentStepNum() -> reportStepNum() also in RFT writer. 2015-10-20 10:35:25 +02:00
Atgeirr Flø Rasmussen
0cd08a1f12 Merge pull request #904 from akva2/update_debian_packaging
update debian packaging
2015-10-20 10:16:12 +02:00
Atgeirr Flø Rasmussen
b47640db71 Bugfix: currentStepNum() -> reportStepNum(). 2015-10-20 10:04:56 +02:00
Atgeirr Flø Rasmussen
917d491a91 Improve formatting, comment and use separate scope.
To make it clear that the variables are only used here.
2015-10-20 09:58:34 +02:00
Arne Morten Kvarving
3032b852b6 update debian packaging 2015-10-19 14:27:03 +02:00
Atgeirr Flø Rasmussen
f2d735cacb Merge pull request #892 from qilicun/pinchprocessor
PinchProcessor
2015-10-19 10:22:44 +02:00
Liu Ming
b2390e2662 Fix FaceDir issues, deeper z should be ZPlus.
Fix whitespaces.
2015-10-19 15:24:28 +08:00
Liu Ming
ad819422b4 use range-for-loop to access cellfaces array. 2015-10-15 14:39:25 +08:00
Liu Ming
1c2b04f150 add comments and some minor changes. 2015-10-15 12:59:10 +08:00
Liu Ming
ca87064f47 refactor interface_ function. 2015-10-15 10:36:59 +08:00
Liu Ming
60db229072 use namespace in the function and remove unused variables. 2015-10-15 10:24:41 +08:00
Atgeirr Flø Rasmussen
d78e14c1c6 Merge pull request #897 from totto82/crossflow
Add boolean flag to determine whether crossflow is allowed in a well
2015-10-14 09:36:27 +02:00
Atgeirr Flø Rasmussen
a8e042aeb6 Merge pull request #902 from joakim-hove/rename-memcmp-double
Renamed memcmp_double -> opm_memcmp_double
2015-10-14 09:32:45 +02:00
Liu Ming
30b7842c5d use opm-common ErrorMarcos. 2015-10-13 15:13:14 +08:00
Atgeirr Flø Rasmussen
08eea02316 Merge pull request #899 from andlaus/error_macros_to_opm_common
Error macros to opm common
2015-10-12 13:31:42 +02:00
Joakim Hove
68e12e9250 Renamed memcmp_double -> opm_memcmp_double 2015-10-12 09:25:37 +02:00
Bård Skaflestad
0184d4a71d Merge pull request #900 from qilicun/actnum_cart_grid
fix actnum with cartesian grid issue.

This resolves #898
2015-10-09 15:08:19 +02:00
Liu Ming
427c5b7afd use PinchMode instead of string. 2015-10-09 16:30:39 +08:00
Liu Ming
8788563088 fix actnum with cartesian grid issue. 2015-10-09 13:44:11 +08:00
Liu Ming
42eb5ed830 add files to cmake file list. 2015-10-09 10:33:52 +08:00
Liu Ming
d8ccd32716 Add tests case for pinch processor. 2015-10-09 10:33:21 +08:00
Liu Ming
8beccf431f remove PINCH item 2 support. 2015-10-09 10:32:57 +08:00
Liu Ming
fc263590ea Merge remote branch 'remotes/opm/master' into pinchprocessor 2015-10-09 09:42:50 +08:00
Andreas Lauser
26c6077ddb remove the header files with the error macros 2015-10-08 12:14:16 +02:00
Andreas Lauser
c8000272bf use the error macros from opm-common 2015-10-08 11:42:15 +02:00