Commit Graph

3076 Commits

Author SHA1 Message Date
Joakim Hove
f386404408 Add insert ordered set 2019-07-24 14:52:49 +02:00
Joakim Hove
e14b938fde Add UDAControl enum 2019-07-22 16:07:36 +02:00
Joakim Hove
11fe1d6e03 Maintain insert order in UDQINput 2019-07-22 16:07:36 +02:00
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
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
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
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
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
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
2248a1133d Remove unused group rate 2019-07-14 08:33:45 +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
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
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
c3dcedc392 Allow FOAM without FOAMFSC
This is necessary to support the table-based gas mobility reduction model.
In order to extend support to the function-based model the FOAMFSC-related
things have been kept.
2019-07-04 12:57:43 +02:00
Atgeirr Flø Rasmussen
13bd564edf Add WFOAM support to Schedule and Well2. 2019-07-03 12:39:35 +02:00
Joakim Hove
a64745193d Add empty Group2 skeleton 2019-07-03 11:15:51 +02:00
Joakim Hove
fe83324746 Moved Group related files to Group/ folder in filesystem 2019-07-03 11:15:51 +02:00
Atgeirr Flø Rasmussen
f48462841f Add table support for FOAMMOB. 2019-07-03 11:12:12 +02:00
Atgeirr Flø Rasmussen
522db6d093 Address issues from review. 2019-07-02 16:58:04 +02:00
Atgeirr Flø Rasmussen
33783b1e9f Add FOAMROCK including FoamConfig support and test. 2019-07-02 13:55:42 +02:00
Atgeirr Flø Rasmussen
d61d9c920b Merge pull request #875 from atgeirr/add-foamconfig
Add FoamConfig class and support
2019-07-02 11:45:37 +02:00
Atgeirr Flø Rasmussen
17a2e5d334 Address review comments.
- Use a raw literal.
 - Use 'index', not 'id'.
 - Use FoamConfig(const Deck&) constructor.
2019-07-02 10:43:13 +02:00
Atgeirr Flø Rasmussen
7245598952 Include cstddef for std::size_t. 2019-07-01 15:29:21 +02:00
Atgeirr Flø Rasmussen
62a3b7334d Add FoamConfig to InitConfig. 2019-07-01 14:40:37 +02:00
Atgeirr Flø Rasmussen
c314464ef3 Add unit support for FoamSurfactantConcentration.
Note that FoamDensity and FoamSurfactantConcentration differ in field units,
as one is then poind/barrel and the other is pound/(1000 cubic feet)!
2019-07-01 14:40:05 +02:00
Atgeirr Flø Rasmussen
34d1918a2d Add copyright notice to new files. 2019-07-01 10:49:33 +02:00
Atgeirr Flø Rasmussen
39f8eb18c7 Change class name Foam -> FoamConfig. 2019-07-01 10:47:48 +02:00
Franz G. Fuchs
4baff64d63 implemented faom config 2019-06-28 12:37:04 +02:00
Kai Bao
290123bc33 Do not keep multiple WTESTWell has same name and reason
when add_well in WellTestConfig .
2019-06-28 09:47:40 +02:00
Kai Bao
11bc26d28d recording the report step that WTEST keyword is specified
so we can easily tell when a new WTEST keyword joins.

When a new WTEST keyword, we will reset the counting of the num_attempt
and maximum number of attempts for the associated well.
2019-06-28 09:47:40 +02:00
Franz G. Fuchs
a68db0a857 update 2019-06-28 09:44:33 +02:00
Franz G. Fuchs
563c6317d4 udpate 2019-06-28 09:43:20 +02:00
Bård Skaflestad
5bed559f96 Merge pull request #860 from atgeirr/foam_module
Foam module
2019-06-26 11:54:17 +02:00
Atgeirr Flø Rasmussen
c26538f433 Merge pull request #862 from joakim-hove/warnings
Warnings
2019-06-26 11:04:00 +02:00
Joakim Hove
b116eda8bc Remove unused arguments 2019-06-26 07:51:36 +02:00
Kai Bao
28110584a3 removing funciton dropWell for WellTestState 2019-06-25 22:18:55 +02:00
Kai Bao
c0c9d70dcf not removing the well from WellTestState when testing is successful 2019-06-25 22:15:28 +02:00
Joakim Hove
fbfdf5c244 Merge pull request #844 from GitPaean/fixing_warnings
Fixing warnings
2019-06-25 21:08:12 +02:00
Atgeirr Flø Rasmussen
ae7ea2a286 Silence some switch-case warnings. 2019-06-25 14:51:40 +02:00
Franz G. Fuchs
694d17a228 added copyright statement 2019-06-25 13:32:11 +02:00