Commit Graph

1077 Commits

Author SHA1 Message Date
Andreas Lauser
2f08e57ad8 Merge pull request #240 from andlaus/fix_headercheck
make all headers autonomous again
2017-07-20 13:10:44 +02:00
Andreas Lauser
b65defe489 make all headers autonomous again
i.e., they can be included without having other files included before them.
2017-07-20 12:08:47 +02:00
Andreas Lauser
9583b402c7 Merge pull request #237 from andlaus/remove_deprecated
RegularizedBrooksCoreyParams: remove long deprecated method
2017-06-30 14:33:17 +02:00
Andreas Lauser
99039f6d62 RegularizedBrooksCoreyParams: remove long deprecated method
this method is unused in the whole OPM project and has long been
renamed to setPcLowSw().
2017-06-29 18:42:39 +02:00
Andreas Lauser
3ddc7a5340 Merge pull request #234 from dr-robertk/PR/cleanup-scalar
[cleanup] make code compile when Scalar is non POD type.
2017-06-27 13:13:39 +02:00
Andreas Lauser
0a2591f3fd Merge pull request #236 from andlaus/fix_debug_mode_warning
fix an unused typedef warning that only occurs in debug mode
2017-06-27 13:13:01 +02:00
Andreas Lauser
e9dfe00335 Merge pull request #235 from andlaus/fix_critsat
EclEpsScalingPoints: make determining the critical saturations more robust
2017-06-26 13:29:30 +02:00
Andreas Lauser
3c7e12976f fix an unused typedef warning that only occurs in debug mode 2017-06-26 10:40:17 +02:00
Andreas Lauser
967af088bb EclEpsScalingPoints: make determining the critical saturations more robust
these loops are somewhat tricky. the new versions are infinitessimally
slower, but hopefully much more robust.
2017-06-24 13:13:02 +02:00
Robert Kloefkorn
aec9fe5834 [cleanup] make code compile when Scalar is non POD type. 2017-06-23 10:46:55 +02:00
Atgeirr Flø Rasmussen
d0ef28833a Merge pull request #220 from andlaus/eval_specializations_v2
Eval specializations v2
2017-06-15 10:39:57 +02:00
Andreas Lauser
72fd2c8a7e Merge pull request #233 from andlaus/densead_declutter
Densead declutter
2017-06-15 10:33:42 +02:00
Andreas Lauser
87222f3c6a disable a static assertation in the DenseAD convenience functions
the problem is that some of these function names clash with those for
code using AutoDiffBlock. This is normally not a problem because of
the SFINAE rule, but the static assertation makes the compiler bail
out before SFINAE kicks in.

IMO this is a little unfortunate because without this static_assert
compiler errors are bound to becomming quite a bit more obscure, but
as long there is code which uses both AD approaches at the same time,
I cannot see a way to keep the assert without moving one approach or
the other to a different namespace (or renaming the math function for
one).
2017-06-14 11:06:04 +02:00
Andreas Lauser
0f6540bdad DenseAD: make less fuzz about it
this patch converts to code to use the convenience functions instead
of the math toolboxes whereever possible. the main advantage is that
Opm::foo(x) will work regardless of the type of `x`, but it also
reduces visual clutter.

also, constant Evaluations are now directly created by assigning
Scalars, which removes further visual noise.

while I hope it improves the readability of the code,
functionality-wise this patch should not change anything.
2017-06-13 17:25:03 +02:00
Andreas Lauser
acfa7c43e5 convenience functions: use the raw type for results
i.e., we should not return references and we also should remove the
const qualifier in this context. (if these are wanted, the calling
scope should add them.)
2017-06-13 17:18:47 +02:00
Andreas Lauser
256fcd65d4 use log() instead of ln() to calculate the natural logarithm
it seems like ln() is non-standard and this piece of code only
compiled because that particular method is never instantiated.
2017-06-13 17:17:26 +02:00
Andreas Lauser
7050193167 update generated files 2017-06-07 15:20:01 +02:00
Andreas Lauser
ee5ee215bd explicitly include all Evaluations in the file for each specialization
indirectly this was already the case: Math.hpp includes
Evaluation.hpp, but this change should make it more explicit.
2017-06-07 15:20:01 +02:00
Andreas Lauser
1a1b17a5c8 revert optimizing the division code for evaluations 2017-06-07 15:20:01 +02:00
Andreas Lauser
19fb18dc20 clean up the code generator script for Evaluations a bit
this mainly removes superfluous newlines in the generated files, but
also makes them bit more consistent.
2017-06-07 15:20:01 +02:00
Andreas Lauser
2f86c78dd8 Revert "Revert "[WIP] Evaluation: specialize evaluations for used numbers in Blackoil setting""
This reverts commit cfc79fd6d5.
2017-06-07 15:20:01 +02:00
Andreas Lauser
2a69da14f0 Simplify usage of Evaluations in some places
The convenience functions allow to get rid of many direct calls to the
toolbox and constants can be directly returned as doubles.
2017-06-07 15:20:01 +02:00
Atgeirr Flø Rasmussen
14bf347ec3 Merge pull request #232 from nairr/term_output_mod
Minor changes to log type
2017-05-29 08:52:41 +02:00
Rohith Nair
0d70d3c32d Minor changes to log type 2017-05-24 11:31:16 +02:00
Andreas Lauser
ea7cc1f56e Merge pull request #229 from andlaus/implement_blackoil_solvent
black-oil: add a PVT class for solvents
2017-05-05 18:45:56 +02:00
Andreas Lauser
027c366dd1 black-oil: add a PVT class for solvents
this is anlogous to the dry gas PVT code but it uses the PVDS and
SDENSITY keywords.

Note that this object is only used by the eWoms black-oil solvent
code, i.e. it not used by the black oil fluid system or any other
opm-material code, but IMO opm-material is the right place for it
because of its similarity to dry gas.
2017-05-05 10:47:43 +02:00
Andreas Lauser
6b2fe9633b Merge pull request #228 from andlaus/fix_warning
FluidStateCompositionModules: fix some compiler warning
2017-05-04 14:21:29 +02:00
Andreas Lauser
db0086df29 FluidStateCompositionModules: fix some compiler warning
that warning was correct, but bogus: while this data was indeed used
without initialization, using the mass composition of a phase before
fully specifying the molar composition is incorrect and would have
trigger a valgrind complaint. (valgrind will still complain after that
patch.)
2017-05-04 13:14:43 +02:00
Andreas Lauser
34f3a35c97 Merge pull request #225 from atgeirr/silence-warnings
Silence warnings.
2017-04-12 10:19:12 +02:00
Atgeirr Flø Rasmussen
a229ba0945 Silence warnings.
One shadowing and one unused variable.
2017-04-12 07:49:31 +02:00
Andreas Lauser
aa7d20fe12 Merge pull request #224 from nairr/terminal_output_mod
terminal output modifications
2017-04-11 11:04:19 +02:00
Andreas Lauser
d24f82a86d Merge pull request #216 from dr-robertk/PR/fix-pointer-deleting-problem
EclMultiplexerMaterialParams: use shared_ptr instead of void*.
2017-04-11 10:46:25 +02:00
Rohith Nair
901f72599f minor change 2017-04-11 09:57:24 +02:00
Rohith Nair
8e61957b8d minor changes to output tag 2017-04-11 09:53:31 +02:00
Rohith Nair
7194815a87 Changed certain output classifications 2017-04-10 19:01:53 +02:00
Andreas Lauser
86300907cb test_components: check the API comprehensively
for some reason some methods were untested up now.
2017-04-10 12:26:11 +02:00
Andreas Lauser
a9d997785c make all components compile properly with evaluations 2017-04-10 12:26:11 +02:00
Andreas Lauser
989e04efe9 fix the headercheck
i.e., make all headers includable without preconditions.
2017-04-10 12:26:11 +02:00
Andreas Lauser
262de1b8fb simple CO2: fix a snafu related to evaluations
in some places, it used primitive floating point objects when it
should have used Evaluations. This is probably not the only place
where this happens, but IMO the individual components are pretty low
priority.
2017-04-10 12:26:11 +02:00
babrodtk
5950d6458e Fixed numerical problems with bubble/dew point pressures 2017-04-10 12:26:11 +02:00
Atgeirr Flø Rasmussen
0d6655ad86 Revert "[WIP] Evaluation: specialize evaluations for used numbers in Blackoil setting" 2017-04-10 12:26:11 +02:00
Tor Harald Sandve
0210dff3af Add method to get connectionMaterialLawParams
This method changes the saturation table idx in the original material
law parameter object. In the context of ECL reservoir simulators, this
is required to properly handle wells with its own saturation table idx.
In order to reset the saturation table idx in the materialLawparams_
call the method with the cells satRegionIdx after it has been used for
the well connection.

Hysteresis is not accounted for. Is is a open question how this should
be implemented. A warning is given if hysteresis is combined with a
modified saturation table idx for the connection.
2017-04-10 12:26:11 +02:00
Andreas Lauser
2e578ce6b3 Merge pull request #223 from andlaus/fix-test_components
Fix API test for components
2017-04-10 12:22:56 +02:00
Andreas Lauser
7892561f29 Merge pull request #221 from andlaus/release_maintainance
Release maintainance
2017-04-10 11:28:06 +02:00
Andreas Lauser
e88216d9d5 test_components: check the API comprehensively
for some reason some methods were untested up now.
2017-04-10 11:22:54 +02:00
Andreas Lauser
83d73f65e7 make all components compile properly with evaluations 2017-04-10 11:22:54 +02:00
Andreas Lauser
c5a62aa0d8 fix the headercheck
i.e., make all headers includable without preconditions.
2017-04-10 11:08:34 +02:00
Andreas Lauser
2b185c49e2 Merge pull request #222 from andlaus/fix_simpleCO2
simple CO2: fix a snafu related to evaluations
2017-04-09 19:54:47 +02:00
Andreas Lauser
899437ac27 simple CO2: fix a snafu related to evaluations
in some places, it used primitive floating point objects when it
should have used Evaluations. This is probably not the only place
where this happens, but IMO the individual components are pretty low
priority.
2017-04-09 19:51:05 +02:00
Atgeirr Flø Rasmussen
77ea8d5d41 Merge pull request #217 from totto82/connMat2
Add method to get connectionMaterialLawParams
2017-04-07 14:43:39 +02:00