Commit Graph

5570 Commits

Author SHA1 Message Date
Joakim Hove
c0ccd06250 Add keyword GCONSALE 2019-05-22 07:13:57 +02:00
Joakim Hove
eb2c0b7441 Add keyword BRANPROP 2019-05-22 07:13:57 +02:00
Joakim Hove
c986c49113 Add keyword NODEPROP 2019-05-22 07:13:57 +02:00
Joakim Hove
5a31ae874b Add keyword GUIDERAT 2019-05-22 07:13:57 +02:00
Joakim Hove
cd55d69ef7 Add keyword GCONSUMP 2019-05-22 07:13:57 +02:00
Joakim Hove
76acb98c67 Add keyword GPMAINT 2019-05-22 07:13:57 +02:00
Joakim Hove
30a1a0b26e Improve error message for invalid json 2019-05-22 07:13:57 +02:00
Joakim Hove
16dabd5dc4 Merge pull request #777 from joakim-hove/well2-prediction-mode
Add method bool Well2::predictionMode()
2019-05-21 06:52:59 +02:00
Joakim Hove
272d0fc9a1 Merge pull request #776 from joakim-hove/parse-WOPRL
Parse WOPRL
2019-05-20 16:31:35 +02:00
Joakim Hove
8231b84a11 Add method bool Well2::predictionMode() 2019-05-20 16:13:20 +02:00
Joakim Hove
c1f60b769c Split summary keywords WxxxL in separate config 2019-05-20 12:52:05 +02:00
Joakim Hove
d42e86426f Remove extra whitespace 2019-05-20 12:34:37 +02:00
Bård Skaflestad
4010399f08 Merge pull request #773 from tskille/convertECL
Fix issue with missing STARTSOL and ENDSOL headers when converting un…
testing/2019.05/rc5
2019-05-15 16:01:43 +02:00
Bård Skaflestad
5f43a18050 Merge pull request #758 from jalvestad/pvt-type-eclrst
Generalize eclipse compatible restart to a broad set of PVT-options
2019-05-15 13:44:33 +02:00
Torbjørn Skille
cf970df48f Fix issue with missing STARTSOL and ENDSOL headers when converting unified restart files 2019-05-15 10:25:55 +02:00
Atgeirr Flø Rasmussen
c1f4c69c30 Merge pull request #772 from blattms/alternative-clang-fix
Fixes clang linking error when using std::vector<bool>::const_reference.
2019-05-15 09:20:07 +02:00
Joakim Hove
0c70d71df8 Merge pull request #766 from joakim-hove/summary-eval
Split Summary::add_timestep in eval()
2019-05-15 07:02:57 +02:00
Joakim Hove
07b02ed151 Factor out eval() method from Summary::add_timestep() 2019-05-15 06:58:10 +02:00
Bård Skaflestad
2c7eb20726 Merge pull request #724 from jalvestad/cell-summary-props
Changes to provide Summary output of more Block properties
2019-05-14 18:30:36 +02:00
Markus Blatt
255ffc5bba Fixes clang linking error when using std::vector<bool>::const_reference.
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.
2019-05-14 14:12:42 +02:00
Jostein Alvestad
d7e41a5ac0 Remove two tests for initalisation in conflict with more general model 2019-05-14 09:40:13 +02:00
Bård Skaflestad
d554334316 Merge pull request #768 from joakim-hove/summary-state-update
Summary state update
2019-05-13 18:22:02 +02:00
Jostein Alvestad
4989c6cfec Added change to improve code quality
Make sure that the changes made in PVTModel is not overwritten by
variousParam
2019-05-13 15:36:20 +02:00
Jostein Alvestad
c92d74107f Initial changes for allowing all pvt-type data for eclipse restart file 2019-05-13 15:36:19 +02:00
Jostein Alvestad
8126e8cb66 Added initial change to account for different PVT-types in ECL Restart file
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
2019-05-13 15:36:18 +02:00
Jostein Alvestad
ba1c30fd4a Added unit tests for grid block summary data variables 2019-05-13 15:29:57 +02:00
Jostein Alvestad
25f25d15bf Added unit tests to new grid block summary properties 2019-05-13 15:29:56 +02:00
Jostein Alvestad
bd58468930 changes to allow Summary output of additional block variables
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.
2019-05-13 15:29:56 +02:00
Jostein Alvestad
546517784e Initial changes to add more block props to summary file
this  branch will add
BOSAT
BWKR
BKRW (=BWKR)
BOKR
BKRO (=BOKR)
BGKR
BKRG (=BGKR)
to summary file
2019-05-13 15:29:55 +02:00
Joakim Hove
9e288a9d78 Refactor SummaryState
- 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.
2019-05-13 11:06:32 +02:00
Joakim Hove
294c8aa2f7 Merge pull request #767 from GitPaean/fixing_wconprod
clearning existing controls when handleWCONPROD
2019-05-12 11:58:37 +02:00
Kai Bao
de17c851bc clearning existing controls when handleWCONPROD 2019-05-11 14:07:15 +02:00
Joakim Hove
38f483ae37 Merge pull request #764 from akva2/janitoring
mark constructors explicit
2019-05-10 14:56:00 +02:00
Arne Morten Kvarving
9b9fc2ef37 mark constructors explicit 2019-05-10 12:43:02 +02:00
Joakim Hove
a8e7c03a4f Merge pull request #740 from joakim-hove/well-static
Add alternative well implementation Well2
2019-05-09 11:07:34 +02:00
Joakim Hove
1c82a8ad39 Add alternative well implementation Well2 2019-05-09 09:20:23 +02:00
Arne Morten Kvarving
0ddf4d675e Merge pull request #703 from akva2/compareECL
Use new ECL I/O classes in compareECL
2019-05-09 08:54:03 +02:00
Bård Skaflestad
bce535c19f Merge pull request #707 from bska/print-pvtfunc-to-init
Structurally Correct PVT Tables in INIT File (Part 2)
2019-05-08 21:24:32 +02:00
Bård Skaflestad
a265a99469 Init File LOGIHEAD: Correctly Set Constant Co Flag
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
2019-05-08 11:24:02 +02:00
Bård Skaflestad
7835eeb142 Init File: Activate New PVT Table Normalisation
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.
2019-05-08 11:24:02 +02:00
Bård Skaflestad
4b8743d10f Eclipse IO: Add Ability to Output vector<bool> Data
Needed to support dynamically controlling contents of LOGIHEAD
vector in the INIT file.
2019-05-08 11:24:02 +02:00
Bård Skaflestad
30733e4966 LogiHEAD: Add Protocol for Communicating PVT and Satfunc Models
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.
2019-05-08 11:24:02 +02:00
Bård Skaflestad
9fe4b23dcb LogiHEAD: Identify Selection of Array Elements
Information mostly gleaned from LibECL's ecl_kw_magic.h.
2019-05-08 11:24:02 +02:00
Arne Morten Kvarving
eb30732444 Merge pull request #753 from tskille/fixESmry
Fixed defect in ESmry constructor.
2019-05-08 10:56:35 +02:00
Atgeirr Flø Rasmussen
e8dbf7d8ee Merge pull request #754 from joakim-hove/whistctl-unknown-well
Internalize a global WHISTCTL setting in the Schedule object
2019-05-03 10:37:55 +02:00
Joakim Hove
0660ced877 Merge pull request #752 from joakim-hove/region-wells-required
Add query function need_wells() in the Summary implementation
2019-05-03 07:18:24 +02:00
Kai Bao
ccd6a2b9da Merge pull request #751 from GitPaean/fixing_over_flow_of_c_string
fixing an overflow problem in EclOutput::make_doub_string
2019-05-02 21:35:13 +02:00
Joakim Hove
452742a6a2 Add query function need_wells() in the Summary implementation 2019-05-02 19:08:26 +02:00
Joakim Hove
0f3dabc3aa Internalize a global WHISTCTL setting in the Schedule object 2019-05-02 16:01:29 +02:00
Torbjørn Skille
49cc815136 Fixed defect in ESmry constructor. Fails when using class on Summary files generated from commercial simulator Eclipse 2019-05-02 10:32:18 +02:00