Bård Skaflestad
6452e645dc
Merge pull request #2882 from tskille/array_list
...
add program arraylist
2021-12-06 10:54:47 +01:00
Torbjørn Skille
5306fb1db8
updates of ESmry and ExtESmry
...
* add function for returning root name
* add function for returning io (opening and loading)
* rename member function LoadData() to loadData()
2021-12-04 09:59:58 +01:00
Torbjørn Skille
ed6bb4161d
add program arraylist
2021-12-04 08:41:16 +01:00
Joakim Hove
2851c1d4e2
Merge pull request #2881 from joakim-hove/WELTARG-LIFT
...
Allow using mode LIFT in WELTARG
2021-12-03 15:45:56 +01:00
Joakim Hove
2a612b5c64
Allow using mode LIFT in WELTARG
2021-12-03 10:39:02 +01:00
Paul Egberts
10f11f9982
fix: number of tables should be based on NTPVT
2021-12-02 18:03:57 +01:00
Paul Egberts
3ead0f48d2
add test for salt solubility table
2021-12-02 16:43:54 +01:00
Paul Egberts
f053ba9a20
salt solubility table implementation using simpleTableContainer
2021-12-02 11:52:38 +01:00
Paul Egberts
4445092191
removed because changing to SimpleTableContainer implementation
2021-12-02 11:52:37 +01:00
Paul Egberts
12396498d7
some formatting
2021-12-02 11:52:37 +01:00
Paul Egberts
e40fdf75ba
salt solubility table allowing specification of solubility per region
2021-12-02 11:52:37 +01:00
Bård Skaflestad
6e6b438405
Merge pull request #2880 from goncalvesmachadoc/testFixReport
...
add Field vectors to required list
2021-11-30 17:50:52 +01:00
goncalvesmachadoc
b5285c7a99
add Field vectors to required list
2021-11-30 16:50:26 +01:00
Joakim Hove
0f48afd01d
Merge pull request #2879 from joakim-hove/rst-load-tracer-rate
...
Rst load tracer rate
2021-11-30 14:09:15 +01:00
Joakim Hove
b95019847c
Restore tracer cumulatives WTIT and WTPT
2021-11-30 11:23:13 +01:00
Joakim Hove
bdd933ff6f
Initialize tracer injection properties from restart file
2021-11-30 11:23:13 +01:00
Joakim Hove
04ef6fad1c
Load water tracer concentration from restart file
2021-11-30 11:23:13 +01:00
Joakim Hove
77053495b0
Add Runspec argument to Restart header constructor
2021-11-30 11:23:13 +01:00
Joakim Hove
76744d2178
Merge pull request #2878 from joakim-hove/tracer-xwel-sign
...
Sign change on tracer data
2021-11-30 09:57:54 +01:00
Joakim Hove
ba17da040a
Merge pull request #2875 from joakim-hove/tracer-name-fixup
...
Add tracer config function fname() == name + "F"
2021-11-30 09:57:41 +01:00
Joakim Hove
2c9af65747
Merge pull request #2876 from joakim-hove/rst-deck-rptrst-fix
...
Retain RPTRST keyword when updating SOLUTION section for restart
2021-11-30 09:42:01 +01:00
Joakim Hove
041a2a72a1
Sign change on tracer data
2021-11-29 08:05:23 +01:00
Joakim Hove
78377b705f
Retain RPTRST keyword when updating SOLUTION section for restart
2021-11-27 12:44:11 +01:00
Joakim Hove
ae8c7c5325
Add tracer config function fname() == name + "F"
2021-11-26 16:45:04 +01:00
Joakim Hove
4c05ba58d1
Merge pull request #2874 from joakim-hove/tracer-name-fixup
...
Tracer name fixup
2021-11-26 16:44:10 +01:00
Joakim Hove
ecdfa8413d
Allow to create TracerConfig (for restart) without any data
2021-11-26 14:55:53 +01:00
Joakim Hove
508e2dac3c
Make sure correct name is used in tracer configuration
2021-11-26 14:48:01 +01:00
Joakim Hove
4e4f7fc94c
Merge pull request #2872 from joakim-hove/schedule-deck-start
...
Schedule deck start
2021-11-26 12:15:01 +01:00
Joakim Hove
507d412355
DeckRecord writer accepts optional item offset
2021-11-26 09:11:53 +01:00
Joakim Hove
e011da6661
SchduleBlock: dump DATES / TSTEP from public method
2021-11-26 09:11:53 +01:00
Joakim Hove
c4bdff2b39
ScheduleDeck constructed with time_point argument
2021-11-26 09:11:53 +01:00
Joakim Hove
2d0e92750d
Merge pull request #2866 from joakim-hove/schedule-dump
...
Implement schedule dump to deck functionality
2021-11-25 11:10:11 +01:00
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
c081a764a7
Implement schedule dump to deck functionality
2021-11-23 15:00:33 +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