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
Joakim Hove
c3bd4b9e3a
Add configuration for keyword FLUXTYPE
2019-04-19 10:57:23 +02:00
Joakim Hove
688edd6f63
Remove well iteration out of function
2019-04-19 08:08:22 +02:00
Joakim Hove
c1af5a313f
Use wellNames() instead of getWells()
2019-04-19 07:24:10 +02:00
Joakim Hove
167a7a8c38
Merge pull request #733 from joakim-hove/use-wellname
...
Use wellname in Group::addWell()
2019-04-18 21:12:29 +02:00
Joakim Hove
abc674d40f
Merge pull request #732 from joakim-hove/use-to_bool
...
Use DeckItem::to_bool( )
2019-04-18 21:11:49 +02:00
Joakim Hove
9c93a9349c
Use wellname in Group::addWell()
2019-04-18 16:45:24 +02:00
Joakim Hove
44f8a5d94e
Use DeckItem::to_bool( )
2019-04-18 16:24:54 +02:00
Joakim Hove
7ef2d8b9a3
Merge pull request #729 from joakim-hove/dynamic-state-unique
...
Implement unique() method on DynamicState
2019-04-18 08:57:06 +02:00
Joakim Hove
efb8375bac
Merge pull request #730 from joakim-hove/white-space
...
White space
2019-04-18 08:56:07 +02:00
Joakim Hove
eff44e4fdc
White space
2019-04-18 08:29:10 +02:00
Joakim Hove
d5f240050a
Implement unique() method on DynamicState
2019-04-18 08:09:31 +02:00
Joakim Hove
454a933b5a
Merge pull request #727 from joakim-hove/get-child-wells
...
Remove Schedule::getWells(group, step)
2019-04-17 15:50:49 +02:00
Joakim Hove
5e76f624ef
Remove Schedule::getWells(group, step)
2019-04-17 14:47:00 +02:00
Joakim Hove
14168f3ea6
Merge pull request #728 from joakim-hove/inline-ncwmax
...
Inline Schedule::getMaxNumCompletionsForWells() in test
2019-04-17 14:29:50 +02:00
Joakim Hove
b5dbc3d8e5
Delete unused code for ?CON serialization
2019-04-17 14:28:58 +02:00
Joakim Hove
34dfbee01b
Merge pull request #726 from joakim-hove/parse-invalid-keyword
...
Add "size" : 1 attribute to CARFIN keyword
2019-04-17 07:20:27 +02:00
Joakim Hove
027be42f70
Add "size" : 1 attribute to CARFIN keyword
2019-04-17 06:38:34 +02:00
Bård Skaflestad
eef4cad54f
Merge pull request #722 from blattms/remove-warnings-g++-8.3
...
Removes nearly all warnings experienced with g++-8.3
2019-04-12 23:09:12 +02:00
Markus Blatt
19ccc21786
Reintroduce overeagerly removed const qualifiers before function parameters.
...
Actually, the compiler does not complain about const in void func(const T type).
It just complains about const qualifiers before by-value return types.
2019-04-12 21:31:51 +02:00
Markus Blatt
521838dbdd
reintroduce some const with elegance
2019-04-12 21:14:36 +02:00
Markus Blatt
393a543ed5
Removes nearly all warnings experienced with g++-8.3
...
Namely:
- unused parameter
- type qualifiers ignored ...
- catchinhg polymorphic type ... by value
2019-04-12 13:37:03 +02:00
Joakim Hove
b562bef1af
Merge pull request #719 from joakim-hove/aquancon-segfault
...
Aquancon segfault
2019-04-11 15:29:02 +02:00
Andreas Lauser
414b6820b4
Merge pull request #721 from andlaus/fix_FILEUNIT
...
fix FILEUNIT
2019-04-11 14:51:04 +02:00
Andreas Lauser
5dbc22484e
fix FILEUNIT
...
the FILEUNIT functionality currently does not work because the name of
the unit system specified by the keyword is almost always fully
capitalized (e.g., "FIELD"), while the name of the unit system
returned by the parser isn't (e.g., "Field"). This patch "fixes" this
by simply capitalizing all strings.
2019-04-11 14:20:44 +02:00
Joakim Hove
8b838264dd
Add comment about face when comparing AQUANCON records
2019-04-11 14:09:28 +02:00
Joakim Hove
c533e1206f
Protect against nullptr access when combining AQUANCON records
2019-04-11 14:09:28 +02:00
Joakim Hove
d87f9edf60
Minor refactor of temporary variable
...
- Move declaration inside { ... } scope
- Use vector.push_back() instead of resize() and at()
2019-04-11 14:09:15 +02:00