OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,469 Commits 9 Branches 35 Tags
2f2bd8a9558edb5237b2edf387b9ed2e7ff26fc3
Commit Graph
156 Commits
Author SHA1 Message Date
Tor Harald Sandve 8827ca0794 Bugfix. Fix face direction in the pinchprocessor 2015-12-14 10:48:26 +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 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
Atgeirr Flø Rasmussen fc20fe5be9 Silence some warnings. 2015-12-01 13:36:08 +01: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 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 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 c8000272bf use the error macros from opm-common 2015-10-08 11:42:15 +02:00
Joakim Hove c8649896f8 Relocated warning headers. 2015-10-06 11:39:14 +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
osae 1fdc4c39dc Assure 4 vertices for each face of the grid. 2015-09-11 11:47:27 +02:00
osae 565fa4278e Add some comments and limit to 3 dimensions. 2015-09-10 18:29:02 +02:00
osae 299aa77e18 Cell center depth also from zcorn average. 
There is a sligth difference between the cell depth taken from the
centroid (opm) and a straightforward average of corner coordinates
(ecl). For the initialisation of Norne this causes some differences
when deciding cell center positions relative contact depths.
 2015-09-10 18:29:02 +02:00
babrodtk 221d1a3e92 Fixed several warnings 2015-09-03 15:17:10 +02:00
osae f81a4d62a4 Zero-porosity cells and MINPV. 
Model 2 partly uses PORO=0.0 to signal inactive cells. This PR
prevents such cells from causing unwanted zcorn modifications in
the current min-pv algoritm. (The problem is however more general as
zero PORO or NTG should kill a cell whether MINPV is active or not,
refer kw ACTNUM.)
 2015-08-27 17:49:10 +02:00
Joakim Hove 20968d9c0a Added small utility memcmp_double() 2015-08-12 14:31:07 +02:00
Atgeirr Flø Rasmussen 8a0010527c Suppress warnings. 2015-08-10 16:07:45 +02:00
Atgeirr Flø Rasmussen 1ead8dd458 Fix bug in floating-point comparison. 
The function used integer abs() instead of fabs(), in C abs() only
takes integers so this is an error. Also needed to add comparison
with absolute tolerance to get reasonable behaviour (comparing 0 versus
0.0000000000001 is ok here).
 2015-08-10 16:05:00 +02:00
Markus Blatt 71056f45d6 Renames ADCellVolumesTraits to CellVolumeIteratorTraits. 2015-03-02 11:15:08 +01:00
Markus Blatt adc499b036 Moves all functions that do not depend on Eigen to Opm::UgGridHelpers. 2015-03-02 11:15:08 +01:00
Markus Blatt 7cebb3905b Adds funcionality to access the vertices of the faces and their coordinates. 
This is needed for a grid agnostic implementation of EQUIL.
 2015-02-20 09:35:29 +01:00
Liu Ming ea98e431bc adapt to api changes of opm-parser. 2015-02-12 16:04:41 +08:00
Liu Ming 4d7309b1bf Support minpvf. 2015-02-09 11:25:09 +08:00
Atgeirr Flø Rasmussen 605d3e0d09 Make MinpvProcessor ignore inactive cells. 2015-01-19 15:44:13 +01:00
Markus Blatt 9cf21d87ee Skip the pointer arithmetic. 
Bard was right that the iterator_range returns the underlying
native pointers. Therefore can write the computation much more
natural.
 2015-01-14 21:58:37 +01:00
Markus Blatt 1b6bbb035e Fixed bogus documentation of vanished cell_index. 2015-01-14 10:09:01 +01:00
Markus Blatt cba54977bb Adds a free function to UgGridHelpers to access the face tag. 
To identify the face tag we use the iterator over the cell faces.
This provides all the information needed both for UG and CpGrid.
 2015-01-13 20:36:33 +01:00
Markus Blatt f7622f0e71 Avoid multiple symbol definitions for MinPvProcessor. 
The non-template class MinpvProcessor contains all function
definitions inside of the header file without inlining. The
results in the symbols being in the library of opm-core and
in case of using CpGrid an addtional occurence in other
libraries (opm-autodiff?).

This commit changes this by simply inlining all these functions.

Note that another (better?) option would be to move at least
the bigger once into a cpp file.
 2015-01-12 16:35:03 +01:00
Atgeirr Flø Rasmussen 48439d6420 Use proper way to access pi() from boost::math. 2014-12-01 14:55:06 +01:00
Atgeirr Flø Rasmussen 8af3b17c68 Simplify formula with atan2(). 2014-12-01 14:38:08 +01:00