Commit Graph

8606 Commits

Author SHA1 Message Date
Joakim Hove
986f0acad7 Merge pull request #1826 from akva2/add_missing_initializer
fixed: add missing initializer
2020-06-17 15:44:22 +02:00
Joakim Hove
0edc9acc48 Merge pull request #1825 from joakim-hove/gpmaint-serialize-fix
Fix: bug in serializer function for GPMaint class
2020-06-17 15:29:43 +02:00
Arne Morten Kvarving
643b8b179d fixed: add missing initializer 2020-06-17 14:32:42 +02:00
Joakim Hove
3478263de9 Fix: bug in serializer function for GPMaint class 2020-06-17 12:45:23 +02:00
Markus Blatt
8c6cd2f10f Merge pull request #1810 from blattms/support-pinch-nogap
Support querying GAP/NOGAP mode for Pinch form EclipseGrid.
2020-06-15 17:27:15 +02:00
Bård Skaflestad
88414fd1fc Merge pull request #1822 from joakim-hove/use-hours
Use 'HOURS' as time unit in LAB unit summary files
2020-06-13 12:27:01 +02:00
Joakim Hove
1dc3a67cf1 Use 'HOURS' as time unit in LAB unit summary files 2020-06-13 07:46:47 +02:00
Joakim Hove
84aa2f77f3 Merge pull request #1820 from joakim-hove/udq-nan-values
UDQSet will check for nan values
2020-06-12 13:49:24 +02:00
Joakim Hove
0841e4f398 Merge pull request #1797 from joakim-hove/GPMAINT
Add code to internalize GPMAINT keyword in Group objects
2020-06-12 12:19:20 +02:00
Joakim Hove
10b2b2ac48 Add caching of well and group names in SummaryState 2020-06-12 12:07:04 +02:00
Joakim Hove
082820380d Ensure that all values in UDQSet are finite 2020-06-12 09:12:55 +02:00
Joakim Hove
213c6fb6ad Add function SummaryState::update_udq() to add variables from UDQSet 2020-06-12 09:12:55 +02:00
Joakim Hove
90d1d992e5 Ensure that evaluated UDQSet have the correct name 2020-06-12 09:12:55 +02:00
Joakim Hove
172c0b1aa6 Make sure invalid UDQ values are deleted from SummaryState 2020-06-12 09:12:55 +02:00
Joakim Hove
669918547a Add del() method to SummaryState 2020-06-12 09:12:55 +02:00
Joakim Hove
b07bd377cd Merge pull request #1819 from joakim-hove/aicd
Aicd
2020-06-12 09:12:18 +02:00
Atgeirr Flø Rasmussen
e08a3666e3 Merge pull request #1818 from atgeirr/fix-nupcol-runspec
Handle NUPCOL in RUNSPEC correctly
2020-06-11 20:50:30 +02:00
Bård Skaflestad
be57558804 Merge pull request #1630 from bska/new-rst-tags
New Solution Vector Tag for Restart File Output
2020-06-11 17:09:42 +02:00
Bård Skaflestad
a4a04ebf51 Restart Tag System: Introduce Tag for OPM Extended Vectors
This is intended to supersede the RESTART_AUXILIARY tag.  There is
no practical difference between vectors that are needed for restart
and vectors that are not needed for restart.  They all go into the
SOLUTION section of a restart file.

Vectors tagged as RESTART_OPM_EXTENDED will not be output unless the
user does requests OPM-extended restart files.
2020-06-11 14:31:53 +02:00
Bård Skaflestad
4fcd85526a Solution Output: Refactor Stages Out to Helper Functions
Mostly to reduce the level of complexity of the 'writeSolution'
function.  While here, also ensure that we never write solution data
outside the STARTSOL/ENDSOL demarcations.  Even if we emit vectors
that are not known to ECLIPSE, we should not write them outside of
the SOLUTION section.
2020-06-11 14:31:53 +02:00
Joakim Hove
224911bd10 Add implementation for autonomous ICD: AutoICD 2020-06-11 11:38:29 +02:00
Joakim Hove
73a244ceda Templated internalizing of WSEGSICD keyword 2020-06-11 11:38:29 +02:00
Joakim Hove
4c100d0bd5 Update json scheme to ensure that WSEGSICD is subset of WSEGAICD 2020-06-11 11:38:29 +02:00
Joakim Hove
0f032d6fca Merge pull request #1801 from joakim-hove/icd-variant
Use std::variant<> to hold ICD alternatives
2020-06-11 11:31:58 +02:00
Joakim Hove
6090470045 Add code to internalize GPMAINT keyword in Group objects 2020-06-11 09:40:55 +02:00
Atgeirr Flø Rasmussen
0c6d1c31d7 Implement and use Runspec::nupcol(). 2020-06-11 07:44:49 +02:00
Bård Skaflestad
9396d44379 Merge pull request #1770 from bska/add-tolcrit
Add Support for TOLCRIT to Sat-Func Field Properties
2020-06-10 19:19:07 +02:00
Joakim Hove
dae980ddd5 Hide away templated convert function 2020-06-10 16:36:33 +02:00
Bård Skaflestad
f61882ce69 Critical Saturation: Refactor Helper Functions
In particular, add two new helper functions

    crit_sat_increasing_KR
    crit_sat_decreasing_KR

which identify the critical saturations under the assumption of a
relative permeability curve that increases viz decreases as a
function of the specified phase saturation.  Those helpers in turn
call a wrapper around std::lower_bound() and std::distance() to
affect the actual table scan.

Reimplement the 'critical_*()' helper functions in terms of
crit_sat_*_KR() to remove duplicated logic.
2020-06-10 14:33:01 +02:00
Bård Skaflestad
abec96a387 Sat-Func Initializers: Add TOLCRIT Support
This commit makes the 'critical_*()' helper functions aware of the
TOLCRIT feature.  We now consider a phase to be immobile at a one
saturation value if its relative permeability at that saturation is
less than or equal to TOLCRIT.  TOLCRIT mirrors E100's default value
of 1.0e-6 unless otherwise specified in the PROPS section.

All table scanners are implemented in terms of the expression

    std::lower_bound(begin, end, tolcrit, predicate)

which ultimately returns the first position in [begin, end) for
which

    predicate(*iter, tolcrit)

is false.  Using predicate = std::greater<>{} thus determines the
first position in the sequence for which the elements is less than
or equal to 'tolcrit'.  Similarly, a predicate equivalent to '<='
returns the first position for which the elements is strictly
greater than 'tolcrit'.

Add a set of unit tests to demonstrate and exercise the new feature.
2020-06-10 14:33:01 +02:00
Bård Skaflestad
bcdc8bb119 Table Output: Revise TOLCRIT Interpretation
This commit switches the previous interpretation of notionally zero
relative permeability in Flow's .INIT-file output.  We now treat all
relative permeability values less than *or equal to* TOLCRIT as
zero.

This change is for increased ECLIPSE compatibility.
2020-06-10 14:33:01 +02:00
Bård Skaflestad
83429bf908 Sat-Func Initializers: Pass TOLCRIT to Table-Scanning Layer
This is a pure API change.  The TOLCRIT value is not yet used as
part of determining the critical saturations.

While here, also add a unit test for getRawTableEndPoints() and
update the existing sat-func property unit tests to explicitly pass
TOLCRIT = 0 in preparation of adding actual TOLCRIT support.
2020-06-10 14:33:01 +02:00
Bård Skaflestad
83af852efe Capture SatFunc Controls In FieldProps
This is in preparation of threading the TOLCRIT value-defaulted or
not-through to the end-point scanning code.
2020-06-10 14:33:01 +02:00
Bård Skaflestad
f0f3764b89 Sat-Func Initializers: Expose RawTableEndPoints to Caller
This commit requires that the callers of satfunc::init() calculate
the raw table end-points.  That, in turn, enables callers to cache
those end-point values to avoid repeated calculations.

Add a new member, m_rtep, to FieldProps to act as such a cache to
take advantage of the new ability.
2020-06-10 14:33:01 +02:00
Atgeirr Flø Rasmussen
80f6a5d1ed Add failing test for NUPCOL in RUNSPEC. 2020-06-10 13:17:04 +02:00
Bård Skaflestad
6a742a20fd Merge pull request #1705 from GitPaean/segment_keywords_regreesion_test
attempting to adding segment summary keywords for regression test
2020-06-10 12:40:41 +02:00
Joakim Hove
8320b89d90 Merge pull request #1817 from akva2/disable_warnings_flag
add a cmake flag to disable warnings
2020-06-10 11:13:06 +02:00
Kai Bao
405e3e1add attempting to adding segment summary keywords for regression test 2020-06-10 10:39:45 +02:00
Joakim Hove
afd5c3153a Use value based semantics for Segment -> valve 2020-06-10 06:35:03 +02:00
Joakim Hove
b1250c2f7a Use std::variant<> to hold ICD alternatives 2020-06-10 06:35:03 +02:00
Arne Morten Kvarving
64cbbdde65 add a cmake flag to disable warnings 2020-06-09 15:11:44 +02:00
Joakim Hove
b73f4aa5dc Merge pull request #1811 from joakim-hove/rst-segment-connection-refactor
Reshuffle segments and connections after restart
2020-06-09 07:08:37 +02:00
Joakim Hove
9faa824258 Merge pull request #1814 from OPM/fix/include-required-header
[parser] include required header
2020-06-09 07:04:56 +02:00
Joakim Hove
630a4a85ec Merge pull request #1816 from bska/empty-default-udq-ustr
SMSPEC: Emit Empty Unit String if UDQ Unit Undefined
2020-06-09 07:04:00 +02:00
Bård Skaflestad
adcb9c54b8 SMSPEC: Emit Empty Unit String if UDQ Unit Undefined
This is guided by ECLIPSE.
2020-06-08 23:19:26 +02:00
Bård Skaflestad
e129f74304 Merge pull request #1815 from tskille/issue_with_esmry
fixing invalid write in src/opm/io/eclipse/ESmry.cpp
2020-06-08 22:17:35 +02:00
Torbjørn Skille
947d3fec99 fixing invalid write in src/opm/io/eclipse/ESmry.cpp 2020-06-08 20:33:10 +02:00
Bernd Flemisch
27e310d436 [parser] include required header 2020-06-08 15:23:52 +02:00
Atgeirr Flø Rasmussen
229a619a85 Merge pull request #1812 from akva2/move_timestamp
changed: move build timestamp to separate header
2020-06-08 12:52:19 +02:00
Arne Morten Kvarving
1d3843cef1 changed: move build timestamp to separate header
to avoid rebuilds for things only needing project versions
2020-06-08 10:06:03 +02:00