Commit Graph

7898 Commits

Author SHA1 Message Date
Joakim Hove
96f22730ca Minor reformatting 2020-03-11 16:14:21 +01:00
Joakim Hove
af02d6620d Align code 2020-03-11 15:46:00 +01:00
Joakim Hove
472984233f Use Segment instance for outlet segment 2020-03-11 15:42:49 +01:00
Atgeirr Flø Rasmussen
ce930d0158 Add virtual destructor for EclipseState class. 2020-03-11 15:19:47 +01:00
Atgeirr Flø Rasmussen
be2337e2c1 Add GuideRate::has(). 2020-03-11 15:19:47 +01:00
Joakim Hove
9b1d045631 Add segmentOrder() overload to avoid dummy argument 2020-03-11 14:49:17 +01:00
Joakim Hove
83ace5c03e Remove unused file 2020-03-11 14:33:12 +01:00
Bård Skaflestad
683723aa56
Merge pull request #1558 from joakim-hove/segment-use-named-index
Use enum values to look up indices when assembling segment info
2020-03-11 08:08:41 -05:00
Joakim Hove
222e0e7699 Use named constants in ISEG init 2020-03-11 13:39:42 +01:00
Joakim Hove
61894b5c3a Use enum values to look up indices when assembling segment info 2020-03-11 11:45:08 +01:00
Joakim Hove
3cc78f2487 The numerical value 0 is used to signify no connection <-> segment 2020-03-11 08:11:22 +01:00
Bård Skaflestad
64206e1d9a
Merge pull request #1549 from akva2/serializer_summaryconfig
add serialization template to SummaryConfig
2020-03-10 20:20:08 -05:00
Arne Morten Kvarving
35eb136986
Merge pull request #1554 from dr-robertk/PR/cmake-check-include-file
[bugfix][cmake] Fix FindParMETIS check
2020-03-10 15:36:05 +01:00
Robert Kloefkorn
8de70f9128 [bugfix][cmake] Fix FindParMETIS check by adding missing
include(CheckIncludeFile).
2020-03-10 15:33:29 +01:00
Bård Skaflestad
cb7e40345f
Merge pull request #1550 from akva2/followup_stonetype
changed: relocate and rename StoneType enum
2020-03-10 07:57:26 -05:00
Arne Morten Kvarving
1da29f8bd8 add serialization template to EclipseState 2020-03-10 13:47:11 +01:00
Arne Morten Kvarving
6a2c036582 add serialization template to SummaryConfig
remove accessors that was only required for the external serialization
support
2020-03-10 13:09:08 +01:00
Arne Morten Kvarving
c2108265b3
Merge pull request #1548 from akva2/simplify_oilvap_equality
simplify the OilVaporization equality operator
2020-03-10 12:31:10 +01:00
Joakim Hove
e3600cfc19
Merge pull request #1551 from joakim-hove/opmpack-fix2
Fix opmpack copy_file option in the case of empty directories
2020-03-10 12:22:30 +01:00
Arne Morten Kvarving
9b22cab024 changed: relocate and rename StoneType enum
unfortunate naming, unfortunate location
2020-03-10 11:09:49 +01:00
Joakim Hove
02fd4ab340 Fix opmpack copy_file option in the case of empty directories 2020-03-10 11:03:45 +01:00
Arne Morten Kvarving
d945dee95b simplify the OilVaporization equality operator
in particular the UNDEF -> false condition causes issues
in user code.
2020-03-10 09:55:46 +01:00
Joakim Hove
b8a30805d3
Merge pull request #1547 from joakim-hove/update-binary-testdata
Update embedded testdata with more items in restart file
2020-03-09 19:13:00 +01:00
Joakim Hove
cab6e21df6 Update embedded testdata with more items in restart file 2020-03-09 17:55:50 +01:00
Joakim Hove
ed0018ac98
Merge pull request #1546 from joakim-hove/rst-small
Rst small
2020-03-09 16:56:30 +01:00
Joakim Hove
b9b7cdc801
Merge pull request #1544 from joakim-hove/restart-items
Restart items
2020-03-09 16:55:57 +01:00
Joakim Hove
2edb1f4621 Add Well::DrainageRadius and Well::EfficiencyFactor to restart file 2020-03-09 16:52:03 +01:00
Joakim Hove
34984de671
Merge pull request #1519 from joakim-hove/add-welltype-class
Add WellTypes class
2020-03-09 16:40:22 +01:00
Joakim Hove
d1e4b28ad2
Merge pull request #1545 from joakim-hove/jenkins-enable-simulator-python
jenkins: Enable building of Python extension in opm-simulators
2020-03-09 15:32:55 +01:00
Joakim Hove
46cba99cfb Completion number has correct offset in file 2020-03-09 15:14:28 +01:00
Joakim Hove
b46b50ed5f Add explicit to one argument constructor 2020-03-09 15:14:23 +01:00
Joakim Hove
094270d994 Loading restart: check defaulted rates against value 1e+20 2020-03-09 15:06:08 +01:00
Joakim Hove
915dc982e8 Add throw protection when trying to create Valve from restart file 2020-03-09 14:59:35 +01:00
Joakim Hove
39c96ac9de Add UnitSystem member to restart state 2020-03-09 14:59:30 +01:00
Joakim Hove
d056e8e97d jenkins: Enable building of Python extension in opm-simulators 2020-03-09 14:31:10 +01:00
Joakim Hove
0bb822b9b5 Use WellType when reading and writing restart file 2020-03-09 13:30:18 +01:00
Joakim Hove
327625b713 Use the WellType class in Well and Schedule 2020-03-09 13:30:18 +01:00
Joakim Hove
6e8b4a6c12 Add WellType class for ecl interop 2020-03-09 13:29:11 +01:00
Joakim Hove
51a593de39
Merge pull request #1532 from joakim-hove/uda-value-dim-constructor
Uda value dim constructor
2020-03-09 13:28:22 +01:00
Joakim Hove
2eceab522d
Merge pull request #1541 from joakim-hove/rst-tuning
Rst tuning
2020-03-09 13:27:02 +01:00
Joakim Hove
ff3949a6ce Output Connection::SkinFactor to restart file 2020-03-09 12:18:41 +01:00
Arne Morten Kvarving
8f7eefcf2a
Merge pull request #1543 from akva2/internalize_stonetype
internalize STONE|STONE1|STONE2
2020-03-09 11:21:32 +01:00
Arne Morten Kvarving
825eb34e8a internalize STONE|STONE1|STONE2 2020-03-09 09:54:10 +01:00
Joakim Hove
86768666ae
Merge pull request #1542 from wito/extended-network-model-API
Separates Opm::Group::parent() for the extended network model
2020-03-06 17:05:34 +01:00
Joakim Hove
43ae6e6a0e Initialize Tuning object when loading from restart file 2020-03-06 15:52:28 +01:00
Joakim Hove
75b8c12090 Publish indices required to look up Tuning parameters from DOUBHEAD 2020-03-06 15:52:28 +01:00
Joakim Hove
884e5e820a Add missing #include<.../Units.hpp> 2020-03-06 15:52:28 +01:00
Williham Totland
13e838d171 Separates Opm::Group::parent() for the extended network model
In order to support the extended network model going forwards, the method Opm::Group::parent() is split in the API into two new methods, Opm::Group::control_group() and Opm::Group::flow_group(). These methods give the names of the parent node in the group control hierarchy and network structure, respectively.

While for the standard network model these two values will be the same (and the same as ::parent()), code that presently calls ::parent() should be revisited with an eye to the question of which parent group is desired.
2020-03-06 14:38:38 +01:00
Arne Morten Kvarving
9116f6410c
Merge pull request #1539 from akva2/serialize_plyshlog_rocktab
Prepare serialization for PlyshlogTable and RocktabTable
2020-03-06 13:55:26 +01:00
Arne Morten Kvarving
f0f87bb4b5
Merge pull request #1540 from akva2/internalize_stone1ex
internalize STONE1EX
2020-03-06 13:52:43 +01:00