Commit Graph

10449 Commits

Author SHA1 Message Date
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
Arne Morten Kvarving
b18d5a39c4 fixed: use std::make_tuple instead of initializer list
the constructor is explicit with gcc5
2020-01-09 10:29:13 +01:00
Bård Skaflestad
736f647936
Merge pull request #2268 from akva2/noecl_flush_summarycfg
Avoid using global ecl state setting up SummaryConfig on non-root processes
2020-01-08 16:48:32 +01:00
Tor Harald Sandve
18c8cc6119 fix vrep and rein for more then one level of groups 2020-01-08 14:26:25 +01:00
Atgeirr Flø Rasmussen
0a73f8aac7
Merge pull request #2267 from blattms/fix-preconditioner-factory-name-clash-dune-2.7
Move PreconditionerFactory into namespace Opm.
2020-01-08 12:52:02 +01:00
Arne Morten Kvarving
227ff00730 avoid usage of deck on all processes setting up SummaryConfig 2020-01-08 10:30:57 +01:00
Arne Morten Kvarving
fa5f026fe4 add mpi serialization for SummaryConfig 2020-01-08 10:08:30 +01:00
Arne Morten Kvarving
b596ac6e6e add mpi serialization for std::set 2020-01-08 10:08:30 +01:00
Arne Morten Kvarving
725af1442e add mpi serialization for SummaryNode 2020-01-08 10:08:30 +01:00
Arne Morten Kvarving
68225309a1 add helper templates to pack/send and receive/unpack 2020-01-08 10:01:53 +01:00
Markus Blatt
7e700c11e0 Move PreconditionerFactory into namespace Opm.
This fixes name clashes with DUNE's own factory that is introduced
in DUNE 2.7. Hence it closes issue #2266.

BTW: Dune's factory has more template parameters than ours.
2020-01-07 17:59:23 +01:00
Joakim Hove
e8e084e10f
Merge pull request #2264 from GitPaean/debugging_omega
adapting to the interface change from OPM/opm-common#1386
2020-01-07 15:05:17 +01:00
Kai Bao
6be8d1b4bb adapting to the interface change from OPM/opm-common#1386 2020-01-07 11:40:06 +01:00
Bård Skaflestad
646e7d4eb1
Merge pull request #2265 from akva2/fix_serial_build
fix build without mpi
2020-01-06 17:02:08 +01:00
Arne Morten Kvarving
bd9ca91df2 fix build without mpi 2020-01-06 15:43:16 +01:00
Atgeirr Flø Rasmussen
83c9efea04
Merge pull request #2263 from bska/fix-oob-ssol-index
Restart: Don't Access Solvent Saturation Unless Active
2020-01-06 14:49:28 +01:00
Bård Skaflestad
dfb4946f13 Restart: Don't Access Solvent Saturation Unless Active
This commit ensures that the previous solvent restart fix (commit
afba6c8e8, PR #2023) does not attempt to index into the data member
solventSaturation_ unless solvent is activated.
2020-01-06 14:11:11 +01:00
Arne Morten Kvarving
a9a35a2f21
Merge pull request #2262 from akva2/noecl_flush_modules
Avoid global ecl state in setting up additional modules
2020-01-06 12:43:51 +01:00
Arne Morten Kvarving
e5c44ce1f2 avoid usage of deck on all processes setting up EclFoamModule 2020-01-06 11:20:46 +01:00
Arne Morten Kvarving
777d38e550 avoid usage of deck on all processes setting up EclPolymerModule 2020-01-06 11:20:02 +01:00
Arne Morten Kvarving
3b27df91b4 avoid usage of deck on all processes setting up EclSolventModule 2020-01-06 11:19:12 +01:00
Arne Morten Kvarving
5779fef8a9
Merge pull request #2261 from akva2/noecl_flush
More MPI serialization support
2020-01-06 08:45:34 +01:00
Arne Morten Kvarving
66949e0a59 add mpi serialization for Schedule 2020-01-03 10:55:45 +01:00
Arne Morten Kvarving
16ce8af5e9 add mpi serialization for Actions 2020-01-03 08:47:29 +01:00
Arne Morten Kvarving
9fb68ef289 add mpi serialization for Action::ActionX 2020-01-03 08:41:43 +01:00
Arne Morten Kvarving
92811754a8 add mpi serialization for Action::Condition 2020-01-03 08:39:16 +01:00
Arne Morten Kvarving
a0c2d5b0f6 add mpi serialization for Action::Quantity 2020-01-03 08:37:41 +01:00
Arne Morten Kvarving
2a16051d84 add mpi serialization for Action::AST 2020-01-03 08:36:09 +01:00
Arne Morten Kvarving
2d682a0838 add mpi serialization for ASTNode 2020-01-03 08:34:15 +01:00
Arne Morten Kvarving
5be1955e47 add mpi serialization for Tuning 2020-01-03 08:32:41 +01:00