Turns out that for clang this is no a bool and therefore a template
specialization is missing. We workaround this by some template (black) magic
that does the explicit instantiation for clang and for others adds another
unused instantiation for char.
Copied changes already made for INIT-file export to restart file export
for eclipse compatible restart file export. The changes apply to
LOGIHEAD and account for whether live oil or wet gas is present
Allow output of:
BOSAT
BWKR
BOKR
BKRO
BGKR
BKRG
BKRW
BWPC
BGPC
BVWAT
BWVIS
BVGAS
BGVIS
BVOIL
BOVIS
For this to work, appropriate changes to opm-simulators in
ecloutputblackoilmodule.hh needs to be included. This is
made in a separate branch since it belongs to a different repo.
- Change SummaryState::add() -> SummaryState::update(), the
SummaryState::update() method is semantically aware of totals.
- Add an internal variable to the SummaryState class to keep track of the
elapsed simulation time.
We were simply defaulting this flag to fals for all runs. While
using constant Co is uncommon for real field models, it does come up
in academic settings.
Pointy Hat: @bska
This commit replaces the existing calls to
Tables::addPVTO()
Tables::addPVTG()
Tables::addPVTW()
with the new umbrella member function
Tables::addPVTTables()
This, in turn, activates table normalisation for all PV{D,T}{G,O},
PVCDO, and PVTW keywords and produces ECLIPSE compatibly sized TAB
vector representations for these data sources.
As a prerequisite for this work, to enable users such as ResInsight
to correctly interpret the table contents, we need to ensure that
the contents of LOGIHEAD reflect the data sources used to form TAB.
As a consequence, we now control the contents of INTEHEAD, LOGIHEAD,
and DOUBHEAD directly from EclipseIO.cpp rather than from LibECL
library function ecl_init_file_fwrite_header().
We reuse header functionality from the restart files. This changes
the size of the *HEAD vectors in the init file:
Vector Old New
INTEHEAD 95 411
LOGIHEAD 80 121
DOUBHEAD 1 229
which matches ECLIPSE 2017.2. Note that this is taking a bit of a
shortcut, because there are items in restart files that differ from
those of the init file. However, for the items that affect tables,
the items are the same in both init and restart files. We will need
to refine this at a later point.
This commit introduces two functions,
LogiHEAD::pvtModel()
LogiHEAD::saturationFunction()
that set LOGIHEAD flags pertaining to a subset of activated
features. In particular, we add the ability to control whether or
not a particular run applies to a live/dead oil case, a wet/dry gas
case and/or whether or not a dead oil case is specified in terms of
constant oil compressibility (PVCDO keyword). Saturation function
flags identify attributes of end-point scaling and directionally
dependent and/or reversible relative permeability functions.
Add unit tests to exercise these features.
Bård Skaflestad
Torbjørn Skille
Atgeirr Flø Rasmussen
Joakim Hove
Markus Blatt
Jostein Alvestad
Kai Bao
Arne Morten Kvarving