OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,168 Commits 18 Branches 75 Tags
d6c1d64ba066d50639cb836a3430d43ff8ea2ab6
Commit Graph

7168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steinar Foss
d6c1d64ba0 Python: added class FieldProperties. 
test_props.py: added check for 3d_properties/field_props extraction.

cxx/eclipse_state.cpp: adding function field_props.

added python class FieldProperties.

python FieldProps: added __contains__.

python FieldProps: added __getitem__.

python field_props: images all 3dprops tests.
 2019-12-22 15:25:16 +01:00
Markus Blatt
43116d3c45 Merge pull request #1352 from akva2/noecl_flush 
Next round of serialization preparation
 2019-12-18 08:11:23 +01:00
Joakim Hove
3a87395419 Merge pull request #1348 from joakim-hove/udq-parse-diff 
UDQ parse A - B - C
 2019-12-17 18:55:06 +01:00
Joakim Hove
46f6aaec02 Merge pull request #1338 from stefoss23/double_records 
Can parse keywords of type double-record.
 2019-12-17 17:09:11 +01:00
Joakim Hove
89ab99e6b9 UDQ: fix bug with parsing of expressions like A - B - C - D 
- In the case of several tokens separated with +/- the final tree is assembled
   from left, was previously from the right. This fixes evaluation bug with
   expressions like A - B - C which were eventually evaluated as A - (B - C).

 - Improved handling of different types; both transiton from scalar to sets of
   wells and groups, and also groups in general. In particular you can now
   assign to a group variable:

        DEFINE GUXXX  WOPR * 0.25

 - Actually hook up the evaluation of group variables from the Summary code.
 2019-12-17 16:59:06 +01:00
Arne Morten Kvarving
582e08692b allow constructing Tabdims from variables 
also add equality operator
 2019-12-17 16:36:42 +01:00
Arne Morten Kvarving
6069867b32 allow constructing Phases from variables 
also add accessors and equality operator
 2019-12-17 16:36:42 +01:00
Arne Morten Kvarving
95680c70c3 allow constructing IOConfig from variables 
also add accessors and equality operator
 2019-12-17 16:36:06 +01:00
Arne Morten Kvarving
9825e25740 allow constructing RestartConfig from tables 
also add accessors and equality operator
 2019-12-17 16:34:24 +01:00
Arne Morten Kvarving
6ee97a3f9a allow constructing DynamicState from tables 
also add accessor and equality operator
 2019-12-17 16:34:24 +01:00
Arne Morten Kvarving
6378d55fa9 allow constructing TimeMap from tables 
also add accessors and equality operators
 2019-12-17 16:33:46 +01:00
Arne Morten Kvarving
d78319222f Merge pull request #1349 from akva2/noecl_flush 
Another round of serialization preparation
 2019-12-17 15:45:39 +01:00
Atgeirr Flø Rasmussen
6c1c6e2c13 Merge pull request #1350 from akva2/janitoring 
add a default to quell unhandled value in switch warning
 2019-12-17 13:40:13 +01:00
Arne Morten Kvarving
b7be32fadc allow constructing SimulationConfig from tables 
also equality operator
 2019-12-17 12:46:27 +01:00
Arne Morten Kvarving
b4066d40f5 allow constructing InitConfig from tables 
also add accessors and equality operator
 2019-12-17 12:46:27 +01:00
Arne Morten Kvarving
d13b9a0a15 allow constructing FoamConfig from tables 
also add accessors and equality operator
 2019-12-17 12:46:27 +01:00
Arne Morten Kvarving
a63bde6bba add a default to quell unhandled value in switch warning 2019-12-17 11:57:08 +01:00
Joakim Hove
132665e469 Merge pull request #1270 from bska/restart-wsegvalv 
Add Restart File Support for WSEGVALV Devices
 2019-12-17 11:29:37 +01:00
Arne Morten Kvarving
b56cef3103 allow constructing FoamData from doubles 
also add accessors and equality operator
 2019-12-17 11:04:12 +01:00
Arne Morten Kvarving
0741f4c099 allow constructing Equil from tables 
also add accessors and equality operator
 2019-12-17 10:31:23 +01:00
Arne Morten Kvarving
d532f861ac add equality operator and a default constructor to EquilRecord 2019-12-17 10:31:23 +01:00
Arne Morten Kvarving
850c91f047 add accessors to TableContainer 
also add equality operator and default constructor
 2019-12-17 10:26:42 +01:00
Arne Morten Kvarving
baef4f00fa allow constructing SimpleTable from tables 
also add accessors and equality operator
 2019-12-17 10:25:12 +01:00
Arne Morten Kvarving
3b49c8a63c allow constructing TableColumn from tables 
also add accessors and equality operator
 2019-12-17 10:25:12 +01:00
Bård Skaflestad
ebfa768fd2 Segment: Make Type Predicates Free Functions 
That way, we won't have to pollute the Segment API when adding new
segment types.  While here, also reduce header file coupling by
forward-declaring SpiralICD and Valve in Segment.hpp.
 2019-12-17 09:14:17 +01:00
Bård Skaflestad
21de27a1cb Output Valve Characteristics to Restart File 
This commit identifies well segments that correspond to valves
(input keyword WSEGVALV) and captures those in the ISEG vector.
Furthermore, we output characteristic properties of such valve
segments (e.g, the valve length, the base strength, and
cross-sectional area) in the RSEG vector.
 2019-12-17 09:14:17 +01:00
Bård Skaflestad
40e0f83b7b Segment: Add Means of Identifing Valve Devices 
This commit adds a simple predicate, Segment::isValve(), that lets
client code query whether or not a particular segment represents a
valve--created through the WSEGVALV keyword.

If so, the client can also request the valve itself to inspect the
pertinent valve properties.
 2019-12-17 09:14:17 +01:00
Atgeirr Flø Rasmussen
64fd78694e Merge pull request #1347 from akva2/janitoring 
Some janitoring
 2019-12-17 08:44:04 +01:00
Arne Morten Kvarving
77cadac586 anonymize unused parameters 2019-12-16 16:14:28 +01:00
Arne Morten Kvarving
c57466aa70 remove unused function 2019-12-16 16:14:21 +01:00
Arne Morten Kvarving
6237cdeba6 Merge pull request #1344 from akva2/noecl_flush 
Preparation for serialization support
 2019-12-16 16:01:15 +01:00
Bård Skaflestad
61c698b9c2 Merge pull request #1345 from stefoss23/fix_writeinit 
WriteInit.cpp fix
 2019-12-16 15:04:06 +01:00
Steinar Foss
c0410143c2 writeinit_fix. 2019-12-16 15:01:09 +01:00
Arne Morten Kvarving
c94dbd4fcd allow constructing TableSchema from tables 
also add accessor and equality operator
 2019-12-16 14:44:36 +01:00
Arne Morten Kvarving
5237dad89a allow constructing OrderedMap from tables 
also make typedefs public, add accessors and equality operator
 2019-12-16 14:44:36 +01:00
Arne Morten Kvarving
b357e211a5 add accessors to ColumnSchema 
also add equality operator and a default constructor
 2019-12-16 14:38:56 +01:00
Arne Morten Kvarving
b66bc61b51 added: allow constructing Rock2dtrTables from vectors 
also add accessors
 2019-12-16 14:34:40 +01:00
Arne Morten Kvarving
9877e237b1 added: allow constructing Rock2dTables from vectors 
also add accessors
 2019-12-16 14:31:53 +01:00
Arne Morten Kvarving
2ec73f479e added: allow construction (EDIT)NNC from a vector 2019-12-16 14:29:01 +01:00
Arne Morten Kvarving
cf29bd0933 allow construction ThresholdPressure from tables 
add some convenience type aliases and const accessors to data

this is used to reconstruct the class in parallel simulations
 2019-12-16 14:27:56 +01:00
Steinar Foss
77cc47d6f8 added keywords GCUTBACT, GECONT, MPFNNC. 2019-12-16 13:53:24 +01:00
Steinar Foss
0be84e6529 DeckKeyword: double_record style keywords has empty records as block seperators. 2019-12-16 13:11:20 +01:00
Joakim Hove
acd57b2d0a Merge pull request #1236 from joakim-hove/writeinit-fp 
Writeinit fp
 2019-12-16 13:08:54 +01:00
Joakim Hove
1f9378ca7a Merge pull request #1342 from joakim-hove/fieldprops-manager-active-size 
Add active_size() method to FieldPropsManager
 2019-12-16 12:12:10 +01:00
Joakim Hove
d2da9fd534 Fixed: wrong satfunc endpoints 2019-12-16 12:11:06 +01:00
Joakim Hove
6c46e50142 Add special case *SWL* subtraction to *SOGCR* keywords 2019-12-16 12:11:06 +01:00
Joakim Hove
6b71e30a38 Add test for SOGCR keyword 2019-12-16 12:11:06 +01:00
Joakim Hove
26644b1e9f Temporary: allow keyword reordering errors INIT file regression test 2019-12-16 12:11:06 +01:00
Joakim Hove
819f30eabc Rewrite writeInit to use FieldPropsManager 2019-12-16 12:11:06 +01:00
Joakim Hove
db47314fb4 Merge pull request #1317 from joakim-hove/enable-3d-props 
Enable 3D props testing in opm-simulators and opm-grid
 2019-12-16 12:10:48 +01:00