Liu Ming
4d4051ea2b
make the constructor as explicit.
2015-12-09 16:51:07 +08:00
Liu Ming
db103c7868
Merge remote branch 'remotes/opm/master' into relpermDiagnostics
...
Conflicts:
CMakeLists_files.cmake
2015-12-08 16:08:02 +08:00
Liu Ming
5ba0742bc9
remove unused object.
2015-12-08 16:02:36 +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
Liu Ming
35dff82700
Use OpmLog to output messages.
...
return messages and opmLog.
2015-12-02 10:58:06 +08:00
Liu Ming
2fc6a037b8
rename variables and remove some unnecessary check and comments.
2015-12-01 13:49:49 +08:00
Liu Ming
96b012d9b1
remove unused functions and comments, add documentations to diagnosis().
2015-11-30 10:52:34 +08:00
Liu Ming
a96f9b0d3b
1. remove eclState from phaseCheck_ function.
...
2. rename messager_ to messages_.
3. change 0 and 1 to 0.0 and 1.0
4. change unsigned to int.
2015-11-30 10:42:57 +08:00
Liu Ming
324b562d3d
reorder function and make more whitespace.
2015-11-30 10:26:59 +08:00
Liu Ming
45807a392d
make enum as private members.
2015-11-30 10:20:43 +08:00
Liu Ming
b4b23bfab0
1. Move implemtation to .cpp file.
...
2. Delete constructors.
3. Add config.h
2015-11-30 10:11:43 +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
Liu Ming
b30d04f5fa
Fix bugs and remove reptetitive messagers.
2015-11-27 10:47:04 +08:00
Liu Ming
f61ecdd777
Add NEXUS scaled endpoints consistency check.
2015-11-26 16:32:17 +08:00
Liu Ming
a19c0d49b7
Check scaled endpoints mobility.
2015-11-26 15:40:40 +08:00
Liu Ming
7fa569bc91
add endpoints scaling consistency check.
2015-11-26 15:22:51 +08:00
Tor Harald Sandve
f24dcf1957
Use cell depths based on averaging cell corners
2015-11-24 10:17:12 +01:00
Liu Ming
693ac24483
make use of fluidSystem.
2015-11-20 11:04:50 +08:00
Liu Ming
255e0d4a24
unify the output messages.
2015-11-20 10:57:13 +08:00
Liu Ming
382df80573
clear up unused functions. Make some functions ad private member.
2015-11-19 16:24:09 +08:00
Liu Ming
bb92612fec
use commandline instead of paramGroup.
2015-11-19 16:08:26 +08:00
Liu Ming
5baa83bde4
fix typo and output message.
2015-11-19 13:51:03 +08:00
Liu Ming
bec412793d
use more relax ParseMode.
2015-11-19 13:31:19 +08:00
Liu Ming
ead2f3437a
clear message output.
2015-11-19 13:31:02 +08:00
Liu Ming
a4b6c7b9cc
solve git cherry-pick conflict.
2015-11-19 11:05:43 +08:00
Liu Ming
24152f9a65
Use messager container to store error message.
...
Conflicts:
opm/core/props/satfunc/RelpermDiagnostics.hpp
2015-11-19 11:00:21 +08:00
Liu Ming
d9a2fa6f42
initial RelpermDiagnostics.
2015-11-19 09:21:00 +08:00
Atgeirr Flø Rasmussen
80c16e7ea9
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
Atgeirr Flø Rasmussen
5f9d361c03
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
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
Andreas Lauser
e3c066cd02
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
2c22cb68c8
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
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
Atgeirr Flø Rasmussen
8d327e9c67
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
9de17c38d3
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
7d7f37f42d
Make constructor taking one argument explicit.
2015-10-28 13:19:42 +01:00
Markus Blatt
c871eaec5f
Added comment about 9 entries in permeability tensor.
2015-10-28 13:14:56 +01:00
Markus Blatt
3e8381be20
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
Markus Blatt
4bfc921957
Fix grammar and spelling in warning.
2015-10-27 14:26:01 +01:00
Markus Blatt
02df6dd963
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
c0e2d7748c
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
559c91505d
[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
Arne Morten Kvarving
5674635125
fix Equilibration test by adding some fuzz
...
Backports parts of a7b1e69a45c14ec88a82b92ee704424f1ea1b41c
2015-10-26 11:21:26 +01:00
Atgeirr Flø Rasmussen
c65ad8292b
Make SaturationPropsFromDeck work for two-phase cases.
2015-10-21 15:27:52 +02: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 #892 from qilicun/pinchprocessor
...
PinchProcessor
2015-10-19 10:22:44 +02:00
Atgeirr Flø Rasmussen
10b4d6c6f7
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
Liu Ming
2f7f54982b
use PinchMode instead of string.
2015-10-09 16:30:39 +08:00
