Commit Graph

5415 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
e8ab4341f1 Merge pull request #933 from atgeirr/silence-warnings
Silence some warnings.
2015-12-07 13:31:13 +01:00
Bård Skaflestad
51111aa845 Merge pull request #932 from joakim-hove/test-norne-pvt
Added regression test for Norne PVT.
2015-12-03 17:07:02 +01:00
Joakim Hove
1de19dd47d Added out-of-range tests. 2015-12-03 16:19:43 +01:00
Joakim Hove
130f222cb0 Added regression test for norne PvtLiveOil PVT. 2015-12-03 14:16:04 +01:00
Atgeirr Flø Rasmussen
fc20fe5be9 Silence some warnings. 2015-12-01 13:36:08 +01:00
Bård Skaflestad
d4ca0d8c00 Merge pull request #931 from andlaus/fix_build
fix build for newish boost versions
2015-11-27 16:17:27 +01:00
Andreas Lauser
4cded211b0 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
ec25abb15f Merge pull request #930 from totto82/cellDepth
Use cell depths based on averaging cell corners
2015-11-27 10:17:49 +01:00
Tor Harald Sandve
fd0dbe1d48 Use cell depths based on averaging cell corners 2015-11-24 10:17:12 +01:00
Atgeirr Flø Rasmussen
84b3bcc6ea Merge pull request #907 from andlaus/thpress_from_initial
implement determining the threshold pressure from the initial condition
2015-11-17 09:03:02 +01:00
Andreas Lauser
e7d57bd0e6 thresholdPressures(): move the code which calculates the maximum gravity corrected pressure difference between EQLNUM regions to its own function
requested by [at]atgeirr
2015-11-13 15:36:50 +01:00
Atgeirr Flø Rasmussen
556e24f008 Merge pull request #922 from blattms/return_mask_for_updateOwnerMask
Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask
2015-11-13 15:20:35 +01:00
Andreas Lauser
dc9f73e94d thresholdPressures(): split several long lines
as requested by [at]atgeirr
2015-11-13 15:13:28 +01:00
Andreas Lauser
ec0f28c176 thresholdPressures(): constify all local variables which can be made constant
I have doubts if this will change anything in the binaries (and in my
personal opinion, these 'const's look quite ugly and are sometimes a
(small) annoyance when debugging), but I don't mind using the coding
style used by most of the rest of opm-core here.
2015-11-13 15:13:15 +01:00
Atgeirr Flø Rasmussen
d9dfd852f5 Merge pull request #927 from atgeirr/fix-rename-error
Follow class renaming.
2015-11-13 11:39:12 +01:00
Atgeirr Flø Rasmussen
909f62ef4b Follow class renaming. 2015-11-13 11:37:53 +01:00
Atgeirr Flø Rasmussen
9f7a1be749 Merge pull request #921 from dr-robertk/PR/adaptive-timestepping-revision
AdaptiveTimeStepping: allow for more flexible error computation in the future.
2015-11-12 17:23:11 +01:00
Bård Skaflestad
14a4b00695 Merge pull request #926 from andlaus/update_cdash_drop_site
cdash: update dropsite
2015-11-11 20:28:43 +01:00
Andreas Lauser
e2ec1c8547 cdash: update dropsite 2015-11-11 16:47:09 +01:00
Robert Kloefkorn
e5d3b3e10f timeError --> relativeChange. 2015-11-10 09:53:40 -07:00
Robert Kloefkorn
23c27cc826 AdaptiveTimeStepping: pass object to compute time error to time step control. This
allows us to shift the computation of the error to the physical model.
2015-11-10 09:45:07 -07:00
Atgeirr Flø Rasmussen
6ac19ac961 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
Andreas Lauser
e49e9bd9b9 THPRES: only update the threshold pressure between regions if the saturation of the upstream cell is larger than the residual saturation
before it was 0. Again, thanks to [at]totto82 for the suggestion.
2015-11-05 15:39:29 +01:00
Andreas Lauser
f4fcb616be THPRES: change the sign of the gravity correction
we're correcting the pressure at the cell center depths to get the
pressure at the face depth, not the other way around. This is
confusing...

thanks to [at]totto82 for discovering this.
2015-11-05 12:29:19 +01:00
Andreas Lauser
6a9e11a4e1 fix a compressed vs logically Cartesian cell index bug
PVTNUM is for logically Cartesian indices, but was accessed by
compressed ones.
2015-11-05 12:29:19 +01:00
Andreas Lauser
547b701a57 implement determining the threshold pressure from the initial condition
This needs to be done if a equilibration region transition is
mentioned by the THPRES keyword, but no value is given for this record
in the third item. (it seems that this is used quite frequently.)

Also, the approach taken by this patch also does not collide with the
restart machinery as far as I can see. This is because the initial
condition is applied by the simulator before the state at the restart
time is loaded. (I interpreted the code that way, but I could be
wrong, could anyone verify this?)

since it is pretty elaborate to calculate initial condition, this
patch is pretty messy. I also do not know if Eclipse does include
capillary pressure in this calculation or not (this patch does). Huge
kudos go to [at]totto82 for reviewing, testing and debugging this.
2015-11-05 12:29:19 +01:00
Markus Blatt
8d253606fc Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask
Thus we can actually access the mask in external code. This is for
example needed when calculating averages in RateConverter of opm-autodiff.
2015-11-02 15:02:32 +01:00
Tor Harald Sandve
7542aca827 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
Atgeirr Flø Rasmussen
bdd5104bc5 Merge pull request #919 from blattms/fixes-wells-with-perforations-in-overlap
Fixes well manager for wells crossing into cells that overlap.
2015-10-28 13:23:35 +01:00
Atgeirr Flø Rasmussen
11cd4d56ad Merge pull request #918 from blattms/allow-zero-initialization-of-rock-properties
Allow the rock properties to be zero initialized without a deck.
2015-10-28 13:21:16 +01:00
Markus Blatt
b12708785c Make constructor taking one argument explicit. 2015-10-28 13:19:42 +01:00
Markus Blatt
bd760d3e61 Added comment about 9 entries in permeability tensor. 2015-10-28 13:14:56 +01:00
Markus Blatt
de66419e38 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 13:09:12 +01:00
Atgeirr Flø Rasmussen
6dc67229f1 Merge pull request #917 from blattms/fix-copy-owner-to-all
[bugfix] Fixes copyOwnerToAll.
2015-10-28 11:34:27 +01:00
Markus Blatt
4dbb517d92 Fix grammar and spelling in warning. 2015-10-27 14:26:01 +01:00
Markus Blatt
5676bd4573 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-27 14:02:26 +01:00
Markus Blatt
de6cf63e50 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-26 23:52:24 +01:00
Markus Blatt
8b7ccd9b19 [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-26 23:45:12 +01:00
Atgeirr Flø Rasmussen
21412edc97 Merge pull request #915 from akva2/fix_equil
fix Equilibration test by adding some fuzz
2015-10-26 12:43:42 +01:00
Arne Morten Kvarving
b20c21feb8 fix Equilibration test by adding some fuzz
Backports parts of a7b1e69a45
2015-10-26 11:21:26 +01:00
dr-robertk
d43e447852 Merge pull request #912 from atgeirr/bump-version
Bump version and unify format of dune.module.
2015-10-23 15:08:32 +02:00
Atgeirr Flø Rasmussen
7df248d2d6 Remove version.[ch] files. 2015-10-23 13:32:13 +02:00
Atgeirr Flø Rasmussen
40220994c7 Bump version and unify format of dune.module. 2015-10-23 13:18:47 +02: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