Bård Skaflestad
d42bbbe15a
Merge pull request #2286 from akva2/avoid_deck_unitsystem
...
changed: avoid deck usage
2020-01-17 15:52:09 +01:00
Bård Skaflestad
b9a16f608e
Merge pull request #2285 from akva2/reduce_duplication
...
changed: avoid near-duplicate code
2020-01-17 15:37:04 +01:00
Bård Skaflestad
b1fc78056e
Merge pull request #2277 from akva2/noecl_flush_schedule
...
Avoid using deck setting up Schedule on non-root processes
2020-01-17 15:36:34 +01:00
Arne Morten Kvarving
3f0fe3bcbd
changed: avoid deck usage
...
in particular, this is preparing for the case where only the
root-process has a deck instance
2020-01-17 14:56:40 +01:00
Arne Morten Kvarving
cfc9cb3513
changed: avoid near-duplicate code
2020-01-17 14:55:36 +01:00
Arne Morten Kvarving
821e4386bc
Merge pull request #2284 from akva2/fix_comm_size
...
fixed: 0 processes is too 'special' a special case
2020-01-17 13:08:39 +01:00
Arne Morten Kvarving
1b1f613ed4
fixed: 0 processes is too 'special' a special case
...
this was intended to check for 1 process
2020-01-17 12:32:19 +01:00
Arne Morten Kvarving
3fca2ae631
changed: avoid using deck setting up schedule on non-root processes
2020-01-17 10:29:46 +01:00
Arne Morten Kvarving
1d68e37763
fixed: do not handle GuideRateConfig::GroupTarget as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
446af27a42
fixed: do not handle GuideRateConfig::WellTarget as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
4d0bf970fd
fixed: do not handle Well::WellGuideRate as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
8668ecaa64
fixed: do not handle WellPolymerProperties as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
486602ea98
fixed: do not handle JFunc as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
eca6108cbf
fixed: do not handle EclHysterConfig as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
720fd66638
fixed: do not handle TimeMap::StepData as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
b7d7ced43d
fixed: do not handle RestartSchedule as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
1b81e43e73
fixed: do not handle FoamData as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
64e943176b
fixed: do not handle EquilRecord as POD
...
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
72b33edf81
fixed: cannot simply deserialize the udq function table
...
rather we simply create it based on the params as elsewhere.
2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
6bf2f8e285
add missing Connection serialization in Well
2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
b2b398e217
fixed: missing Kind in Connection serialization
2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
2a2379dce9
update serialization for UDAValue due to new dim member
2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
c463bcc54a
fixed: disable sanity check when reconstructing Dimension
2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
41853c2622
fixed: we have to reconstruct the exact pointer map for these
...
we cannot just deserialize as new entities
2020-01-17 10:10:07 +01:00
Atgeirr Flø Rasmussen
2afab847f3
Merge pull request #2280 from atgeirr/add-missing-instantiation
...
Add missing instantiation of pack.
2020-01-15 12:43:56 +01:00
Atgeirr Flø Rasmussen
b91f6fcc9f
Add missing instantiation of pack.
...
For pack(std::vector<Opm::Tabulated1DFunction<double>>).
2020-01-15 11:25:00 +01:00
Joakim Hove
a4efff2d1b
Merge pull request #2279 from bska/chase-rftconfig-api-update
...
Parallel Restart: Chase RFTConfig API Update
2020-01-14 17:40:10 +01:00
Bård Skaflestad
b455faf067
Parallel Restart: Chase RFTConfig API Update
...
The RFTConfig object gained a new data member and constructor
argument, in addition to altering the type of the data member
well_open_rft_name from an unordered_set to an unordered_map.
Update serialization code accordingly.
2020-01-14 16:49:33 +01:00
Joakim Hove
0e9535319b
Simulate with only active cells ( #2213 )
...
Use FieldProps implementation for 3D properties
2020-01-13 15:46:50 +01:00
Tor Harald Sandve
dce86bb078
Merge pull request #2275 from atgeirr/fix-forgotten-brine-flag
...
Pass EnableBrine flag to BlackOilFluidState used for equilibration.
2020-01-13 12:29:19 +01:00
Atgeirr Flø Rasmussen
9d8d4921b8
Pass EnableBrine flag to BlackOilFluidState used for equilibration.
...
Gave compile error on clang due to narrowing (the int 3 -> bool).
Bug did not cause trouble because default number of phases in
the fluid state (3) was sufficient.
2020-01-13 11:00:33 +01:00
Atgeirr Flø Rasmussen
725b90504c
Merge pull request #2269 from totto82/fixVREP
...
fix for vrep and rein for more then one level of groups
2020-01-13 08:33:29 +01:00
Joakim Hove
c20bbbcb1d
Merge pull request #2270 from totto82/trinemykk-smartwater
...
Trinemykk smartwater
2020-01-11 06:50:56 +01:00
Tor Harald Sandve
cf6cb3016b
use SPE1CASE1_BRINE as test case not SPE1CASE2_BRINE
2020-01-10 10:47:39 +01:00
Bård Skaflestad
558873bc80
Merge pull request #2274 from atgeirr/fix-auto-in-prototype
...
Change auto in prototype to template argument.
2020-01-10 10:38:57 +01:00
Atgeirr Flø Rasmussen
b39ca125f6
Change auto in prototype to template argument.
2020-01-10 09:59:21 +01:00
Tor Harald Sandve
bc33e482be
don't communicate isoThermal when approach is NoWaterPvt
2020-01-10 09:02:16 +01:00
Tor Harald Sandve
2877a984a1
Adapt FluidState in Aquifer model to interface change due to Brine
2020-01-09 15:09:53 +01:00
Tor Harald Sandve
ada7c9d90b
fix various extentions
2020-01-09 14:14:38 +01:00
Tor Harald Sandve
56d7a1ec19
yet another rebase fix
2020-01-09 14:14:38 +01:00
Tor Harald Sandve
c3424a5716
remove depricated ebos_saltwater from install list
2020-01-09 14:14:38 +01:00
Tor Harald Sandve
8b93953ef5
clean-up after rebase
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
19a40c6047
update serialization for TableManager and Well due to brine additions
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
f118ae5036
add mpi serialization for WellBrineProperties
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
1f8ed78683
add mpi serialization for PvtwsaltTable
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
b9f8429691
add mpi serialization for BrineDensityTable
2020-01-09 14:14:38 +01:00
Tor Harald Sandve
555de445d3
add test case for brine
2020-01-09 14:14:38 +01:00
Trine S. Mykkeltvedt
99e7785fb5
renamed saltwater-->brine and removed keywords from missingFeatures
2020-01-09 14:14:38 +01:00
Trine S. Mykkeltvedt
5749615bd8
addd simple salt/brine implementation
2020-01-09 14:14:38 +01:00
Bård Skaflestad
d20bec2f71
Merge pull request #2272 from akva2/fix_gcc5
...
fixed: use std::make_tuple instead of initializer list
2020-01-09 11:16:31 +01:00