OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,700 Commits 9 Branches 35 Tags 15 MiB
08e8297b47
Commit Graph

5700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
c128e218da use commandline instead of paramGroup. 2015-11-19 16:08:26 +08:00
Liu Ming
8810a47215 fix typo and output message. 2015-11-19 13:51:03 +08:00
Liu Ming
9e7d287212 use more relax ParseMode. 2015-11-19 13:31:19 +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
d9dfd852f5 Merge pull request #927 from atgeirr/fix-rename-error 
Follow class renaming.
 2015-11-13 11:39:12 +01:00