Commit Graph

898 Commits

Author SHA1 Message Date
Andreas Lauser
005cf203d7 isfinite() and isnan() are supposed to return booleans
... not Evaluations. This was probably a copy-and-pasto.
2017-03-06 17:05:23 +01:00
Andreas Lauser
38cee86f6c Merge pull request #208 from andlaus/satregion_parameters
EclMaterialLawManager: add saturation region-specific material law parameters
2017-03-02 11:00:41 +01:00
Andreas Lauser
1f2d72aba1 EclMaterialLawManager: add saturation region-specific material law parameters
this is needed for the well model. Be aware that in the future this
will probably need to be changed to have one material parameter object
per connection instead of one per saturation region. This attitude
adjustment would be necessary to support endpoint scaling and
hysteresis in the well model, but so far it is unclear what the
reference simulator does.
2017-03-01 13:19:56 +01:00
Andreas Lauser
9d6a620680 Merge pull request #207 from andlaus/SCALECRS-from-EclipseState
Scalecrs from eclipse state
2017-02-24 17:33:22 +01:00
Andreas Lauser
dd587f10e3 Merge pull request #206 from andlaus/sort_by_default
make the "sortInputs" argument of the 1D function tabulation classes default to true
2017-02-24 16:54:33 +01:00
Andreas Lauser
b15f99de5e make this work with the latest master version of opm-parser 2017-02-24 16:51:28 +01:00
Jørgen Kvalsvik
956e7f5341 Read SCALECRS and ENDSCALE from EclipseState 2017-02-24 16:11:01 +01:00
Andreas Lauser
2bafb4f7ed make the "sortInputs" argument of the 1D function tabulation classes default to true
"1D function tabulation classes" means 'Opm::Spline' and
'Opm::Tabulated1DFunction'.

note that 'sortInputs' is a slight misnomer because these setter
methods still expect the arguments to be given in either ascending or
descending order of the 'x' values and if they are given in descending
order, the order internal copies of these arrays are reversed. a full
sort would be a bit more work because it requires to sort two
independent arrays synchronously.
2017-02-24 12:03:07 +01:00
Atgeirr Flø Rasmussen
2b566f5324 Merge pull request #205 from andlaus/no-splines-in-blackoil
do not use splines within the black-oil PVT objects
2017-02-24 08:58:59 +01:00
Andreas Lauser
b79baada99 do not use splines within the black-oil PVT objects
as far as I can see, the splines were only used to get a good initial
guess for the R(p) inversion code, so it should be safe to replace
them by piecewise linear functions.
2017-02-23 14:49:01 +01:00
Andreas Lauser
b168cae42b Merge pull request #204 from babrodtk/pdpb_output
Added bubble point and dew point functions
2017-02-17 09:13:43 +01:00
babrodtk
7aac046e04 Added bubble point and dew point functions 2017-02-17 08:49:40 +01:00
Andreas Lauser
a70059448f Merge pull request #201 from totto82/fixJFUNC
Adapt to unit changes in opm-parser for JFUNC
2017-02-09 09:54:44 +01:00
Andreas Lauser
47c6940de5 Merge pull request #202 from dr-robertk/PR/move-finalized_-to-base-class
[WIP] Move assertFinalized_ to base class to avoid code duplication.
2017-02-07 19:23:31 +01:00
Robert Kloefkorn
a6617c575e Restore default behavior of finalize_ 2017-02-07 16:28:14 +01:00
Robert Kloefkorn
e02a5d63e8 Converted all *Params classes to use EnsureFinalized. By default this feature is
enabled until an optional switch will be implemented.
2017-02-07 16:10:54 +01:00
Robert Kloefkorn
a4417d4a9f AssertFinalized --> EnsureFinalized. 2017-02-07 13:05:21 +01:00
Robert Kloefkorn
fd7059d6a0 Move assertFinalized_ to base class to avoid code duplication and allow for easy
toggle of functionality.
2017-02-07 11:29:38 +01:00
Tor Harald Sandve
2e51ae5079 Adpat to unit changes in opm-parser for JFUNC
The ECL Leverett function implementation "misuses" the pressure column
of the underlying tables (SWOF, SGOF, SWFN, etc.) for the
(dimensionless) J-Function. The correct converstion factor is now
applied in the parser and no converstions is needed no the opm-material
side.
2017-02-06 09:31:10 +01:00
Atgeirr Flø Rasmussen
b9d209a8b0 Merge pull request #196 from andlaus/consistency_improvements
Consistency improvements
2017-01-19 10:17:03 +01:00
Andreas Lauser
45da261142 move the '&' of references and the '*' of pointers to the type name
i.e., the new-style is `TypeName& var` instead of
`TypeName &var`. this patch is analogous to part of OPM/ewoms#83.
2017-01-18 17:57:54 +01:00
Andreas Lauser
19f1a27447 place the OPM_UNUSED macro after the variable name
this is analogous to OPM/ewoms#134.
2017-01-18 17:55:58 +01:00
Andreas Lauser
301be1ab8d Merge pull request #195 from andlaus/blackoilfluidsystem_isInitialized
BlackOilFluidSystem: add isInitialized()
2017-01-09 12:15:10 +01:00
Andreas Lauser
0d22035995 BlackOilFluidSystem: add isInitialized()
this allows to explicitly query if the fluid system has already been
initialized or not. the motiviation for this patch is that this method
can be used to avoid initializing the fluid system multiple times.
2017-01-09 12:11:06 +01:00
Andreas Lauser
affa356382 Merge pull request #194 from andlaus/valgrind_fix
properly initialize the VAPPAR parameters for wet gas and live oil
2017-01-06 09:20:42 +01:00
Andreas Lauser
a407546355 properly initialize the VAPPAR parameters for wet gas and live oil
valgrind complained about it. this is only relevant if initFromDeck()
is **not** used to initialize these objects. (e.g., this is the case
for the reservoir_blackoil_* tests of eWoms.)
2017-01-06 09:18:57 +01:00
Andreas Lauser
4e3b48688d Merge pull request #191 from atgeirr/remove-unused-deck-arg
Remove unused Deck arguments.
2017-01-02 11:01:25 +01:00
Atgeirr Flø Rasmussen
4abfb825eb Remove unused Deck arguments. 2017-01-02 09:46:30 +01:00
Pål Grønås Drange
42c739c679 Merge pull request #190 from andlaus/use_internalized_jfunc
use the new and shiny internalized JFUNC object from opm-parser
2016-12-30 09:33:52 +01:00
Andreas Lauser
7e0cb71002 use the new and shiny internalized JFUNC object from opm-parser
from my point of view, the main advantage is that the string
processing for the 'flag' and 'direction' items does no longer need to
be done by opm-material.
2016-12-29 13:48:25 +01:00
Andreas Lauser
8d27890544 Merge pull request #189 from andlaus/constexpr_quad
quad.hh: constexpressify std::numeric_limits<quad>
2016-12-27 22:17:00 +01:00
Andreas Lauser
f9aa063ba0 quad.hh: constexpressify std::numeric_limits<quad>
our oldest supported compiler (GCC 4.8) now has good enough constexpr
support and c++-2011 and above seem to use constexpr for the numeric
limits of the standard floating point types.
2016-12-27 17:01:06 +01:00
Atgeirr Flø Rasmussen
1f74a77730 Merge pull request #188 from andlaus/fix_twophase_ecl_hysteresis
EclTwoPhaseMaterial: do not update the oil-water hysteresis parameters for non-existing objects
2016-12-22 15:36:45 +01:00
Andreas Lauser
5bebabcd79 EclTwoPhaseMaterial: do not update the oil-water hysteresis parameters for non-existing objects
we must not update these parameters because the respective objects do
not exist in these cases. As far as I can see, both saturation function
objects need to exist for the gas-water twophase case despide the fact
that there is no oil because the capillary pressure between water and
gas is the sum of the capillary pressures between gas+oil and
oil+water. (also, I am not aware of any ECL keywords to provide the
gas-water saturation functions directly.)
2016-12-22 14:43:04 +01:00
Andreas Lauser
6075748dda Merge pull request #187 from andlaus/include_correct_header
quad.hh: include the correct header for std::runtime_error
2016-12-15 11:00:26 +01:00
Andreas Lauser
1d1f0e2095 quad.hh: include the correct header for std::runtime_error 2016-12-15 10:58:57 +01:00
Atgeirr Flø Rasmussen
16451b2bf9 Merge pull request #186 from andlaus/minor_reorg
Minor reorg
2016-12-14 21:46:05 +01:00
Andreas Lauser
4ab2b3dc70 move over the quadruple precision math code from eWoms 2016-12-14 12:36:09 +01:00
Andreas Lauser
39c5c94ac7 the new home of Valgrind.hpp is opm-common! 2016-12-14 09:46:21 +01:00
Andreas Lauser
a607daa6e1 delete ClassName.hpp
it is now replaced in favour of Dune::className() from dune/common/classname.hh
2016-12-14 09:46:16 +01:00
Andreas Lauser
36faf5d156 Merge pull request #185 from andlaus/inline_className
add missing "inline" to __float128 specialization of className()
2016-12-13 14:12:41 +01:00
Andreas Lauser
59c4d0f91b add missing "inline" to __float128 specialization of className()
if this specialization is not marked as "inline" it leads to linker
errors due to multiple definitions of the
`Opm::className<__float128>()` symbol. I consider this pretty
surprising behaviour of the C++ language because template functions do
not need to declared as `inline`.
2016-12-13 14:11:14 +01:00
Andreas Lauser
fde29dc7f3 Merge pull request #184 from andlaus/fix_2p_ecl_init
EclMaterialLawManager: fix and simpilfy the two-phase inititialization
2016-12-12 19:21:59 +01:00
Andreas Lauser
8fa3b6ee81 EclMaterialLawManager: fix and simpilfy the two-phase inititialization
this also fixes a bug where some parameter objects were not correctly
initialized in the two-phase (i.e., oil-water) case.
2016-12-12 14:39:43 +01:00
Atgeirr Flø Rasmussen
8dc4e0b2dc Merge pull request #179 from andlaus/move_Unused_hpp
delete Unused.hpp
2016-11-29 10:35:24 +01:00
Andreas Lauser
29de6a0174 Merge pull request #180 from andlaus/implement_two-phase_blackoil
make the BlackOilFluidSystem two-phase ready
2016-11-28 15:15:41 +01:00
Andreas Lauser
6592dc54f7 make the BlackOilFluidSystem two-phase ready 2016-11-22 15:10:28 +01:00
Andreas Lauser
69b2ebc5c6 delete Unused.hpp
it is moved to opm-common. use that file instead.
2016-11-22 14:43:00 +01:00
Joakim Hove
afa02f05d7 Merge pull request #178 from atgeirr/use-eclstate-tabdims
Use tabdims from EclipseState.
2016-11-18 11:30:19 +01:00
Atgeirr Flø Rasmussen
4514d5454c Use tabdims from EclipseState. 2016-11-17 22:39:32 +01:00