Commit Graph

3699 Commits

Author SHA1 Message Date
Joakim Hove
edf01bdcda Initialize Schedule from restart file 2020-03-13 09:09:25 +01:00
Joakim Hove
191c50173a Add context aware Schedule::cmp() function 2020-03-13 08:03:36 +01:00
Joakim Hove
a28f146d71 Add Well constructor based on restart well 2020-03-12 20:09:09 +01:00
Joakim Hove
e1dbd72689 Remove const and use std::move() when updating internal shared ptr 2020-03-12 18:11:25 +01:00
Joakim Hove
bf00fec1f9 Add Connection constructor based on RestartIO::connection 2020-03-12 18:11:25 +01:00
Joakim Hove
0fa1be6f54 Add accessor to in productionControls 2020-03-12 17:40:15 +01:00
Joakim Hove
c7695a7ac1 Moved declarations 2020-03-12 17:34:54 +01:00
Joakim Hove
8342d78fa0 Merge pull request #1556 from joakim-hove/connection-segment-attach-bug
Fixed: do not update insert_index when linking segment -> connection
2020-03-12 12:56:04 +01:00
Joakim Hove
fcfed6e125 Merge pull request #1563 from atgeirr/add-has-method-guiderate
Add GuideRate::has() method.
2020-03-12 12:55:44 +01:00
Joakim Hove
d5855edc55 Fixed: do not update insert_index when linking segment -> connection 2020-03-12 11:01:56 +01:00
Arne Morten Kvarving
c8c8ef006d changed: store Regdims and Eqldims as regular members, not shared ptrs 2020-03-12 08:53:36 +01:00
Bård Skaflestad
0ec72754dd Merge pull request #1555 from joakim-hove/connection-def-segment-zero
The numerical value 0 is used to signify no connection <-> segment
2020-03-11 14:14:17 -05:00
Bård Skaflestad
7732e42658 Merge pull request #1552 from akva2/eclstate_serialize
add serialization template to EclipseState
2020-03-11 12:12:49 -05: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
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
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
9b22cab024 changed: relocate and rename StoneType enum
unfortunate naming, unfortunate location
2020-03-10 11:09:49 +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
b46b50ed5f Add explicit to one argument constructor 2020-03-09 15:14:23 +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
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
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
f9c3368fc2 internalize STONE1EX 2020-03-06 12:08:13 +01:00
Arne Morten Kvarving
0cb8eecaa6 changed: use regular shared ptrs in table container
ptrs to const is problematic for serialization support
2020-03-06 09:59:09 +01:00
Arne Morten Kvarving
7fe4c3b23d prepare RocktabTable for serialization 2020-03-06 09:59:09 +01:00
Arne Morten Kvarving
9b0203b517 prepare PlyshlogTable for serialization 2020-03-06 09:59:09 +01:00
Arne Morten Kvarving
e4433dfc2d Merge pull request #1537 from akva2/internaliz_shrate
Internalize SHRATE
2020-03-06 09:58:42 +01:00
Joakim Hove
0b26ece3c4 Rename function WellConnections::orderConnections() 2020-03-05 16:00:56 +01:00
Arne Morten Kvarving
33ebaa8753 internalize SHRATE 2020-03-05 14:34:01 +01:00
Arne Morten Kvarving
ef1e6d5fd8 Revert "added: PolymerConfig class"
This reverts commit a984ca5beb.
2020-03-05 14:17:51 +01:00
Arne Morten Kvarving
93615f53c5 internalize PLYVMH 2020-03-05 13:13:33 +01:00
Arne Morten Kvarving
d47a064c1c Merge pull request #1534 from akva2/internalize_plmixpar
internalize PLMIXPAR
2020-03-05 13:10:24 +01:00
Joakim Hove
8501a7ead4 Construct UDA values in WellInjectionProperties with correct unit 2020-03-05 13:08:00 +01:00
Joakim Hove
17ec37ae4e WellProductionProperties - init with correct UDA dimensions 2020-03-05 13:08:00 +01:00
Joakim Hove
ac79a7a1b1 Add UnitSystem::getDimension( measure ) method 2020-03-05 13:08:00 +01:00
Joakim Hove
4b0ee9d0bb Remove method Dimension::newComposite() 2020-03-05 13:08:00 +01:00
Joakim Hove
874c734628 Remove name property from UnitSystem dimension 2020-03-05 13:08:00 +01:00
Joakim Hove
f8c250be34 UDAValue: change from ::reset() to ::operator=() 2020-03-05 13:08:00 +01:00
Joakim Hove
37d31aeac0 Remove UDAValue copy and modify constructor 2020-03-05 13:08:00 +01:00
Joakim Hove
157d3e4279 Add UDAValue constructor which takes dimension 2020-03-05 13:08:00 +01:00