Commit Graph

434 Commits

Author SHA1 Message Date
Arne Morten Kvarving
8240cca69e remove some grid related utilities
moved to opm-grid
2018-01-17 10:40:51 +01:00
Arne Morten Kvarving
f4111ead14 remove some generic utility classes
moved to opm-common
2018-01-16 13:57:54 +01:00
Arne Morten Kvarving
9603fbd57f changed: remove some generic utility classes
moved to opm-common
2018-01-11 16:58:43 +01:00
Atgeirr Flø Rasmussen
2977d8659e Make constructor generic.
This supports std::vector and Opm::TableColumn (from opm-parser) as before,
but without requiring any OPM includes, making the class independent.
2018-01-11 15:00:49 +01:00
Atgeirr Flø Rasmussen
d700402b15 Remove unused boost include. 2018-01-11 15:00:20 +01:00
Atgeirr Flø Rasmussen
55348d6441
Merge pull request #1193 from akva2/move_utils_to_simulators
Move utils to simulators
2017-12-05 08:36:54 +01:00
Arne Morten Kvarving
0a4cc569aa remove Average.hpp (from build system)
moved to opm-upscaling
2017-12-04 16:48:18 +01:00
Arne Morten Kvarving
860e3d5831 remove some unused files 2017-12-04 16:32:14 +01:00
Arne Morten Kvarving
97098ac190 remove files moved to opm-simulators from build system 2017-12-04 16:25:27 +01:00
Arne Morten Kvarving
acc631f504 remove ParameterGroup code
moved to opm-common
2017-11-17 13:55:07 +01:00
Andreas Lauser
2ab9b5de45 mark initHydroCarbonState() as inline
this allows it to be used in multiple compile units without the linker
running amok.
2017-10-04 19:24:20 +02:00
Arne Morten Kvarving
f5999e3fcb changed: remove embedded 'parameters' namespace in ParamGroup
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
2017-04-28 15:34:11 +02:00
Arne Morten Kvarving
a59ce6581f changed: remove XML support for ParameterGroup 2017-04-28 11:26:38 +02:00
Tor Harald Sandve
7579f2bdb9 Do not extrapolate initial rs and rv values in the depth tables 2017-03-16 12:57:56 +01:00
Andreas Lauser
8ef2a923ec fix a GCC 7 warning
GCC 7 warns

```
dynamic exception specifications are deprecated in C++11; use ‘noexcept’ instead [-Wdeprecated]
```

here.
2017-02-07 12:55:26 +01:00
Atgeirr Flø Rasmussen
c7cc24385a Remove files moved to opm-grid. 2016-11-29 13:25:22 +01:00
Jørgen Kvalsvik
1057e6d3d0 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Andreas Lauser
07707ecc30 consolidate the unit system to opm-parser
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
2016-10-10 17:50:26 +02:00
Arne Morten Kvarving
04fe79aa23 changed: generate unit type conversion constants on compile-time
as a bonus it avoids unused variable warnings in compile
units only using parts of the conversion units.
2016-09-30 11:35:28 +02:00
Tor Harald Sandve
60da3d9213 Remove Compat.hpp
Compat.hpp is moved to opm-simulators
2016-09-27 08:39:26 +02:00
babrodtk
466e721e0b Fixed warnings 2016-09-06 07:50:02 +02:00
Joakim Hove
d3aa0926c8 Merge pull request #1016 from jokva/refactor-output-restart
Breaking opm-core dependency in opm-output; new summary implementation
2016-06-10 13:15:34 +02:00
Tor Harald Sandve
ae9a10942e Fix to handle cases without DISGAS and VAPOIL
- adds boolean has_disgas and has_vapoil to initHydroCarbonState()
2016-06-07 08:18:09 +02:00
Jørgen Kvalsvik
392dc8557d 2 -> To 2016-06-06 12:41:48 +02:00
Jørgen Kvalsvik
c0b0b0d40a Newlines 2016-06-06 12:41:04 +02:00
Jørgen Kvalsvik
c6fc7f5e30 Braces. 2016-06-06 12:40:44 +02:00
Jørgen Kvalsvik
be0187d512 WellState::report() to make opm-output Well data 2016-06-06 12:40:44 +02:00
Liu Ming
408ea0845d paramemters output should go in Debug mode. 2016-06-06 11:57:05 +02:00
Jørgen Kvalsvik
8f3829bb76 utility/Compat
Introduces some helper functions to quickly enable support for the new
opm-output implementation. Conversion from simulator oriented cell- and
well representation to opm-output defined representation.
2016-05-30 14:24:25 +02:00
Liu Ming
7eba8b01f5 fix strange indentation. 2016-05-23 10:55:36 +08:00
Liu Ming
97eeee516d fix indentation and messages. 2016-05-23 10:47:26 +08:00
Liu Ming
341472456a write well related information into OpmLog. 2016-05-20 16:14:16 +08:00
Liu Ming
d06b515c47 write the parameters information into OpmLog. 2016-05-20 14:30:43 +08:00
Tor Harald Sandve
79f04b6c9e Fixing PR comments
- Use std::vector<HydroCarbonState> instead of std::vector<int>
- Use the initializer list to initialize members in constructors
- Fix indent
- Return OilOnly for cases without gas to avoid potential trouble
further down the line
2016-05-13 12:49:45 +02:00
Tor Harald Sandve
cb4b698b51 Add method for calculating the initial hydroCarbonState
The following hydroCarbonState are used
    enum HydroCarbonState {
        GasOnly = 0,
        GasAndOil = 1,
        OilOnly = 2
    };
Cells almost filled with water are treated as a GasAndOil state
2016-05-13 09:10:13 +02:00
Atgeirr Flø Rasmussen
78a927c859 Update CMake list with deleted files. 2016-04-14 11:29:17 +02:00
Pål Grønås Drange
284f3702a2 Using API get3DProperties() 2016-04-11 15:23:35 +02:00
Pål Grønås Drange
fee514375d Using API get3DProperties() 2016-04-11 15:13:38 +02:00
Pål Grønås Drange
1e0356d392 This commit introduces non-trivial changes as GridProperty no longer is stored as a shared pointer. This file needs a thorough read-through, and it would be nice with some documentation. 2016-04-08 16:41:41 +02:00
Pål Grønås Drange
8a7bf1ef3c Updated opm-core to use new EclipseState API in opm-parser 2016-04-08 16:30:01 +02:00
Jørgen Kvalsvik
4f857b71fc Add missing <cassert> include 2016-03-18 15:40:57 +01:00
Andreas Lauser
c635d84d37 threshold pressures: consider the saturated case and fix a typo
the typo was caused the surface density of the oil phase to be used
instead of the one of gas. This caused the density to be off by a
factor of typically about 900.

using saturated FVFs does not change much, but it does not hurt
because it is also done that way in the simulator.

This makes the defaults for the threshold pressures reasonable again,
but for some reason they are not exactly the same as in the old
implementation. (although the differences are very tolerable.)

On the question why only "Model 2" is affected by this: the other
decks don't use threshold pressures (SPE-X) or do not default any
values (Norne).
2016-03-08 14:52:09 +01:00
Andreas Lauser
23088f987f replace the blackoil PVT classes by the ones of opm-material
the opm-material classes are the ones which are now used by
opm-autodiff and this patch makes it much easier to keep the opm-core
and opm-autodiff results consistent. Also, the opm-material classes
seem to be a bit faster than the opm-core ones (see
https://github.com/OPM/opm-autodiff/pull/576)

I ran the usual array of tests with `flow`: SPE1, SPE3, SPE9 and Norne
all produce the same results at the identical runtime (modulo noise)
and also "Model 2" seems to work.
2016-03-05 19:11:44 +01:00
Andreas Lauser
377b844862 fix build breakage of the unit tests due to OPM/opm-parser#687
While the patch is quite trivial (some forgotten 'const'), the havoc
was caused because I usually configure my modules with --disable-tests
(to get much better turn-around times when switching all modules from
debug to optimization flags) and the usual way to force them to
compile ('make test-suite') does not work for opm-core...
2016-02-21 17:35:33 +01:00
Andreas Lauser
c709e347c3 fix some recent deprecation warnings
these are caused by OPM/opm-parser#687. While they are harmless, they
are certainly annoying. (that's their point!)
2016-02-21 17:29:43 +01:00
Atgeirr Flø Rasmussen
be1ea358ff Merge pull request #953 from andlaus/const_gridproperties
fix the build
2016-02-19 11:46:32 +01:00
Jørgen Kvalsvik
b8edc8b5b4 Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00
Andreas Lauser
8f0d81db2f fix the build
it broke because EclipseState::get*GridProperty() now returns a
pointer to a constant object.
2016-02-15 15:06:05 +01:00
Joakim Hove
5172652e73 Removed opm_memcmp_double() - use cmp from common. 2016-02-14 21:41:51 +01:00
Joakim Hove
a566ac608d Added TableColumn based overloads. 2016-01-06 09:19:47 +01:00