OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
216 Commits 18 Branches 75 Tags
a6499a01aa8117d3101bd18f1b46772791c5edea
Commit Graph

184 Commits

Author SHA1 Message Date
Andreas Lauser
a6499a01aa fix most of the warnings enabled by masochists 
most of these people like to inflict pain on themselfs (i.e., warnings
in their own code), but they usually don't like if pain is inflicted
on them by others (i.e., warnings produced by external code which they
use). This patch should make these kinds of people happy. I'm not
really sure if the code is easier to understand with this, but at
least clang does not complain for most of the warnings of
"-Weverything" anymore.
 2015-09-23 12:36:52 +02:00
Andreas Lauser
be1fd178f1 do not squelch unused argument warnings using casts to void 
casts to void are not very explicit (in particular if they do not come
with a comment about their purpose). Instead, the names of unused
argument are now simply commented out or the OPM_UNUSED macro is used
for the few cases where this is not possible.
 2015-09-23 12:35:45 +02:00
osae
4c08b6e5f4 Buxfix - compressed versus cartesian index. 2015-09-21 13:03:29 +02:00
Atgeirr Flø Rasmussen
337cf41d96 Comment out unused argument. 2015-09-17 15:04:46 +02:00
Atgeirr Flø Rasmussen
fd4b4bf6d1 Merge pull request #57 from atgeirr/silence-warnings 
Silence warnings
 2015-09-15 17:43:56 +02:00
Atgeirr Flø Rasmussen
1ebec84bd1 Remove unused code. 2015-09-15 17:41:09 +02:00
Tor Harald Sandve
ace6a25210 Use tabulated oil saturations directly in KROG for familyII 
Revert bug introduced when refactoring the code in the process of
supporting two-phase simulations.
 2015-09-15 13:35:09 +02:00
Atgeirr Flø Rasmussen
bba5e33973 Suppressed more warnings. 2015-09-14 17:15:04 +02:00
Atgeirr Flø Rasmussen
a5ecbd765c Silence unused argument warnings. 2015-09-11 14:32:59 +02:00
Atgeirr Flø Rasmussen
a15fa4444e Delete unused argument. 2015-09-11 14:32:36 +02:00
Atgeirr Flø Rasmussen
b3f6740a68 Silence more unused argument warnings. 2015-09-11 13:46:45 +02:00
Atgeirr Flø Rasmussen
db3d60eeae Avoid shadowing variables. 2015-09-11 13:38:09 +02:00
Atgeirr Flø Rasmussen
1f42957755 Silence some unused argument warnings. 2015-09-11 13:37:31 +02:00
Andreas Lauser
fb79b732d8 blackoil: fix some screw ups with wet gas 2015-09-04 14:33:19 +02:00
Andreas Lauser
ac14e53129 Merge pull request #50 from andlaus/make_twophase_ecl_satfuncs_work 
Make twophase ecl satfuncs work
 2015-09-03 14:53:18 +02:00
Andreas Lauser
8c3db57025 Evaluation: forward declare Opm::LocalAd::abs() instead of including Math.hpp 
this solves an "order of #include" problem on Dune before 2.4
 2015-09-03 11:20:26 +02:00
Andreas Lauser
03129c01f6 make the ECL twophase code work 
this has been tested with a real deck now.
 2015-09-03 10:55:46 +02:00
Andreas Lauser
d7b5a1b2e3 EpsScalingInfo: move the code which handles individual tables to their own functions 
this avoids copy-and-pasting stuff in the twophase case.
 2015-09-03 10:52:32 +02:00
Andreas Lauser
8ef6f7bfc2 make the Evaluation template class work better as field type for Dune::FieldMatrix/Dune::FieldVector 
IMO this doges the edges of the c++ specifcation quite a bit too hard,
but at least with Dune >= 2.4 it should now work unconditionally (and
for older dune versions, the #error has been demoted to a #warning)
 2015-09-02 13:15:08 +02:00
Andreas Lauser
e08691f90a fix the fallout of the TableManager 
the problem is that the EclMaterialLawManager is currently not used in
any opm-material unit test, so the module compiled just fine without
these fixes. Mental note to myself: add such a unit test!
 2015-09-02 12:29:45 +02:00
Joakim Hove
a76cb4cfc6 Merge pull request #49 from joakim-hove/table-refactor 
Using TableManager class to get input tables.
 2015-09-02 11:57:42 +02:00
Andreas Lauser
543c3cb603 fix some bugs in WetGasPvt 
so far, this has never been tested on a deck which features vaporized oil.
 2015-09-01 16:05:05 +02:00
Andreas Lauser
5edc12bef2 BlackOilFluidSystem: make the order of the phases identical to opm-core 
this simplifies comparisons and mixing code.
 2015-09-01 16:05:05 +02:00
Andreas Lauser
9bfc26a2d8 implement a material law for twophase ECL simulations 
the basic idea is that implements the threephase API, but only
calculates the quantities for the selected fluid phases.
 2015-09-01 12:33:43 +02:00
Andreas Lauser
ee61bc00e7 EclEpsTwoPhaseLaw: clean up the terminology it uses for variable names 
now all variables should contain either "scaled" or "unscaled".
 2015-09-01 12:30:04 +02:00
Joakim Hove
8cf963ba3f Using TableManager class to get input tables. 2015-09-01 12:21:11 +02:00
Andreas Lauser
a58531c3de fix the satfunc family detection code in ECL scaling points class 
thanks to [at]totto82 for finding this.
 2015-08-25 11:38:31 +02:00
Andreas Lauser
5e447cb83a ECL satfuncs: implement support for the SLGOF keyword 
if my understanding of this keyword is correct, it is identical to
SGOF except that the saturation column is specified in terms of Swco +
So instead of as Sg
 2015-08-24 21:51:46 +02:00
Andreas Lauser
c6cafe3a7a shift the gas saturations of the oil relperm tables again 
it seems like this was accidentally undone while resolving conflicts in #42.
 2015-08-24 13:52:09 +02:00
Andreas Lauser
6e27d1ab1d fix compilation in debug mode 2015-08-19 16:07:07 +02:00
Tor Harald Sandve
4431ff6d7d Add function to check saturation function family 
Adapt to change in the EclipseState i.e. the method
to get the saturation function family is no longer available and a
similar method is implemented in EclMaterialLawManager
 2015-08-19 09:29:20 +02:00
Andreas Lauser
220fe9cffa Merge pull request #38 from andlaus/SplineLaw_implement_twophase_inversion_api 
SplineTwoPhaseMaterial: implement the two-phase inversion functions
 2015-08-19 11:02:56 +02:00
Andreas Lauser
ef28c31368 EclHysteresisTwoPhaseLaw: use '<=' instead of '<' to decide whether to use the imbibition or the drainage curve 
this does not change the results in any way, but for the Norne deck,
it improves performance (i.e., It Must Be Right (TM))...
 2015-08-18 17:35:35 +02:00
Andreas Lauser
57948012a5 PiecewiseLinearTwoPhaseMaterial: remove unnecessary calls to min() and max() 
it is nicer to read like this and it may improve performance a tiny
bit.
 2015-08-18 17:35:22 +02:00
Andreas Lauser
0edc7b5f70 EclMaterialLawManager: shift the saturations of the oil phase the in gas-oil twophase system by the connate water saturation 
for the oil phase relperm, the gas saturation column of the SGOF
keyword actually is Sg - Swco. why? it's ECL! don't ask why!
 2015-08-18 17:24:28 +02:00
Tor Harald Sandve
3cffd067e3 PiecewiseLinearTwoPhaseMaterial: make the saturation columns of the quantities independent 2015-08-18 17:24:28 +02:00
Andreas Lauser
7e83191892 Revert "Add support for saturation family 2 keywords" 
This reverts commit a041e3ccff.

it does not compile with the current opm-parser.
 2015-08-18 17:20:29 +02:00
Andreas Lauser
4a7e099246 Merge pull request #37 from totto82/family2 
Add support for saturation family II keywords
 2015-08-18 17:02:54 +02:00
Tor Harald Sandve
a041e3ccff Add support for saturation family 2 keywords 
Saturation functions can no be given using the family 2 keywords SWFN,
SGFN and SOF3.
 2015-08-17 07:08:13 +02:00
Andreas Lauser
14e4692386 EclDefaultMaterial: do not add the connate water saturation to Sw_ow 2015-08-14 17:40:05 +02:00
Andreas Lauser
fb6eb1279a SplineTwoPhaseMaterial: implement the two-phase inversion functions 
these are required for ECL hysteresis.
 2015-08-14 14:04:20 +02:00
Andreas Lauser
a8aaa168e2 EclDefaultMaterial: allow the parameters to decide if consistent or inconsistent hysteresis are used 2015-08-14 09:33:28 +02:00
Andreas Lauser
893538c9f3 EclDefaultMaterial: use inconsistent saturations for the hysteresis update 
with this, I got slightly better performance than the opm-core master
version if flow is tasked on simulating the full Norne deck. Be aware
that from the physical POV, this is wrong.
 2015-08-14 09:26:28 +02:00
Andreas Lauser
83de8aceb1 Merge pull request #35 from andlaus/connate_water_fixes 
Connate water fixes
 2015-08-14 09:26:10 +02:00
Andreas Lauser
0d1c711d8e EclDefaultMaterial: increase the epsilon for division-by-zero-avoidance to 1e-20 
also, treat saturations smaller than 0 as 0. this also makes clamping the
kro values to range [0, 1] superfluous.
 2015-08-13 17:37:19 +02:00
Andreas Lauser
797012a8ba EclDefaultMaterial: add the connate water saturation to the wetting-phase saturation in the gas-oil system 2015-08-13 17:34:21 +02:00
Andreas Lauser
be4593841f EclDefaultMaterial: Make sure that the water saturation is at least the connate water saturation 
I thought this would not make a difference if the tables are
extrapolated by constants, but apparantly it makes a difference for
endpoint scaling.
 2015-08-13 17:31:56 +02:00
Andreas Lauser
ca2a4bbb4e fix saturation scaling points for two-point krw scaling 
kudos to [at]osae for finding this!
 2015-08-12 18:07:05 +02:00
Andreas Lauser
edf345219f limit ecl relperm hystersis to the non-wetting phase 
I have trouble seeing why this can possibly physically justified
(because oil is once the wetting and once the non-wetting phase), but
things seem to be like this as the documentation says that in case of
chosing the relperm hysteresis model 0 via the EHYSTR keyword,
hysteresis is only used for the non-wetting phase.
 2015-08-11 17:23:02 +02:00
Andreas Lauser
f48891ffb0 Merge pull request #30 from andlaus/no_limits_in_krn 
EclDefaultMaterial: do not limit the saturations in krn()
 2015-08-10 12:31:38 +02:00