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

2494 Commits

Author SHA1 Message Date
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
50814d88ce Merge pull request #905 from atgeirr/fix-timestep-bug 
Fix timestep bug
 2015-10-22 13:37:49 +02:00
Atgeirr Flø Rasmussen
d460952d08 Make SaturationPropsFromDeck work for two-phase cases. 2015-10-21 15:27:52 +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
Tor Harald Sandve
8b94e7b0eb Make the code more readable 2015-10-20 16:09:04 +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
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
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
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
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
Joakim Hove
545aeeeb23 Fxied bug in table-container use. 2015-10-05 15:59:08 +02:00
Joakim Hove
61d5e291d6 Merge pull request #886 from joakim-hove/table-container 
Changed Table code to use TableContainer
 2015-10-05 14:46:49 +02:00
Joakim Hove
5b15bbdde2 Changed Table code to use TableContainer 2015-10-05 09:59:29 +02:00
Atgeirr Flø Rasmussen
0d802def88 Merge pull request #887 from osae/equil-water-zone 
Support for equil-initialisation for datum depth outside oil zone.
 2015-10-03 19:04:34 +02:00
Liu Ming
0d0abcd396 remove unused variables. 2015-09-30 14:05:09 +08:00
Liu Ming
0667203879 Use std function to get the index of value in vector. 2015-09-30 14:04:49 +08:00
Liu Ming
043dc83667 use std::numeric_limits instead of the constant big value. 2015-09-30 14:04:30 +08:00
Liu Ming
1eda852cca - rename functions and variables. 
- add comments.
- add NNC object.
 2015-09-30 14:04:00 +08:00
Liu Ming
82701040b2 Add PinchProcessor for keyword PINCH and MINPV. 2015-09-30 14:03:22 +08:00
Atgeirr Flø Rasmussen
fbd6fce24f Merge pull request #888 from totto82/avoid_throw_wellManager 
WARN instead of THROW if completion is not found in the grid
 2015-09-28 10:02:06 +02:00
Joakim Hove
43d1890190 Merge pull request #889 from totto82/fixTotalRates 
Use correct units for the accumulated output
 2015-09-23 10:35:23 +02:00
Markus Blatt
860bb6eaff Prevent WellsManager from subscripting empty container. 
While hopefully not a bug it raises an exception with gcc's
libc debugging mode. Therefore we resort to using C++11's
std::vector::data instead.

The exception was rosen when running SPE9 in parallel.
 2015-09-23 09:28:59 +02:00
Tor Harald Sandve
ac32b6302e Use correct units for the accumulated output 
Avoid division on time in the total output of rates.
 2015-09-22 15:49:01 +02:00
Tor Harald Sandve
4251b27737 WARN instead of THROW if completion is not found in the grid 
Completions that are not found in the grid are ignored.
 2015-09-22 13:51:06 +02:00
osae
6267a3f3e5 Support for equil-initialisation for datum depth outside oil zone. 2015-09-21 18:22:11 +02:00
Robert Kloefkorn
4881b3ab6a AdaptiveTimeStepping: also apply terminal output to solver_verbose. 2015-09-16 15:19:19 +02:00
Robert Kloefkorn
d972155d64 AdaptiveTimeStepping: pass variable terminal output to avoid multiple outputs in 
parallel.
 2015-09-16 14:33:35 +02:00
Robert Kloefkorn
0a6791313b WellState: move typedefs into public section and include string. 2015-09-16 12:36:05 +02:00