Commit Graph
2561 Commits
Author SHA1 Message Date
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
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
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
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 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 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
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
Liu Ming 89d688d0f8 make use of fluidSystem. 2015-11-20 11:04:50 +08:00
Liu Ming 9428c829c3 unify the output messages. 2015-11-20 10:57:13 +08:00
Liu Ming 57f4348f6d clear up unused functions. Make some functions ad private member. 2015-11-19 16:24:09 +08:00
Liu Ming 8810a47215 fix typo and output message. 2015-11-19 13:51:03 +08:00
Liu Ming 4d2c656a72 clear message output. 2015-11-19 13:31:02 +08:00
Liu Ming 5938bbc74b solve git cherry-pick conflict. 2015-11-19 11:05:43 +08:00
Liu Ming 26b680970f Use messager container to store error message.
Conflicts:

	opm/core/props/satfunc/RelpermDiagnostics.hpp
2015-11-19 11:00:21 +08:00
Liu Ming 1db1bf6fd6 initial RelpermDiagnostics. 2015-11-19 09:21:00 +08:00
Atgeirr Flø Rasmussen 84b3bcc6ea 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
Andreas Lauser e7d57bd0e6 thresholdPressures(): move the code which calculates the maximum gravity corrected pressure difference between EQLNUM regions to its own function
requested by [at]atgeirr
2015-11-13 15:36:50 +01:00
Atgeirr Flø Rasmussen 556e24f008 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
Andreas Lauser dc9f73e94d thresholdPressures(): split several long lines
as requested by [at]atgeirr
2015-11-13 15:13:28 +01:00
Andreas Lauser ec0f28c176 thresholdPressures(): constify all local variables which can be made constant
I have doubts if this will change anything in the binaries (and in my
personal opinion, these 'const's look quite ugly and are sometimes a
(small) annoyance when debugging), but I don't mind using the coding
style used by most of the rest of opm-core here.
2015-11-13 15:13:15 +01:00
Atgeirr Flø Rasmussen 909f62ef4b Follow class renaming. 2015-11-13 11:37:53 +01:00
Robert Kloefkorn e5d3b3e10f timeError --> relativeChange. 2015-11-10 09:53:40 -07:00
Robert Kloefkorn 23c27cc826 AdaptiveTimeStepping: pass object to compute time error to time step control. This
allows us to shift the computation of the error to the physical model.
2015-11-10 09:45:07 -07:00