Commit Graph

690 Commits

Author SHA1 Message Date
Kai Bao
17264e0873 addressing reviewing comments from PR#137 2018-12-11 10:58:49 +01:00
Kai Bao
25e01bd962 removing the duplicate code in XYTabulated2DFunction 2018-12-11 10:33:52 +01:00
Kai Bao
9bf6d01acc adding a test for XYTabulated2DFunction 2018-12-06 13:19:04 +01:00
Kai Bao
889ff8f0a5 some cleaning up of XYTabulated2DFunction 2018-12-03 10:30:27 +01:00
Kai Bao
bbfafad2da various fixes to make DynamicEvaluation work with simulations 2018-11-30 15:34:26 +01:00
Kai Bao
6c20ecad14 adding table XYTabulated2DFunction 2018-11-30 15:34:26 +01:00
Andreas Lauser
b3afa00d08 Merge pull request #312 from totto82/passCanonicalPhaseIdx
Pass canonical phaseIdx to setXXX() methods in fluidsystem
2018-10-29 18:45:46 +01:00
Tor Harald Sandve
e1105cbf0a Pass canonical phaseIdx to setXXX() methods in fluidsystem 2018-10-29 13:01:03 +01:00
Andreas Lauser
7c1d52346b Merge pull request #311 from andlaus/stylistic_BlackOilFluidState_cleanups
some minor coding style cleanups for BlackOilFluidState
2018-10-19 15:17:38 +02:00
Andreas Lauser
656d98721c some minor coding style cleanups for BlackOilFluidState
OPM/opm-material#310 introduced a few minor coding style
inconsistencies. this patch fixes them; none of its changes are
supposed to alter anything functionality-wise.
2018-10-19 14:15:01 +02:00
Tor Harald Sandve
ef5154951a BlackOilFluidState: Only store active phases in the two phase case 2018-10-18 12:41:29 +02:00
Andreas Lauser
20630fa856 Merge pull request #305 from andlaus/fix_gcc8_warnings
fix some GCC 8 warnings
2018-09-20 18:05:25 +02:00
Andreas Lauser
555bf7ad75 fix some GCC 8 warnings
the warnings about catching a polymorphic type by value. I agree that
this should not be done.
2018-09-18 14:03:53 +02:00
Bård Skaflestad
c765b21917 Merge pull request #304 from andlaus/remove_FluidSystems_namespace
remove the Opm::FluidSystems namespace
2018-07-27 21:05:11 +02:00
Andreas Lauser
6cb7df3541 remove the Opm::FluidSystems namespace
this has mildly annoyed me for quite some time, and finally managed to
bring myself to changing it: The Opm::FluidSystems namespace is pretty
useless because the number of classes contained within it is quite
small and mismatch between the naming convention of the file names the
actual classes is somewhat confusing IMO. Thus, this patch changes the
naming of fluid systems from `Opm::FluidSystems::Foo` to
`Opm::FooFluidSystem`.

(also, flat hierarchies currently seem to be popular with the cool
people!?)

this patch requires some simple mop-ups for `ewoms` and `opm-simulators`.
2018-07-27 12:57:09 +02:00
Atgeirr Flø Rasmussen
70e6fcb190 Merge pull request #303 from andlaus/fix_extra_warnings
Fix extra warnings
2018-07-05 14:29:52 +02:00
Andreas Lauser
e1f33492c8 EclMaterialLawManager: actually use the imbibition number array passed as argument
for some reason, the version of 311c1a6 that was merged did still use
the compressed cell index as the logically Cartesian one. I blame it
on the constant back-and-forth debugging when making that patch.
2018-07-05 12:50:54 +02:00
Andreas Lauser
8cde35ef7b MathToolbox: fix unused argument warning 2018-07-05 12:50:54 +02:00
Andreas Lauser
de6c6e8cfa Evaluation: update generated code 2018-07-05 12:50:54 +02:00
Andreas Lauser
b91f198747 update Evaluation-code generator to get rid of a few warnings in the generated code
these warnings require -Wextra or above but do not occur with -Wall.
2018-07-05 12:50:54 +02:00
Kai Bao
5c1ddaefab Merge pull request #302 from andlaus/dynamic_evaluation
Dynamically sized evaluations
2018-06-28 19:42:45 +02:00
Andreas Lauser
f316b0699e add an Opm::blank(Evaluation) function
this creates an uninitialized "compatible" evaluation that is
compatible with its argument. For primitive floating point types and
statically-sized Evaluations, this is identical to calling the default
constructor, for dynamically sized ones, it creates an uninitialized
Evaluation object of identical size as the argument.

thanks to [at]GitPaen for the heads up.
2018-06-28 17:27:48 +02:00
Andreas Lauser
328efa793c add dynamic evaluations to the unit test for dense-AD
this requires a medium-sized refactoring of the test.
2018-06-28 17:27:48 +02:00
Andreas Lauser
7b12d493d7 make the "shrubbery" of dense-AD aware of dynamic evaluations
i.e., adapt the math routines.
2018-06-28 17:27:48 +02:00
Andreas Lauser
362965c198 update the generated source files 2018-06-28 17:27:48 +02:00
Andreas Lauser
fec2428c3e evaluation code gen: add a dynamically-sized variant of evaluation
this works by passing -1 as the template argument for the number of
derivatives. most of the code is identical, but creation of such
objects requires the number of derivatives passed to the constructor
or the copy constructor must be used.

Finally `DynamicEvaluation<Scalar>` is provided as a more expressive
alias for `Evaluation<Scalar, -1>`.
2018-06-28 17:27:47 +02:00
Tor Harald Sandve
2a8b6e8974 Merge pull request #300 from andlaus/1_for_EHSYTR_item_2
implement support for "1" of the second item of EHYSTR
2018-06-28 07:42:52 +02:00
Andreas Lauser
bcec72a7db implement support for "1" of the second item of EHYSTR
this means Carlson's hysteresis model for the relperm of the
non-wetting phase and the imbibition instead of the drainage curve for
the relperm of the wetting phase.
2018-06-19 14:37:09 +02:00
Andreas Lauser
311c1a6ae1 ECL hysteresis: fix the imbibition number
so far, compressed element indices have been used to access data for
logical cartesian cells. this does not matter if there is only a
single saturation region for imbibition and thus IMBNUM is
uniform. (e.g., this is the case for Norne as far as I can see.)
2018-06-19 14:29:40 +02:00
Andreas Lauser
86a377dc1e make the quadruple precision math support code compatible with dune-fem
the stream operators are actually the ones for double precision.
2018-05-17 11:30:31 +02:00
Atgeirr Flø Rasmussen
6dd79068fd Merge pull request #292 from andlaus/rename_internal_vars
SPECROCK thermal law: rename internal variables
2018-03-28 12:21:37 +02:00
Andreas Lauser
898af59418 use the midpoint rule to integrate linear functions
this used to be the unmodified quadratic function that results from
integrating a linear function. using the midpoint rule is quite a bit
simpler and should yield the same results.

thanks to [at]atgeirr for pointing this out.
2018-03-28 09:45:29 +02:00
Andreas Lauser
038f9c7bf1 thermal PVT and rock laws: fix the integration of the heat capacities
this was quite embarrassing. thanks to [at]atgeirr for pointing it out.
2018-03-27 14:00:41 +02:00
Andreas Lauser
01403ccdb3 thermal laws: rename some internal variables
using `u` or `h` for heat capacities is very confusing because the
variables can easily be mistaken for the internal energy or enthalpy.
2018-03-27 13:52:51 +02:00
Andreas Lauser
e773914399 Merge pull request #291 from andlaus/fix_dune_master
make it work with the latest dune master
2018-03-12 15:16:00 +01:00
Andreas Lauser
9891b2a3c7 make it work with the latest dune master
Dune::set_singularity_limit() has been removed there and std::real()
gets used by the dense matrix-vector code (this causes trouble if
`quad` is selected as scalar type)
2018-03-12 13:58:45 +01:00
Arne Morten Kvarving
283550a702 Merge pull request #290 from akva2/adjust_ecl
adjustments for moved eclipse support (now in opm-common)
2018-03-06 15:34:34 +01:00
Arne Morten Kvarving
53b24d482a adjustments for moved eclipse support (now in opm-common) 2018-03-05 12:49:22 +01:00
Andreas Lauser
52321e5c04 Merge pull request #289 from andlaus/fix_warnings
Fix warnings
2018-03-03 13:30:38 +01:00
Andreas Lauser
ed0e839eb5 avoid single precision floating point underflows in MiscibleMultiPhaseComposition
for single-precision FP scalars, this was the same as setting a
tolerance of 0. maybe this should be done instead?!
2018-03-03 13:17:33 +01:00
Andreas Lauser
135f81073d add a few OPM_UNUSED decorations to variables which are only used within static_assert
for some reason icc produces a warning about this.
2018-03-03 13:17:33 +01:00
Atgeirr Flø Rasmussen
a7d929e638 Merge pull request #288 from atgeirr/missing-include
Include <stdexcept> for std::runtime_error.
2018-02-14 14:46:06 +01:00
Atgeirr Flø Rasmussen
da4b160438 Include <stdexcept> for std::runtime_error. 2018-02-14 13:02:40 +01:00
Andreas Lauser
e5e43fa7a8 Merge pull request #287 from andlaus/separate_opm-common_concerns
move some basic infrastructure from opm-common to here
2018-02-08 16:24:51 +01:00
Andreas Lauser
27386851a2 move some basic infrastructure from opm-common to here
all of these classes have only been used in opm-material and its
downstreams in the first place.
2018-02-07 16:44:44 +01:00
Joakim Hove
9aa47b2969 Merge pull request #282 from andlaus/cp_to_cv
Cp to cv
2018-01-31 17:51:13 +01:00
Atgeirr Flø Rasmussen
94f0f8b985 Merge pull request #283 from akva2/relocate_files_in_common
changed: opm/common/[->utility/]ConditionalStorage.hpp
2018-01-31 13:17:57 +01:00
Andreas Lauser
7fece91b76 Merge pull request #284 from atgeirr/master
Silence some warnings
2018-01-30 15:47:43 +01:00
Atgeirr Flø Rasmussen
a9018ece34 Add OPM_UNUSED to unused temperature arguments. 2018-01-30 15:06:26 +01:00
Atgeirr Flø Rasmussen
578426f4cd Remove unused arguments. 2018-01-30 15:06:13 +01:00