Commit Graph

5534 Commits

Author SHA1 Message Date
Liu Ming
9e9287f20d change headline to saturation functions diagnostics. 2016-01-25 11:00:23 +08:00
Liu Ming
039f9ce1cc Format output and add SATNUM for scaled saturation endpoints. 2016-01-25 10:58:50 +08:00
Liu Ming
229282c310 fix bugs: counter warning as error. 2016-01-25 09:38:55 +08:00
Liu Ming
009f1b101b 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
Bård Skaflestad
1686b45221 Merge pull request #944 from jokva/fix-header-include-parser656
Fixes includes wrt opm-parser PR-656
2016-01-21 11:13:32 +01:00
Jørgen Kvalsvik
c7349b5586 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
8e397ef7ce fix typo. 2016-01-21 16:10:31 +08:00
Liu Ming
ce0ec1e466 remove comments. 2016-01-21 14:04:01 +08:00
Liu Ming
dd9b607c99 make const as more as possible 2016-01-21 14:01:02 +08:00
Liu Ming
743f17169d saturation region should start with 1. 2016-01-21 13:47:57 +08:00
Liu Ming
c02c93ce1b fix formatting and grammar issues. 2016-01-21 13:45:32 +08:00
Liu Ming
2f2bd8a955 Add region number for output and output summary msg to streamLog 2016-01-18 11:10:51 +08:00
Liu Ming
682d0a7d1f change error to warning due to eclipse manual. 2016-01-18 11:10:36 +08:00
Liu Ming
3bce4e72b9 Add region number for unscaled endpoints. 2016-01-18 11:10:26 +08:00
Liu Ming
5e234fcd21 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
1f809cf3d5 Add counter for numbering warning, error, proble, and bugs. 2016-01-18 11:10:04 +08:00
Liu Ming
3e143907d3 For that break clipse rules should raise an error. 2016-01-18 11:09:50 +08:00
Liu Ming
f38fe6d91b add cell index for scaled endpoints error messages output. 2016-01-18 11:09:02 +08:00
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