OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,381 Commits 9 Branches 35 Tags
8810a472153bf1c9e6e04119817d7cabf5776ac1
Commit Graph
5381 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dr-robertk d43e447852 Merge pull request #912 from atgeirr/bump-version 
Bump version and unify format of dune.module.
 2015-10-23 15:08:32 +02:00
Atgeirr Flø Rasmussen 7df248d2d6 Remove version.[ch] files. 2015-10-23 13:32:13 +02:00
Atgeirr Flø Rasmussen 40220994c7 Bump version and unify format of dune.module. 2015-10-23 13:18:47 +02:00
Atgeirr Flø Rasmussen 50814d88ce Merge pull request #905 from atgeirr/fix-timestep-bug 
Fix timestep bug
 2015-10-22 13:37:49 +02:00
Andreas Lauser 3dea26ece4 Merge pull request #910 from atgeirr/fix-twophase-sim 
Fix twophase sim
 2015-10-21 17:39:04 +02:00
Atgeirr Flø Rasmussen 62f59fa624 In sim_2p_incomp, avoid running everything twice. 
There were loops (over all timesteps) both in the
main() function and the simulator class.

Note:
This simulator cannot properly handle changing
well configurations, and will now use only the
initial configuration (first report step), instead
of possibly crashing later.
 2015-10-21 15:28:27 +02:00
Atgeirr Flø Rasmussen d460952d08 Make SaturationPropsFromDeck work for two-phase cases. 2015-10-21 15:27:52 +02:00
Atgeirr Flø Rasmussen d94e0fc0f7 Merge pull request #909 from atgeirr/silence-warning-pinchprocessor 
Remove unused arguments in PinchProcessor methods.
 2015-10-21 11:53:44 +02:00
Atgeirr Flø Rasmussen 8a455fbde8 Remove unused arguments in PinchProcessor methods. 
This silences warnings. It also makes it clear that
the cell thicknesses are not used in the current
algorithm, the doc comment has been updated to
reflect this.
 2015-10-21 11:52:31 +02:00
Atgeirr Flø Rasmussen d6a90c990d Merge pull request #906 from totto82/livegas 
Complete undersaturated PVTG tables by extrapolating from existing data
 2015-10-20 20:38:04 +02:00
Atgeirr Flø Rasmussen 3a69e10043 Merge pull request #908 from akva2/update_redhat_packaging 
update redhat packaging
 2015-10-20 18:33:08 +02:00
Tor Harald Sandve 8b94e7b0eb Make the code more readable 2015-10-20 16:09:04 +02:00
Arne Morten Kvarving 757289fe78 update redhat packaging 2015-10-20 15:49:23 +02:00
Tor Harald Sandve 2330cd615a Complete undersaturated PVTG tables by extrapolating from existing data 
This PR copies equivalent code from PvtLiveOil
 2015-10-20 11:29:20 +02:00
Atgeirr Flø Rasmussen 8df54df573 Bugfix: currentStepNum() -> reportStepNum() also in RFT writer. 2015-10-20 10:35:25 +02:00
Atgeirr Flø Rasmussen 0cd08a1f12 Merge pull request #904 from akva2/update_debian_packaging 
update debian packaging
 2015-10-20 10:16:12 +02:00
Atgeirr Flø Rasmussen b47640db71 Bugfix: currentStepNum() -> reportStepNum(). 2015-10-20 10:04:56 +02:00
Atgeirr Flø Rasmussen 917d491a91 Improve formatting, comment and use separate scope. 
To make it clear that the variables are only used here.
 2015-10-20 09:58:34 +02:00
Arne Morten Kvarving 3032b852b6 update debian packaging 2015-10-19 14:27:03 +02:00
Atgeirr Flø Rasmussen f2d735cacb Merge pull request #892 from qilicun/pinchprocessor 
PinchProcessor
 2015-10-19 10:22:44 +02:00
Liu Ming b2390e2662 Fix FaceDir issues, deeper z should be ZPlus. 
Fix whitespaces.
 2015-10-19 15:24:28 +08:00
Liu Ming ad819422b4 use range-for-loop to access cellfaces array. 2015-10-15 14:39:25 +08:00
Liu Ming 1c2b04f150 add comments and some minor changes. 2015-10-15 12:59:10 +08:00
Liu Ming ca87064f47 refactor interface_ function. 2015-10-15 10:36:59 +08:00
Liu Ming 60db229072 use namespace in the function and remove unused variables. 2015-10-15 10:24:41 +08:00
Atgeirr Flø Rasmussen d78e14c1c6 Merge pull request #897 from totto82/crossflow 
Add boolean flag to determine whether crossflow is allowed in a well
 2015-10-14 09:36:27 +02:00
Atgeirr Flø Rasmussen a8e042aeb6 Merge pull request #902 from joakim-hove/rename-memcmp-double 
Renamed memcmp_double -> opm_memcmp_double
 2015-10-14 09:32:45 +02:00
Liu Ming 30b7842c5d use opm-common ErrorMarcos. 2015-10-13 15:13:14 +08:00
Atgeirr Flø Rasmussen 08eea02316 Merge pull request #899 from andlaus/error_macros_to_opm_common 
Error macros to opm common
 2015-10-12 13:31:42 +02:00
Joakim Hove 68e12e9250 Renamed memcmp_double -> opm_memcmp_double 2015-10-12 09:25:37 +02:00
Bård Skaflestad 0184d4a71d Merge pull request #900 from qilicun/actnum_cart_grid 
fix actnum with cartesian grid issue.

This resolves #898
 2015-10-09 15:08:19 +02:00
Liu Ming 427c5b7afd use PinchMode instead of string. 2015-10-09 16:30:39 +08:00
Liu Ming 8788563088 fix actnum with cartesian grid issue. 2015-10-09 13:44:11 +08:00
Liu Ming 42eb5ed830 add files to cmake file list. 2015-10-09 10:33:52 +08:00
Liu Ming d8ccd32716 Add tests case for pinch processor. 2015-10-09 10:33:21 +08:00
Liu Ming 8beccf431f remove PINCH item 2 support. 2015-10-09 10:32:57 +08:00
Liu Ming fc263590ea Merge remote branch 'remotes/opm/master' into pinchprocessor 2015-10-09 09:42:50 +08:00
Andreas Lauser 26c6077ddb remove the header files with the error macros 2015-10-08 12:14:16 +02:00
Andreas Lauser c8000272bf use the error macros from opm-common 2015-10-08 11:42:15 +02:00
Tor Harald Sandve 95df0c5cf6 Set wd.allowCrossFlow directly 2015-10-07 12:50:00 +02:00
Tor Harald Sandve 2303c43c03 Avoid using bool in the c code 2015-10-07 12:49:05 +02:00
Bård Skaflestad 28a793c448 Merge pull request #896 from joakim-hove/relocate-warning-headers 
Relocated warning headers.
 2015-10-06 15:56:23 +02:00
Tor Harald Sandve 80cdb6bbf0 Add boolean flag to determine whether crossflow is allowed in a well 
This PR adds allow_cf to the wells structure that determine whether
crossflow is allowed or not. An extra argument is added to addWell(..)
to specify the allow_cf flag.
 2015-10-06 15:54:20 +02:00
Joakim Hove c8649896f8 Relocated warning headers. 2015-10-06 11:39:14 +02:00