Commit Graph
2592 Commits
Author SHA1 Message Date
Joakim Hove 58f355935f Using template for cmp::vector_equal() 2016-02-19 07:57:02 +01:00
Joakim Hove 1661ac8f58 Merge pull request #956 from jokva/remove-unused-wrapper
Remove unused Wrapper includes from Deck/Utility
2016-02-17 17:10:43 +01:00
Jørgen Kvalsvik 62d7c7bed2 Remove unused Wrapper includes from Deck/Utility 2016-02-17 14:46:15 +01:00
Atgeirr Flø Rasmussen dc918fcff9 Merge pull request #947 from andlaus/fix_wet_gas_pvt_extrapolation
PvtLiveGas: do not special case in the extrapolation code
2016-02-16 12:44:53 +01:00
Joakim Hove 5172652e73 Removed opm_memcmp_double() - use cmp from common. 2016-02-14 21:41:51 +01:00
Joakim Hove 9b1efd7810 Revert: Removed unused SimulatorState comparison.
This reverts commit 5ce1d84ac1.
2016-02-04 18:39:40 +01:00
Joakim Hove b241fde63c Revert: Removed unused SimulatorState::setFirstSat 2016-02-04 18:39:39 +01:00
Joakim Hove 4e46bb3fa4 Merge pull request #948 from joakim-hove/simulatorstate-remove-unused
Simulatorstate remove unused
2016-02-04 15:57:59 +01:00
Joakim Hove 5ce1d84ac1 Removed unused SimulatorState comparison. 2016-02-03 05:54:24 +01:00
Joakim Hove df0d11b8de Removed unused SimulatorState::setFirstSat() 2016-02-03 05:51:05 +01:00
Andreas Lauser e6c89a595b PvtLiveGas: do not special case in the extrapolation code
at least, don't special case that much. This caused a discrepancy with
the opm-material PVT relations for Norne after 23 report steps. (which
takes an hour or two to get to with debugging options on my machine.)
As you can probably imagine, finding this was *a lot* of fun...
2016-01-28 14:42:10 +01:00
Bård Skaflestad 6365167109 Merge pull request #946 from jokva/clean-up-header
Improve includes from opm-parser
2016-01-26 15:58:25 +01:00
Bård Skaflestad d738138afa Merge pull request #943 from qilicun/update_relperm_diagnostics
Update relperm diagnostics
2016-01-26 15:12:28 +01:00
Jørgen Kvalsvik 697763a4b9 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
2016-01-26 13:30:58 +01:00
Joakim Hove ba1c06d415 Removed SimulatorState::init( UnstructureGrid& ) 2016-01-25 07:30:03 +01:00
Liu Ming 10baa52828 Omit some usages of to_string function. 2016-01-25 11:18:56 +08:00
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
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 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
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
chflo c003900145 OPM-251: Support for restart 2016-01-04 16:11:21 +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
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 a7c1810029 Calculate thresholdPressures for the NNCs 2015-12-08 09:25:35 +01:00