Jostein Alvestad
84116a7d70
Merge remote-tracking branch 'upstream/master' into udqrst-pull909
2019-08-13 13:05:28 +02:00
Atgeirr Flø Rasmussen
eb1d00f9dc
Merge pull request #941 from atgeirr/make-prodinjprops-public
...
Make two headers public again.
2019-08-13 12:28:35 +02:00
Atgeirr Flø Rasmussen
d20c58da07
Make two headers public again.
2019-08-13 11:56:17 +02:00
Jostein Alvestad
ff956e7aff
Made changes to avoid compiler warnings, ref comments from akva2
2019-08-13 11:23:18 +02:00
Jostein Alvestad
1715565920
Merge pull request #6 from joakim-hove/remove-udqParam
...
Remove struct udqParam use existing class UDQParams
2019-08-13 08:26:08 +02:00
Joakim Hove
f467d05035
Remove struct udqParam use existing class UDQParams
2019-08-13 08:21:46 +02:00
Jostein Alvestad
02278912d6
Merge pull request #5 from joakim-hove/udq-output-fixup
...
Minor update to UDQ settings of DoubHEAD
2019-08-13 08:20:00 +02:00
Joakim Hove
3f773b956f
Minor update to UDQ settings of DoubHEAD
2019-08-13 08:06:08 +02:00
Jostein Alvestad
a3f74c19c4
WIP removed additional code that altered DoubHEAD data
2019-08-12 13:04:59 +02:00
Jostein Alvestad
d6d1dbd38b
code changes to avoid changes in InteHead and DoubHead in Restart file
2019-08-12 13:04:57 +02:00
Jostein Alvestad
1a02bb105a
Fixed group-group2 transition, disable Restart output
2019-08-12 13:04:55 +02:00
Jostein Alvestad
e3dc5e07d7
add code to output IUAP array
2019-08-12 13:04:53 +02:00
Jostein Alvestad
af811d2eaf
WIP Added code to write InteHead and DoubHead data as well as IGPH to restart file,
...
Further added unit tests to the writing of UDQ data
2019-08-12 13:04:51 +02:00
Jostein Alvestad
083742c368
WIP changes to add first version of BOOST test for IUDQ
2019-08-12 13:04:50 +02:00
Jostein Alvestad
2bfad7ae37
minor correction for iuad[1] and for test_UDQ_x.cpp
...
Further work for making unit tests for UDQ restart data
WIP Further work unit tests
WIP some minor corrections
2019-08-12 13:04:48 +02:00
Joakim Hove
c8cd730d5c
Refactor UDQActive - handles vanishing UDA
2019-08-12 13:04:47 +02:00
Joakim Hove
4cde3e7e44
More UDQ fixes
2019-08-12 13:04:45 +02:00
Joakim Hove
8416680368
Add UDQ test and input file
2019-08-12 13:04:44 +02:00
Joakim Hove
44ddd382a3
UAD usage hashing based on udqstring and controltype
2019-08-12 13:04:42 +02:00
Joakim Hove
79da1ba5eb
Fix bug with size of IUAD array
2019-08-12 13:04:41 +02:00
Joakim Hove
a218a1c936
Remove unused arg
2019-08-12 13:04:40 +02:00
Joakim Hove
e00a32f75c
Output use_index for IUAD
2019-08-12 13:04:38 +02:00
Joakim Hove
29c3310671
Fix IUAD input index
2019-08-12 13:04:37 +02:00
Joakim Hove
e02fa5d04f
WIP
2019-08-12 13:04:35 +02:00
Jostein Alvestad
9eda0ee1b8
WIP - further code to output IGPH vector
2019-08-12 13:04:34 +02:00
Joakim Hove
0fb287b789
WIP
2019-08-12 13:04:32 +02:00
Joakim Hove
858e0b84cf
Make sure UDQ DEFINE overwrite correctly
2019-08-12 13:04:31 +02:00
Joakim Hove
39346c3b97
Add UDQActive::get() method
2019-08-12 13:04:30 +02:00
Joakim Hove
bcfc8b4966
Add operator bool() to UDQActive
2019-08-12 13:04:28 +02:00
Joakim Hove
98338e3326
UDQInput: use correct input index
2019-08-12 13:04:27 +02:00
Joakim Hove
fadcddbc92
Use UDQInput class when creating restart file
2019-08-12 13:04:26 +02:00
Joakim Hove
1a79e811dd
Add operator[] to UDQConfig class
2019-08-12 13:04:24 +02:00
Arne Morten Kvarving
1caca2df4a
use maps
2019-08-12 13:04:23 +02:00
Joakim Hove
5e751bb26c
Add unit to UDQInput class
2019-08-12 13:04:21 +02:00
Joakim Hove
520df29bd8
Add UDQIndex type to keep track of sequence number of variable types
2019-08-12 13:04:20 +02:00
Joakim Hove
354c20786d
Add UDQVarTYpe member to UDQInput class
2019-08-12 13:04:18 +02:00
Joakim Hove
9e309375b6
Add size() method to UDQConfig
2019-08-12 13:04:17 +02:00
Jostein Alvestad
74d0703dc2
Output UDQ keywords to restart file
2019-08-12 13:04:14 +02:00
Joakim Hove
5064519e83
Add function to get keyword enum
2019-08-12 13:04:12 +02:00
Joakim Hove
1a62ceff7d
Log use of UDA for output purposes
2019-08-12 13:04:10 +02:00
Joakim Hove
4d1b747b42
UDQConfig object has merged DEFINE & ASSIGN
2019-08-12 13:04:08 +02:00
Joakim Hove
28c2e7024c
Renamed UDQInput -> UDQCOnfig
2019-08-12 13:04:07 +02:00
Joakim Hove
9ff301625b
Merge pull request #931 from joakim-hove/group-controls-space
...
Add ParseContext behaviour to trimming of well/group names
2019-08-12 11:05:28 +02:00
Joakim Hove
49d32a02fb
Add ParseContext behaviour to trimming of well/group names
2019-08-12 11:01:14 +02:00
Joakim Hove
ef91e18586
Merge pull request #934 from joakim-hove/parse-test-spe9
...
Add parse testing of SPE9 variations
2019-08-09 19:53:05 +02:00
Joakim Hove
31176bacbb
Add parse testing of SPE9 variations
2019-08-09 18:46:53 +02:00
Steinar Foss
d1052d2034
setup.py: uses ccache c++.
2019-08-09 18:14:02 +02:00
Steinar Foss
cf9aa917dc
setup.py: may use ccache.
...
added note.
2019-08-09 18:14:02 +02:00
Joakim Hove
de641d83d6
Merge pull request #873 from joakim-hove/actionx-eval-field
...
ACTIONX: Fix bug with matching wells + refactor
2019-08-09 17:41:08 +02:00
Joakim Hove
359955efc3
Action: capture matching wells correctly + large refactor
...
With this commit the result of a ACTIONX evaluation goes to the new type
Action::Result which in addition to the overall thruthness of the expression
keeps track of the list of matching wells.
Introduced a new namespace Action for everything related to the ACTIONX
implemenentation.
2019-08-09 15:43:58 +02:00
