OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,334 Commits 18 Branches 75 Tags 73 MiB
db6b5d2502
Commit Graph

6334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steinar Foss
887a567869 added keywords BIGMODEL, BOUNDARY, BPARA. 2019-08-08 15:10:08 +02:00
Joakim Hove
8ff8d23146
Merge pull request #926 from stefoss23/add_keywords_A 
WIP: Add keywords a
 2019-08-08 14:03:28 +02:00
Steinar Foss
0bfe490609 AUTOREF: corrected name. 2019-08-08 11:54:42 +02:00
Steinar Foss
0f7062ef2a added keywords: AQUNNC, AUTOCOAR, AUTOREF. 2019-08-08 11:50:54 +02:00
Joakim Hove
6016cd43b3 Evaluate UDA variuables for group rates 2019-08-08 06:52:48 +02:00
Joakim Hove
93b53df02a
Merge pull request #900 from joakim-hove/remove-group 
Use new Group2 class
 2019-08-07 21:52:56 +02:00
Kai Bao
a06194ecae fixing requiredRestartVectors() in Summary.cpp 
adding the following to the requiredRestartVectors()

    “OPP”, “WPP”, “GPP”,
    “OPI”, “WPI”, “GPI”
 2019-08-07 10:55:58 +02:00
Kai Bao
8a57e491c2 removing potential keywords from ALL in SUMMARY 
which were added from OPM/opm-common#585
 2019-08-07 10:55:58 +02:00
Steinar Foss
9516fdd3e6 added keywords AQUFET, AQUFLUX. 2019-08-07 10:29:30 +02:00
Joakim Hove
7c856f681d Use new classes Group2 and GTNode 2019-08-06 22:59:16 +02:00
Bård Skaflestad
9875d5fbd8
Merge pull request #925 from atgeirr/fix-satfuncpropertyinitializers-slgof 
Bugfix: multiple bugs in dealing with SLGOF dealt with.
 2019-08-06 15:29:47 +02:00
Atgeirr Flø Rasmussen
b9cdb9fb78 Minor modifications requested by reviewer. 2019-08-06 14:14:00 +02:00
Atgeirr Flø Rasmussen
8c9674856a Bugfix: multiple bugs in dealing with SLGOF dealt with. 2019-08-06 11:10:57 +02:00
Joakim Hove
8633f07018
Merge pull request #913 from joakim-hove/sort-wells 
Sort the child wells according to insert index
 2019-08-06 09:24:10 +02:00
Joakim Hove
22ef5a4cd2
Merge pull request #924 from joakim-hove/group-add-unitsystem 
Add UnitSystem member ot Group2 class
 2019-08-06 06:38:18 +02:00
Joakim Hove
ed4bf054fa Add UnitSystem member ot Group2 class 2019-08-05 18:37:01 +02:00
Joakim Hove
5bb56ff4a8
Merge pull request #922 from joakim-hove/well_uda_rename 
Minor reorg to use the same UDA code for wells and groups
 2019-08-05 17:11:13 +02:00
Joakim Hove
bab637ab67
Merge pull request #921 from bska/include-stdexcept 
Include <stdexcept> Where Necessary
 2019-08-05 17:11:01 +02:00
Joakim Hove
658dc20f36 Minor reorg to use the same UDA code for wells and groups 2019-08-05 14:35:00 +02:00
Bård Skaflestad
7d26cf44e1 Include <stdexcept> Where Necessary 
Issue hidden by transitive includes in some standard library
implementations.
 2019-08-05 11:12:06 +02:00
Steinar Foss
7dfc20a4cc added keywords AQANCONL, AQANNC, AQANTRC, AQUCWFAC. 2019-08-05 10:12:24 +02:00
Joakim Hove
119cbc33f7 Sort the child wells according to insert index 2019-07-31 13:28:24 +02:00
Joakim Hove
24393cc2ef
Merge pull request #892 from joakim-hove/group2-testing 
Group2
 2019-07-31 08:18:28 +02:00
Joakim Hove
9e6666357b Add method Group2::wellgroup() 2019-07-31 07:13:08 +02:00
Joakim Hove
2d66d15d96 Refactor GroupTree - create on demand 2019-07-30 09:37:55 +02:00
Joakim Hove
dc4aa882be Integration testing of Group2 in Schedule constructor 2019-07-30 09:36:57 +02:00
Joakim Hove
12294cb637 Initialize Group2 structure during Schedule construction 2019-07-30 09:36:48 +02:00
Joakim Hove
8a52da5851 Replace SCHEDULE_WELL_ERROR -> SCHEDULE_GROUP_ERROR 2019-07-30 09:33:48 +02:00
Joakim Hove
b48f0affea Add size() method to DynamicState 2019-07-30 09:32:26 +02:00
Bård Skaflestad
cc14a83ecf
Merge pull request #912 from joakim-hove/windowed-array-zero-size 
Add invalid size zero in WindowArray and WindowMatrix
 2019-07-29 07:56:38 -05:00
Joakim Hove
ad9448c87d Add invalid size zero in WindowArray and WindowMatrix 2019-07-29 14:09:07 +02:00
Joakim Hove
3655aeb579
Merge pull request #910 from stefoss23/add_keywords_1 
Added keywords beginning w/ A
 2019-07-27 08:19:09 +02:00
Steinar Foss
57c27d603a added keywords: ALPOLADS, ALSURFAD, ALSURFST. 2019-07-26 18:01:59 +02:00
Steinar Foss
d35a321214 added keywords ALKALINE, ALKROCK. 2019-07-26 16:47:18 +02:00