Commit Graph

1027 Commits

Author SHA1 Message Date
Andreas Lauser
5e4dd59105 replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H
it seems like most build systems pass a -DHAVE_CONFIG_H flag to the
compiler which still causes `#if HAVE_CONFIG_H` to be false while it
clearly is supposed to be triggered.

That said, I do not really see a good reason why the inclusion of the
`config.h` file should be guarded in the first place: the file is
guaranteed to always available by proper build systems, and if it was
not included the build either breaks at the linking stage or -- at the
very least -- the runtime behavior of the resulting libraries will be
very awkward.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
022f535508 Fix pvtIndex map for cases with non-active eqlnum regions. 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
54e751fe70 Adress PR review issues 2 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
da6c4bf0c4 Fix 2p bug 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
1e10d25c24 Adress PR review issues 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
740ff891ab Remove the usage of partition_unif_idx() from opm-core 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
44c7fb8816 Cleaning the initialization code
-remove whitespaces
-fix documentation
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
9389aecc26 Use &ref not shared_pointer to MaterialLawManager 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
dc997185d9 Remove blackoilPhases and phaseUsage from the initialization code
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
b9b75a109c Remove BlackoilProps from equil initalization code
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
9e95d662bd Update swatinit tests to account for bugfix. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
680d96840a Update equil regression reference after bugfix.
Also reduce some very coarse tolerances to more reasonable levels.
2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
7ba7cf30b0 Bugfix: type for target capillary pressure. 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
0df94d216a Update the swatinit test base on fix in opm-material#248 2018-01-02 14:28:06 +01:00
Arne Morten Kvarving
3904521ded 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.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
020a9af41e Enable swatinit equil test 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
fde300018b FIX swatinit test in test_equil
The capillarySwatinit.DATA is updated to make it possible to run in Ecl.
Referance solutions is updated accordingly.
2018-01-02 14:28:06 +01:00
Joakim Hove
73e6a96180 Temporarily disabled EQUIL + SWATINIT test. 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
5a9827f7fe Do not extrapolate initial rs and rv values in the depth tables 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
30030eaac7 Do not set rs=rsSat and rv=rvSat for the saturated case 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
bb4b03d295 Increase max iterations for capillary curve inversion.
Triggered by a new two-phase case.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
fd121224d6 Add test for swatinit 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
a4a0e5985c Make it optinal to apply SWATINIT
The reasoning behind this to make it possible to initialize the case
without SWATINIT in order to compute the same defaulted THPRES values as
Ecl. The initialization needs to be re-computed to account for SWATINIT
in the simulations.
2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik
111979f4a6 Use new DeckItem constructor interface. 2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik
2c30f9e534 Update to shared_ptr-less parser interface. 2018-01-02 14:28:06 +01:00
Andreas Lauser
ec0ac4869c 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.)
2018-01-02 14:28:06 +01:00
Andreas Lauser
5b40f3e643 set the Rv and Rs factors to the saturated values for cells which have no gas and no oil
the purpose of this is to get a more defined behaviour when doing the
gravity correction/upstream cell determination in the flux term.

I consider this to be just a kludge, so if anyone has a better idea of
what the composition for the non-existing gas and oil phases is,
please tell me. (note that generic compositional models do not exhibit
this issue because the composition of all fluids is always fully
defined because each component is assumed to dissolve in every phase.)
2018-01-02 14:28:06 +01:00
Joakim Hove
39647c6ad3 shared_ptr<EclipseGrid> -> const EclipseGrid& 2018-01-02 14:28:06 +01:00
Pål Grønås Drange
877bd70c54 transmult and initconfig are ref's, use ref for EclipseState constructor 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
57548be345 Fix two phase EQUIL initialization 2018-01-02 14:28:06 +01:00
Liu Ming
a9ae704a35 it should be the same number in EQLNUM. 2018-01-02 14:28:06 +01:00
Liu Ming
d3ea24f653 use correct region number. 2018-01-02 14:28:06 +01:00
Liu Ming
f089b00a30 Rise up a warning if equil region has no active cells. 2018-01-02 14:28:06 +01:00
Markus Blatt
9e4af968db Fix incomplete type error for std::ofstream in examples
On my system I got
```c++
error: variable ‘std::ofstream file’ has initializer but incomplete type
         std::ofstream file(fname.str().c_str());
```
This is fixed with this commit by including fstream. Previously,
this include might have happened implicitely.
2018-01-02 14:28:06 +01:00
Markus Blatt
c32ff2b404 Prevent dereferencing the end iterator.
This happened for empty regions and surfaced when compiling
with "-D_GLIBCXX_DEBUG  -DDEBUG -DGLIBCXX_FORCE_NEW".
2018-01-02 14:28:06 +01:00
Pål Grønås Drange
fac5dd017d Using getInputGrid API from Parser, changed GridManager to no longer accept Deck in constructor 2018-01-02 14:28:06 +01:00
Pål Grønås Drange
e6a4cda9a8 Using API get3DProperties() 2018-01-02 14:28:06 +01:00
Pål Grønås Drange
de0aeac570 Updated opm-core to use new EclipseState API in opm-parser 2018-01-02 14:28:06 +01:00
Joakim Hove
12991490bd Replaced SimulatorState -> SimulationDatacontainer
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2018-01-02 14:28:06 +01:00
Liu Ming
6fb9db5dcf rename ParseMode as ParseContext. 2018-01-02 14:28:06 +01:00
Liu Ming
7ce3151081 rename ParseMode in examples folder. 2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik
32c5b5e862 Remove Equil + EquilWrapper, replace with upstream
Upstream (opm-parser) now provides a better Equil + EquilRecord, and
simultaneously deprecated EquilWrapper. This patch fixes the resulting
breakage.

One important note: The new Equil does not expose integers for live
oil/wet gas initialization procedure methods, but rather booleans
through constRs/constRv methods. This is how the variable behaves
according to the Eclipse reference manual (EQUIL keyword section).

Code has been updated to reflect this.
2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik
04a368cfc6 Add missing opm-parser headers
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik
da411e49a5 Fixes includes wrt opm-parser PR-656
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2018-01-02 14:28:06 +01:00
Joakim Hove
0cf00f240b Changed to use new table api from opm-parser. 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
d77e33b5dc Use cell depths based on averaging cell corners 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
ca902168ed Change the number of integration points in the initialization
The number is changed from 100->2000 to increase accuracy.
2018-01-02 14:28:06 +01:00
Arne Morten Kvarving
e11257d8ce fix Equilibration test by adding some fuzz
Backports parts of a7b1e69a45c14ec88a82b92ee704424f1ea1b41c
2018-01-02 14:28:06 +01:00
Andreas Lauser
b04db90cfe use the error macros from opm-common 2018-01-02 14:28:06 +01:00
Joakim Hove
cbc41cfbf7 Relocated warning headers. 2018-01-02 14:28:06 +01:00