Commit Graph

6058 Commits

Author SHA1 Message Date
Joakim Hove
2fb64e21d9 Add method UDQDefine::input_string() 2019-07-22 16:07:36 +02:00
Joakim Hove
370ce5de1f Removed public tokens() property for UDQDefine 2019-07-22 16:07:36 +02:00
Bård Skaflestad
2e1ef048df
Merge pull request #897 from joakim-hove/unit-system-refactor
Unit system refactor
2019-07-21 16:55:08 -05:00
Joakim Hove
2ff8816bb7 UnitSystem refactor
- Add new constructor based on deck names 'FIELD', 'METRIC', 'PVT-M' and 'LAB'.
 - Refactor UnitSystem construction.
2019-07-21 13:12:01 +02:00
Bård Skaflestad
eede6b05b5
Merge pull request #896 from tskille/convertECL
convertECL, new option for unified restart file
2019-07-19 22:22:01 -05:00
Torbjørn Skille
a23c87be94 convertECL, new option for unified restart file 2019-07-19 10:39:12 +02:00
Joakim Hove
693395e78d
Merge pull request #894 from joakim-hove/group-types
Add enum GroupType
2019-07-19 08:26:26 +02:00
Joakim Hove
6324d5d6c8 Add enum GroupType 2019-07-19 07:20:21 +02:00
Bård Skaflestad
bc1403e1c6
Merge pull request #895 from tskille/ERst
Enabling load on the demand for class ERst
2019-07-18 08:35:17 -05:00
Torbjørn Skille
f509c3e236 Enabling load on the demand for class ERst 2019-07-18 14:49:51 +02:00
Bård Skaflestad
f2fe00b819
Merge pull request #869 from bska/adjust-sogcr-with-swl
Adjust Critical Oil-in-Gas Saturation with Scaled Connate Water Saturation
2019-07-16 08:06:11 -05:00
Bård Skaflestad
a886a2334b GridProperty: Collect Paired Assignment in Single Operation
This commit introduces a new helper function

    void GridProperty<>::setElement(i, val, dflt)

that handles paired assignments to 'm_data' and 'm_defaulted'[%].
This simplifies the bookkeeping and implementation of the various
assignment and value operations.

While here, also add a unit test to demonstrate expected behaviour
of the m_defaulted flag.  The only really questionable setting is
what happens if the deck applies a relative operator (e.g., ADD or
MULTIPLY) to a value that would otherwise be defaulted.  In the
current implementation the m_defaulted flag will remain set in this
case, but it arguably should be switched to unset (false).

[%]: Suggested by [at]akva2
2019-07-15 13:03:21 +02:00
Bård Skaflestad
e79d1396df GridProperty<T>: Track Defaulted Cell Status In More Operations
In particular, update 'm_defaulted' in

  - maxvalue, minvalue
  - maskedSet, maskedCopy
  - copyFrom
  - setScalar
2019-07-15 13:03:21 +02:00
Bård Skaflestad
63c6eeb30e SupportedKeywordInfo: Remark on Hacky Nature of setPostProcessor
This commit adds a comment block to the new

    setPostProcessor

member function, explaining the reasoning behind its excistence and
remarking on the fact that the ability to replace the post-processor
is essentially a hack.  The hack suggests that we need to rethink
our handling of (3D) grid properties.
2019-07-15 13:03:21 +02:00
Bård Skaflestad
10890cc793 3D Properties: Hook Up adjustSOGCRwithSWL for SGOF
This commit calls the SOGCR post-processor hook if the simulation
run uses SGOF.  In this case we need to subtract (scaled) connate
water saturations from defaulted SOGCR values.

This revealed a problem in one of the unit tests which used the
incorrect critical oil saturation due to a missing SGOF record.
2019-07-15 13:03:21 +02:00
Bård Skaflestad
7494990611 3D Properties: Add Special Purpose Treatment for SOGCR
This commit adds a new member function

    Eclipse3DProperties::adjustSOGCRwithSWL

which mutates the SupportedKeywordInformation of the various *SOGCR*
keywords created by makeSupportedDoubleKeywords().  Specifically,
adjust*() installs new post-processors for the critical oil-in-gas
saturations--post-processors that subtract the (scaled) connate
water saturation from the defaulted SOGCR.  This is only applicable
if the simulation run uses Family I (SWOF/SGOF) saturation function
keywords, because the SGOF table is implicitly defined in terms of
the connate water saturation.
2019-07-15 13:03:21 +02:00
Bård Skaflestad
9bb64df26e Keyword Information: Add Means to Replace Post-Processor
This is a special purpose hook that is mainly intended to add a
post-processor after the keyword information is established only if
certain conditions are satisfied (e.g., if certain keyword relations
like the run using 'SGOF' tables hold).

Immediate use case is to install a post-processor for SOGCR to
subtract the scaled connate water saturation from defaulted SOGCR
values if the simulation run uses family I (SWOF/SGOF) saturation
function descriptions.
2019-07-15 13:03:21 +02:00
Bård Skaflestad
ceb9f01571 GridProperty: Pass 'Defaulted' Flag to Post-Processor
This commit alters the post-processor API to accept a vector<bool>
of defaulted flags (true if defaulted, false if explicitly
assigned).  This, in turn, enables running the post-processor only
on defaulted (or assigned) property values.

Update existing post-processor implementation to honour the new
calling conventions.
2019-07-15 13:03:21 +02:00
Bård Skaflestad
430cc9d7b2 GridProperty<T>: Track Defaulted Cell Status
This commit adds a new data member (GridProperty<T>::m_defaulted)
that keeps track of whether or not a particular data item has been
implicitly assigned from the input deck.  GridProperty::setDataItem
assigns 'false', while the constructor initialises 'm_defaulted' to
true for all Cartesian cells.

The main objective is to be able to apply a post processor only to
those cells for which the input deck does not supply an explicit
value.
2019-07-15 13:03:21 +02:00
Joakim Hove
ffba2b114b
Merge pull request #888 from joakim-hove/group-names
Add method Schedule::groupNames()
2019-07-15 07:42:22 +02:00
Joakim Hove
160f0f83e1 Remove Schedule::getGroups() 2019-07-15 06:01:44 +02:00
Joakim Hove
7559c31e43 Use Schedule::groupNames() intead of getGroups() 2019-07-15 06:01:44 +02:00
Joakim Hove
6426644ce4 Add method Schedule::groupNames() 2019-07-15 06:01:44 +02:00
Joakim Hove
3d07072f08
Merge pull request #893 from joakim-hove/remove-group-injection-rate
Remove unused group rate
2019-07-14 10:57:21 +02:00
Joakim Hove
2248a1133d Remove unused group rate 2019-07-14 08:33:45 +02:00
Arne Morten Kvarving
2c8e4cb6b0
Merge pull request #891 from akva2/janitoring
Various janitoring
2019-07-10 15:51:10 +02:00
Arne Morten Kvarving
492fba07fc fixed: remove unused assignments 2019-07-10 15:10:29 +02:00
Arne Morten Kvarving
c87acf6571 fixed: remove unused variable and limit scope for another 2019-07-10 15:10:29 +02:00
Arne Morten Kvarving
c720dfe8a8 fixed: move string to avoid copy 2019-07-10 15:10:18 +02:00
Arne Morten Kvarving
b860fdbccc fixed: use initializer list 2019-07-10 09:03:36 +02:00
Arne Morten Kvarving
4dbb33cce6 changed: rescope code relying on grid under if()
rewrite to aid static code analyzer
2019-07-10 09:03:36 +02:00
Arne Morten Kvarving
6a7191c376 fixed: sources should include the extension 2019-07-10 09:03:36 +02:00
Arne Morten Kvarving
6039cfa7ed
Merge pull request #890 from akva2/improve_sca_support
Improve static analysis support
2019-07-09 14:40:14 +02:00
Arne Morten Kvarving
3e078e76b1 fix indenting 2019-07-09 14:39:11 +02:00
Arne Morten Kvarving
43c504593f added: static analysis for targets added using opm_add_test 2019-07-09 10:35:40 +02:00
Arne Morten Kvarving
3e576b6332 added: support object libraries in static analysis macro 2019-07-09 10:35:40 +02:00
Arne Morten Kvarving
748fd20e57 fixed: make sure path is absolute before attempting conversion to relative 2019-07-09 10:35:40 +02:00
Arne Morten Kvarving
8d59054112 fixed: make sure not to re-add static analysis tests 2019-07-09 09:49:16 +02:00
Joakim Hove
8d439e6260
Merge pull request #880 from joakim-hove/opmi-loggin
Add basic log output to the opmi application
2019-07-08 13:51:32 +02:00
Joakim Hove
085d7d23b6
Merge pull request #889 from akva2/janitoring
mark constructor explicit
2019-07-08 13:29:52 +02:00
Arne Morten Kvarving
83e2029af4 mark constructor explicit 2019-07-08 11:17:45 +02:00
Joakim Hove
88afb50d09
Merge pull request #881 from joakim-hove/group2
WIP: Group2
2019-07-06 07:30:25 +02:00
Joakim Hove
f0215f1a3d
Merge pull request #887 from joakim-hove/normal-libecl-build
Remove hardcoded libecl commit in jenkins pipeline
2019-07-05 17:42:43 +02:00
Kai Bao
2b41c40c58
Merge pull request #878 from GitPaean/welopen_wtest
WELOPEN and WCON* interact with WECON and WTEST
2019-07-05 11:43:14 +02:00
Joakim Hove
1c777c5ba5 Remove hardcoded libecl commit in jenkins pipeline 2019-07-05 11:16:09 +02:00
Kai Bao
011666b3f9 WELOPEN and WCON* interact with WECON and WTEST
WELOPEN and WCON* can open well closed due to various reasons, physical
or economic.

If a well is shut with WELOPEN and WCON*, we do not try to re-open it
through WTEST.
2019-07-05 10:01:03 +02:00
Atgeirr Flø Rasmussen
6aabb6958d
Merge pull request #883 from atgeirr/allow-no-foamfsc
Allow FOAM without FOAMFSC
2019-07-05 09:24:13 +02:00
Joakim Hove
0694515c69
Merge pull request #886 from joakim-hove/jenkins-libecl-build
Jenkins libecl build
2019-07-05 07:07:04 +02:00
Joakim Hove
7f521652f4 Update libecl pr build 2019-07-04 20:17:21 +02:00
Joakim Hove
8740a8dc1a Update libecl github organisation to equinor 2019-07-04 19:06:35 +02:00