Liu Ming
6aca45b576
Format output and add SATNUM for scaled saturation endpoints.
2016-01-25 10:58:50 +08:00
Liu Ming
aae9169cff
fix bugs: counter warning as error.
2016-01-25 09:38:55 +08:00
Liu Ming
675f730b01
Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics
...
Conflicts:
opm/core/props/satfunc/RelpermDiagnostics.cpp
2016-01-22 13:04:01 +08: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
6efd22c637
fix typo.
2016-01-21 16:10:31 +08:00
Liu Ming
8b4dda67ed
remove comments.
2016-01-21 14:04:01 +08:00
Liu Ming
ee71a59ece
make const as more as possible
2016-01-21 14:01:02 +08:00
Liu Ming
a7238d0a7d
saturation region should start with 1.
2016-01-21 13:47:57 +08:00
Liu Ming
4daa70292e
fix formatting and grammar issues.
2016-01-21 13:45:32 +08:00
Liu Ming
a7aa2cf2c3
Add region number for output and output summary msg to streamLog
2016-01-18 11:10:51 +08:00
Liu Ming
598f456a29
change error to warning due to eclipse manual.
2016-01-18 11:10:36 +08:00
Liu Ming
30ace9cdcc
Add region number for unscaled endpoints.
2016-01-18 11:10:26 +08:00
Liu Ming
708da37250
1. use scaled_messages_ to store scaled endpoints infor.
...
2. format the terminal output messages.
2016-01-18 11:10:14 +08:00
Liu Ming
6753c84547
Add counter for numbering warning, error, proble, and bugs.
2016-01-18 11:10:04 +08:00
Liu Ming
2f19d0bba6
For that break clipse rules should raise an error.
2016-01-18 11:09:50 +08:00
Liu Ming
5c271db842
add cell index for scaled endpoints error messages output.
2016-01-18 11:09:02 +08:00
Joakim Hove
4a95eb2917
Merge pull request #939 from joakim-hove/table-column
...
Table column
2016-01-08 15:29:10 +01:00
Joakim Hove
718ec8e791
Changed to use new table api from opm-parser.
2016-01-08 14:47:09 +01:00
chflo
c02966f6bc
OPM-163: Use EclipseState instead of Deck for PvtInterface
2016-01-07 16:36:28 +01:00
Atgeirr Flø Rasmussen
462b4ca996
Merge pull request #934 from totto82/residualSaturations
...
Add method to access the materialLawManager
2015-12-11 13:08:39 +01:00
Tor Harald Sandve
1deadd257f
Add method to access the materialLawManager
2015-12-11 12:50:54 +01:00
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
35dff82700
Use OpmLog to output messages.
...
return messages and opmLog.
2015-12-02 10:58:06 +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
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
5baa83bde4
fix typo and output message.
2015-11-19 13:51:03 +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