dr-robertk
b26eb3827f
Merge pull request #937 from chflo/OPM_251_support_restart
...
OPM-251: Prepare for restart
2016-01-15 14:44:06 -07:00
Joakim Hove
bbcc39805d
Merge pull request #942 from qilicun/debug_relperm
...
fix relperm diagnostics tests issue.
2016-01-11 09:21:10 +01:00
Liu Ming
5d50776d1b
fix relperm diagnostics tests issue.
2016-01-11 16:05:33 +08:00
Joakim Hove
a35520a65d
Merge pull request #939 from joakim-hove/table-column
...
Table column
2016-01-08 15:29:10 +01:00
Joakim Hove
a6deb02d04
Changed to use new table api from opm-parser.
2016-01-08 14:47:09 +01:00
Atgeirr Flø Rasmussen
1b9be6d4bd
Merge pull request #940 from chflo/OPM-163
...
OPM-163: Use EclipseState instead of Deck for PvtInterface
2016-01-08 13:36:17 +01:00
chflo
ca60041332
OPM-163: Use EclipseState instead of Deck for PvtInterface
2016-01-07 16:36:28 +01:00
Joakim Hove
a566ac608d
Added TableColumn based overloads.
2016-01-06 09:19:47 +01:00
Joakim Hove
65ff9bb75b
Removed erroneous test data.
2016-01-05 11:47:20 +01:00
chflo
c003900145
OPM-251: Support for restart
2016-01-04 16:11:21 +01:00
Atgeirr Flø Rasmussen
1a8b38dcc9
Merge pull request #936 from atgeirr/silence-warnings
...
Silence warnings in test programs.
2015-12-14 15:26:35 +01:00
Atgeirr Flø Rasmussen
576d24a070
Silence warnings in test programs.
2015-12-14 15:25:27 +01:00
Atgeirr Flø Rasmussen
125c27462d
Merge pull request #928 from totto82/minpv_pinch
...
compatibility of MINPV and PINCH
2015-12-14 11:33:20 +01:00
Tor Harald Sandve
8827ca0794
Bugfix. Fix face direction in the pinchprocessor
2015-12-14 10:48:26 +01:00
Atgeirr Flø Rasmussen
cc07dc80b7
Merge pull request #934 from totto82/residualSaturations
...
Add method to access the materialLawManager
2015-12-11 13:08:39 +01:00
Tor Harald Sandve
7689f80a7f
Add method to access the materialLawManager
2015-12-11 12:50:54 +01:00
Atgeirr Flø Rasmussen
a819d314f8
Merge pull request #929 from qilicun/relpermDiagnostics
...
Relperm diagnostics
2015-12-09 10:11:26 +01:00
Liu Ming
8605675199
make the constructor as explicit.
2015-12-09 16:51:07 +08:00
Tor Harald Sandve
43abdf5946
Adapt to changes in the NNC class
2015-12-08 13:03:15 +01:00
Tor Harald Sandve
c208d32498
BUGfix. Use correct facedirection
2015-12-08 12:57:43 +01:00
Tor Harald Sandve
7e4bff4a18
Hardcode usage of opmfil
...
The opmfil option in the minpv-processor will be used regardless of
OPMFIL input in the deck.
2015-12-08 11:04:54 +01:00
Tor Harald Sandve
3d7ce4ece2
Cleanup after rebase
...
- cleanup of some rebase mess
- Added comments
- Use the maxDp for the NNCs
- remove misplaced break in the pinchprocessor
2015-12-08 09:50:07 +01:00
Tor Harald Sandve
b8f54e4e59
Ignore segments with no active cells above or below.
2015-12-08 09:25:35 +01:00
Tor Harald Sandve
97525de43a
Adapt to changed API in the pinch-processor
2015-12-08 09:25:35 +01:00
Tor Harald Sandve
a7c1810029
Calculate thresholdPressures for the NNCs
2015-12-08 09:25:35 +01:00
Tor Harald Sandve
97466d988b
Fix to account for the combination of minpv and pinch
2015-12-08 09:21:51 +01:00
Tor Harald Sandve
dec23df301
Add option for not including the removed volume in the MinpvProcessor
...
The volume in cells with pore volume less than the minpv threshold is
removed if minpvMode is ECLStd while it is added to the underlying cell
if minpvMode is OpmFil
2015-12-08 09:21:51 +01:00
Liu Ming
ef203a1d04
Merge remote branch 'remotes/opm/master' into relpermDiagnostics
...
Conflicts:
CMakeLists_files.cmake
2015-12-08 16:08:02 +08:00
Liu Ming
8d393ac816
remove unused object.
2015-12-08 16:02:36 +08:00
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
Liu Ming
4790c2a2eb
Add simple tests.
2015-12-02 10:59:13 +08:00
Liu Ming
252af19e4b
Use OpmLog to output messages.
...
return messages and opmLog.
2015-12-02 10:58:06 +08:00
Atgeirr Flø Rasmussen
fc20fe5be9
Silence some warnings.
2015-12-01 13:36:08 +01:00
Liu Ming
944e1565fd
rename variables and remove some unnecessary check and comments.
2015-12-01 13:49:49 +08:00
Liu Ming
780292875a
remove unused functions and comments, add documentations to diagnosis().
2015-11-30 10:52:34 +08:00
Liu Ming
91e14bec36
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
544c7c24f9
reorder function and make more whitespace.
2015-11-30 10:26:59 +08:00
Liu Ming
5cfc3961db
make enum as private members.
2015-11-30 10:20:43 +08:00
Liu Ming
6d06c36f64
1. Move implemtation to .cpp file.
...
2. Delete constructors.
3. Add config.h
2015-11-30 10:11:43 +08: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
Liu Ming
05ebcc2067
Fix bugs and remove reptetitive messagers.
2015-11-27 10:47:04 +08:00
Liu Ming
839d2e0471
Add NEXUS scaled endpoints consistency check.
2015-11-26 16:32:17 +08:00
Liu Ming
e600383589
Check scaled endpoints mobility.
2015-11-26 15:40:40 +08:00
Liu Ming
df6043ace6
add endpoints scaling consistency check.
2015-11-26 15:22:51 +08:00
Tor Harald Sandve
fd0dbe1d48
Use cell depths based on averaging cell corners
2015-11-24 10:17:12 +01:00
