Commit Graph

6368 Commits

Author SHA1 Message Date
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
9d9099a8fc Add string_view::starts_with() and string_view::find() methods 2019-08-10 18:05:22 +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
Joakim Hove
2747f20e24 Add utility to output Action::TokenType to string 2019-08-09 15:43:58 +02:00
Joakim Hove
27e1cc654a ActionContext uses a reference to SummaryState 2019-08-09 15:43:58 +02:00
Joakim Hove
f0c5b914ad
Merge pull request #930 from GitPaean/recovering_ALL_Summary_2
removing potential keywords from ALL in SUMMARY (attempt no. 2)
2019-08-09 14:41:27 +02:00
Joakim Hove
37b49cabf6
Merge pull request #917 from stefoss23/setuptools
Setuptools
2019-08-09 13:45:50 +02:00
Steinar Foss
b0ad3a2b26 resolved merge conflict. 2019-08-09 10:48:43 +02:00
Steinar Foss
c208a59597 Sunbeam will be compiled with setuptools.
setup.py moved to python/python.

moved python tests to python/python.

added __init__.py under python/tests.

added 'test_' before all python test names.

test_ prefix added to tests.

setup.py and python tests moved back to python base.

setuptools executes from root python.

python: tests run from root python w/ setup.py.

python tests: temp reduced to test_deck only.

python setup.py: manually linked opmcommon.

setup.py: linked ecl.

setup.py linked boost_filesystem.

setup.py: linked boost_regex.

python all tests run.

removec usr/local from setup.py ext_module.

cmake make copies entire python dir to build.

setup.py can execute from build.

setup.py executes from build/python.

python tests run under setup.py.

setup.py library_dirs and include-dirs set by cmake command.

removed cmake files from sunbeam.

sunbeam: added code for install.

setup.py: removed 'import ecl'.

python/src -> python->src_sunbeam.

setup.py: discontinued use of glob, all files listed instead.

build-opm_module.sh: added prefix_path to opm.

build-opm-module.sh: changed spell error for EXTRA_MODULE_FLAGS[opm-common].

setup.py: infer include directories from cmake target

CMakeLists.txt: under python: align install statement.

CMakeLists build python: removed find_package.

src_sunbeam -> cxx.

setup.py: test_suite as string.

setup.py: tests_suite -> test_suite.

setup.py: added exception if 'build_ext' not used.

temporarily moved files to python/sunbeam.
2019-08-09 10:40:33 +02:00
Joakim Hove
b55e073182
Merge pull request #923 from joakim-hove/group-uda
Group uda
2019-08-09 08:50:20 +02:00
Steinar Foss
e013066040 added keyword CECONT. 2019-08-09 08:32:19 +02:00
Joakim Hove
f63c408ba4 Add has_control() functionality to group 2019-08-08 18:43:19 +02:00
Joakim Hove
bd28038327 Add Group2 getters for cmode and phase 2019-08-08 17:28:34 +02:00
Joakim Hove
02c43b7a09
Merge pull request #927 from stefoss23/add_keywords_B
Add keywords beginning w/ B
2019-08-08 17:22:56 +02:00
Steinar Foss
3852c5224e added keywords CALTRAC, CART, CMBOPTS. 2019-08-08 16:03:04 +02:00
Steinar Foss
692edfbf5c added keywords BPDIMS, BRINE, BTOBALFA, BTOBALFV. 2019-08-08 15:10:08 +02:00