Commit Graph

7904 Commits

Author SHA1 Message Date
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
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
74e53f2a22
Merge pull request #1538 from joakim-hove/rename-order-connections
Rename function WellConnections::orderConnections()
2020-03-05 20:14:09 +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
0fe106176e
Merge pull request #1536 from akva2/internalize_plyvmh
internalize PLYVMH
2020-03-05 14:15:11 +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
Joakim Hove
3c0c94ff71 Remove stale comment 2020-03-05 13:08:00 +01:00
Arne Morten Kvarving
b53bd27a08
Merge pull request #1535 from akva2/add_polymerconfig
added: PolymerConfig class
2020-03-05 13:02:57 +01:00
Arne Morten Kvarving
a984ca5beb added: PolymerConfig class 2020-03-05 11:54:22 +01:00
Arne Morten Kvarving
c52efaecd3
Merge pull request #1533 from akva2/foamconfig_fix
fixed: update FoamConfig defaults
2020-03-05 11:16:18 +01:00
Arne Morten Kvarving
a1708080c1 internalize PLMIXPAR 2020-03-05 11:07:18 +01:00
Arne Morten Kvarving
c8ff9503a2 fixed: update FoamConfig defaults
Foam cases should run without FOAMOPTS available. That means
we need to default the mobility model to a valid value.

This also adds enum value 'FUNC' and handles setting the default model
if only transport phase is unspecified.
2020-03-05 09:13:03 +01:00
Joakim Hove
c75421a73e
Merge pull request #1531 from atgeirr/fix-missing-include
Add missing <string> include.
2020-03-04 14:22:26 +01:00
Atgeirr Flø Rasmussen
1cbb1ddaf7
Merge pull request #1530 from akva2/foam_config_change
changed: don't enforce foam model limits in parser
2020-03-04 14:18:32 +01:00
Atgeirr Flø Rasmussen
92eb721e85 Add missing <string> include. 2020-03-04 13:51:49 +01:00
Arne Morten Kvarving
26bd5fd4a0 changed: don't enforce foam model limits in parser 2020-03-04 10:53:20 +01:00
Arne Morten Kvarving
ab6a92a1d9
Merge pull request #1529 from akva2/internalize_tlmixpar
internalize TLMIXPAR
2020-03-04 09:58:16 +01:00
Joakim Hove
85ddd2e2e8
Merge pull request #1527 from joakim-hove/move-well-injectortype
Move enum Well:InjectorType to new file ScheduleTypes
2020-03-03 16:36:49 +01:00
Joakim Hove
a02811ed63
Merge pull request #1526 from joakim-hove/wells-rst-units
Wells rst units
2020-03-03 16:35:26 +01:00
Arne Morten Kvarving
7ac9b6cf88 internalize TLMIXPAR 2020-03-03 15:59:08 +01:00
Arne Morten Kvarving
ab757c4a1c
Merge pull request #1528 from akva2/internalize_surface_conditions
internalize StandardConditions
2020-03-03 13:46:01 +01:00
Arne Morten Kvarving
f77bef4774 internalize StCond keyword 2020-03-03 12:14:13 +01:00
Joakim Hove
1b2fadcdc4 Move enum Well:InjectorType to new file ScheduleTypes 2020-03-03 09:09:11 +01:00
Joakim Hove
6af2bcdb6f Use named public item for CFInDeck functionality 2020-03-03 08:34:47 +01:00
Joakim Hove
e6af67e897 Well datum depth is loaded from SWEL 2020-03-03 08:34:04 +01:00
Joakim Hove
e1bf7b2298 Well rates which should go to UDA are loaded with input units 2020-03-03 08:33:07 +01:00
Joakim Hove
e3a9174aa3
Merge pull request #1523 from akva2/simplify_oilvap
changed: simplify OilVaporizationProperties
2020-03-03 08:22:36 +01:00
Joakim Hove
e04d10494d
Merge pull request #1525 from joakim-hove/opmpack-fixup
Fix bug/problem in copy_file in opmpack
2020-03-03 08:21:59 +01:00
Joakim Hove
ca245136fa Fix bug/problem in copy_file in opmpack 2020-03-02 21:17:14 +01:00
Joakim Hove
0b884fc977
Merge pull request #1521 from tskille/pybind_deckitem
Python bindings for DeckItem, adding support for UDA type
2020-03-02 20:57:54 +01:00