OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,537 Commits 18 Branches 75 Tags
50f907f608535c4475cf276fa95d343cca19690f
Commit Graph

5537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torbjørn Skille
50f907f608 update of compareECL, failes if output file present in reference folder, but not in test folder" 2019-05-10 15:07:04 +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
Kai Bao
a3da1e23a2 fixing an overflow problem in EclOutput::make_doub_string 2019-05-02 10:18:48 +02:00
Joakim Hove
7dba7a50cf Merge pull request #748 from GitPaean/test_WCONHIST_control_mode 
modifying the ScheduleTests to handle control mode change with WCONHIST
 2019-05-02 10:13:38 +02:00
Kai Bao
8687a8a709 modifying the ScheduleTests to handle control mode change with WCONHIST 2019-05-02 09:25:52 +02:00
Joakim Hove
92caf4f010 Merge pull request #747 from joakim-hove/grouptree<< 
Add operator<< to GroupTree class + whitespace
 2019-05-01 14:42:26 +02:00
Joakim Hove
894ad7a226 Add operator<< to GroupTree class + whitespace 2019-05-01 13:42:07 +02:00
Bård Skaflestad
a9775f6945 Merge pull request #746 from atgeirr/minor-fixes 
Two small but critical fixes
 2019-04-30 17:38:03 +02:00
Atgeirr Flø Rasmussen
559783d311 Bugfix: do not keep old control modes. 
They will be treated as limits, and cause wrong behaviour.
 2019-04-30 14:48:49 +02:00
Joakim Hove
b7b9697fc5 Merge pull request #745 from joakim-hove/upgrade-dune-module 
Change version and label in dune.module file
 2019-04-30 12:55:45 +02:00
Joakim Hove
35516f1b90 Change version and label in dune.module file 2019-04-30 12:54:45 +02:00
Atgeirr Flø Rasmussen
7a47f7cf2d Add missing standard library includes. 2019-04-30 11:39:21 +02:00
Joakim Hove
0466effc93 Merge pull request #725 from joakim-hove/uda-value 
UDA values in the deck
 2019-04-30 07:57:08 +02:00
Atgeirr Flø Rasmussen
bf6964522e Merge pull request #744 from bska/continuous-cumulatives-opm-ext-rst 
Restart: Provide Continuous Cumulatives in OPM Extended Files
 2019-04-29 14:30:40 +02:00
Bård Skaflestad
d08760a922 Restart: Provide Continuous Cumulatives in OPM Extended Files 
This commit removes the restriction that cumulative totals are not
output in the case of creating OPM Extended Restart files.  There
was a reason why we did not do this when the new restart facility
was introduced, but that reason no longer applies.
 2019-04-28 21:44:13 +02:00
Joakim Hove
b148769cc6 Internalize UDA values in the deck 2019-04-28 16:08:02 +02:00
Joakim Hove
656878d649 Add class UDAValue to hold UDA values from the Deck 2019-04-28 16:08:02 +02:00
Joakim Hove
8f7724409c UDA datatype can only be used with scalar input data 2019-04-28 16:08:02 +02:00
Joakim Hove
de96af682a Rename variable to increase readability 2019-04-28 16:08:02 +02:00
Joakim Hove
f4009fc6d8 Add default constructor for unit Dimension 2019-04-28 16:08:02 +02:00
Arne Morten Kvarving
9d8b08a8d8 Merge pull request #699 from akva2/new_ecl_io 
New ECL I/O classes
 2019-04-26 09:53:01 +02:00
Bård Skaflestad
605d7399a6 Merge pull request #742 from jalvestad/msw-rstout-corr 
An improvement / correction of the writing of MSW data to Eclipse compatible restart file
 2019-04-26 08:28:59 +02:00
Jostein Alvestad
58a039c04a Added a improvement to the handling of MSW data for writing to restart file 
Improvement to handle more general MSW data  for writing to
Eclipse compatible restart file
 2019-04-25 19:14:55 +02:00
Atgeirr Flø Rasmussen
e954836774 Merge pull request #741 from hnil/fixed_unset_return 
fixed unset return value causing segfault in release build on ubuntu …
 2019-04-25 08:29:52 +02:00
hnil
2d69121b5a fixed unset return value causing segfault in release build on ubuntu 18.10 2019-04-24 13:11:20 +02:00
Joakim Hove
1cde5a4879 Merge pull request #739 from joakim-hove/minor-minor 
Misc minor changes: whitespace++
 2019-04-23 08:32:02 +02:00
Joakim Hove
fffe259621 Misc minor changes: whitespace++ 2019-04-23 07:25:05 +02:00
Joakim Hove
b955ecf6b4 Merge pull request #737 from joakim-hove/process-segments 
Add WellSegments::process() front-end method
 2019-04-20 13:14:01 +02:00
Joakim Hove
5cfb91df24 Merge pull request #736 from joakim-hove/remove-branch-number 
Remove unused member WellSegments::m_branch_number
 2019-04-20 13:13:46 +02:00
Joakim Hove
a4bdba5841 Merge pull request #734 from joakim-hove/del-getwells 
Use wellNames() instead of getWells()
 2019-04-20 13:12:56 +02:00
Joakim Hove
dcdcc659b2 Merge pull request #738 from joakim-hove/segment-cmp-bug 
Fix bug in WellSegments==
 2019-04-20 12:59:22 +02:00
Joakim Hove
e833377bea Fix bug in WellSegments== 2019-04-20 10:55:22 +02:00
Joakim Hove
fbece57167 Add WellSegments::process() front-end method 2019-04-19 12:35:10 +02:00
Joakim Hove
54f45eaba7 Remove unused member WellSegments::m_branch_number 2019-04-19 12:03:01 +02:00
Joakim Hove
7aa55f86a0 Merge pull request #735 from joakim-hove/FLUXNUM 
Add configuration for keyword FLUXTYPE
 2019-04-19 12:02:30 +02:00