Bård Skaflestad
535f3401d6
Merge pull request #2825 from jalvestad/rst-ntw-imp
...
Corrections to output of network data to Eclipse compatible restart file
2021-11-25 00:30:28 +01:00
Jostein Alvestad
07f67b4df1
corrected share - NETBALAN to be consistent with master
2021-11-24 14:10:12 +01:00
Jostein Alvestad
4585f2499d
changes to correct test_AggregateNetwork
2021-11-24 13:27:21 +01:00
Jostein Alvestad
556c21a254
changes to correct output of restart data for networks
...
corrections to intehead for netbalan data plus improvements createdoubhead
simplification of code due to changes in master
correction to default value for NETBALAN PRESSURE_CONVERGENCE_LIMIT
2021-11-24 13:27:18 +01:00
Joakim Hove
e250f83c1d
Merge pull request #2870 from joakim-hove/default-units-bug
...
Make sure units are correct for default initialized NETBALAN
2021-11-24 11:11:10 +01:00
Joakim Hove
94cb4ba908
Make sure NETBALAN defaults have correct units
2021-11-24 10:41:18 +01:00
Joakim Hove
24a8c09956
Add UnitSystem::from_si() and to_si based on string
2021-11-24 09:42:51 +01:00
Joakim Hove
685c8b06f2
Merge pull request #2868 from joakim-hove/tracer-optional
...
Use std::optional<> for tracer details
2021-11-24 09:41:58 +01:00
Joakim Hove
75bf28c45b
Merge pull request #2869 from joakim-hove/tracer-rst-name
...
Look up tracer name without trailing 'F' in restart writer
2021-11-24 09:41:39 +01:00
Joakim Hove
4e5c7feb5f
Look up tracer name without trailing 'F' in restart writer
2021-11-23 15:01:50 +01:00
Joakim Hove
48854bfbeb
Use std::optional<> for tracer details
2021-11-23 15:01:11 +01:00
Joakim Hove
f3f3dde251
Merge pull request #2856 from joakim-hove/deck-refactor2
...
Deck refactor2
2021-11-23 14:58:01 +01:00
Joakim Hove
f572937529
Add template<> Deck::get<T>() to get keywords
2021-11-23 14:06:37 +01:00
Daniel
90ce7bc6cb
Replaced call to Deck::getKeyword(kw, index) with deck[kw][index]
2021-11-23 14:00:38 +01:00
Daniel
b0f757eb50
Replace Deck::getKeyword(std::string) with operator[std::string]
2021-11-23 14:00:38 +01:00
Bård Skaflestad
80bd7fd974
Merge pull request #2864 from joakim-hove/tracer-zero
...
Pad XCON, XGRP and RSEG vectors with tracer zero
2021-11-23 12:33:17 +01:00
Joakim Hove
5f6d43f7b8
Explicitly assign tracer data in RSEG variable
2021-11-23 11:28:04 +01:00
Joakim Hove
604321ebdb
Segment data aggregation refactor
...
- Pass segment string as argument to lambda get instead of binding at
declaration.
- Use SummaryState::get() overload with default
- Introduce scope to make special casing of first segment more distinct
2021-11-23 11:24:55 +01:00
Joakim Hove
f5cc0da3ee
Publish function numRSegElem
2021-11-23 07:53:14 +01:00
Joakim Hove
8ed6e3c204
Pad XCON vector with tracer values (currently just zero)
2021-11-23 07:52:55 +01:00
Joakim Hove
ad61859ddf
Fill XGRP vector with zero tracer values
2021-11-23 07:51:06 +01:00
Joakim Hove
e2172d12a0
Merge pull request #2861 from joakim-hove/tracer-well-rst
...
Add tracer data to SWEL and XWEL
2021-11-23 07:48:26 +01:00
Joakim Hove
1839dcdbd5
Assign tracer data to XWEL
2021-11-22 16:27:17 +01:00
Joakim Hove
b00707ff84
Assign tracer data to SWEL
2021-11-22 16:27:17 +01:00
Joakim Hove
414b7c1946
Add TracerConfig::operator[](std::size_t)
2021-11-22 15:52:36 +01:00
Joakim Hove
7e26d683dd
Merge pull request #2859 from joakim-hove/tracer-intehead
...
Update INTEHEAD vector to take tracer data into account
2021-11-22 15:51:09 +01:00
Joakim Hove
48c97f8f2e
Merge pull request #2867 from atgeirr/add-missing-include
...
Add missing include for unordered_map.
2021-11-22 10:28:57 +01:00
Joakim Hove
5c3c19474a
Merge pull request #2858 from joakim-hove/parser-item-init
...
Initialize values used for overloading in ParserItem
2021-11-22 09:50:33 +01:00
Joakim Hove
6d669c9b6c
Merge pull request #2853 from joakim-hove/wstats
...
WSTAT
2021-11-22 09:50:04 +01:00
Atgeirr Flø Rasmussen
cacdafcf51
Add missing include for unordered_map.
2021-11-22 09:48:32 +01:00
Joakim Hove
272a22a34c
Update INTEHEAD vector to take tracer data into account
2021-11-22 09:46:02 +01:00
Joakim Hove
27c690acf4
Add class Tracers with tracer dimensions
2021-11-22 09:46:02 +01:00
Joakim Hove
37d9893e9e
Merge pull request #2855 from joakim-hove/add-ztracer
...
Add ztracer keyword to restart file
2021-11-22 09:37:34 +01:00
Joakim Hove
2043a5f991
Merge pull request #2848 from joakim-hove/keyword-is
...
Suggestion: use keyword.is<T>() instead of checking name?
2021-11-19 16:09:03 +01:00
Joakim Hove
5df24a644a
Merge pull request #2857 from joakim-hove/netbalan-default
...
Netbalan default
2021-11-19 15:36:04 +01:00
Joakim Hove
45c726156c
Use keyword.is<ParserKeyword:XXXX> instead of checking name
2021-11-19 15:32:20 +01:00
Joakim Hove
d1f3d40e03
Add ZTRACER keyword before tracer solution data in restart file
2021-11-19 08:00:23 +01:00
Joakim Hove
137ef059e7
Add TracerConfig::operator[]
2021-11-19 07:53:21 +01:00
Joakim Hove
0998309138
Rename DeckKeyword::isKeyword -> DeckKeyword::is
2021-11-18 16:45:08 +01:00
Joakim Hove
78a90e1dec
Create Network::Balance constructor based on default values
2021-11-18 15:29:38 +01:00
Joakim Hove
ebc92f4250
Add bool active() method to NetworkDims
2021-11-18 15:29:38 +01:00
Joakim Hove
9f86549d30
Initialize values used for overloading in ParserItem
2021-11-18 11:28:30 +01:00
Joakim Hove
b1279876cd
Use std::optional<> for NETBALAN pressure values
2021-11-18 10:50:39 +01:00
Joakim Hove
9d1f512b44
Merge pull request #2854 from joakim-hove/add-type-tracer-solution
...
Add restart output type RESTART_TRACER_SOLUTION
2021-11-18 09:39:24 +01:00
Joakim Hove
5432636a82
Add restart output type RESTART_TRACER_SOLUTION
2021-11-17 14:26:37 +01:00
Joakim Hove
07a5fb22c3
Handle string output for WSTAT to RSM file
2021-11-17 12:16:42 +01:00
Joakim Hove
cb2e90bb71
Output WSTAT numerical value to summary file
2021-11-17 12:16:34 +01:00
Joakim Hove
2a50e28085
Test ensure that WSTAT is included in SummaryConfig
2021-11-17 12:10:48 +01:00
Joakim Hove
9732520e3f
Move special case handling of 'S' summary keywords to SummaryNode
2021-11-17 12:04:19 +01:00
Joakim Hove
f1b3c73c65
Merge pull request #2852 from joakim-hove/add-kw-compsegs
...
Add kw compsegs
2021-11-16 20:01:11 +01:00
