Commit Graph

9984 Commits

Author SHA1 Message Date
Arne Morten Kvarving
033ea20396 update redhat packaging 2019-10-28 11:42:11 +01:00
Joakim Hove
958e0e6a62
Merge pull request #2109 from joakim-hove/Q
Add Q keywords as missing features
2019-10-24 18:42:07 +02:00
Joakim Hove
b58d14bfb0 Add Q keywords as missing features 2019-10-24 17:08:47 +02:00
Joakim Hove
7af936cdc4
Merge pull request #2103 from stefoss23/add_keywords_M1
Added more keywords beginning with M.
2019-10-24 16:53:56 +02:00
Atgeirr Flø Rasmussen
0e02c32929
Merge pull request #2098 from blattms/make-elementIndexScatterer-work-with-two-mappers
Allow different ElementMapper types in ElementIndexScatterHandle.
2019-10-24 15:16:08 +02:00
Steinar Foss
c285b93c2b added more keywords beginning with M. 2019-10-24 11:56:09 +02:00
Kai Bao
dd9a205afc
Merge pull request #2094 from GitPaean/dune-fem-version-needed
the version information of opm-fem is needed.
2019-10-22 21:19:09 +02:00
Markus Blatt
608b317ecc Allow different ElementMapper types in ElementIndexScatterHandle.
This is needed to support dune-fem where the local mapper might
be
`MultipleCodimMultipleGeomTypeMapper<GridView<GridPart2GridViewTraits<AdaptiveLeafGridPart<CpGrid, (PartitionIteratorType)4,
false> > >, Dune::Impl::MCMGFailLayout>`
as opposed to the global one being
`MultipleCodimMultipleGeomTypeMapper<GridView<DefaultLeafGridViewTraits<CpGrid>>, Dune::Impl::MCMGFailLayout>`.

Closes #2095.
2019-10-22 14:49:55 +02:00
Atgeirr Flø Rasmussen
5d1e125ab9
Merge pull request #2096 from totto82/avoid_nan_density
avoid nan in the density calculation
2019-10-22 14:27:45 +02:00
Kai Bao
d6181a4a06
Merge pull request #2092 from totto82/wellOp
Add well operability param
2019-10-22 13:43:35 +02:00
Tor Harald Sandve
775573e3b2 avoid nan in the density calculation 2019-10-22 13:04:29 +02:00
Kai Bao
0605b2fe6f the version information of opm-fem is needed. 2019-10-22 13:00:33 +02:00
Tor Harald Sandve
5c60a487f9 Add well operability param 2019-10-22 12:57:32 +02:00
Atgeirr Flø Rasmussen
5267f3cf17
Merge pull request #1965 from totto82/killDistr
Reimplementation of the well control code
2019-10-22 10:25:32 +02:00
Atgeirr Flø Rasmussen
f3d53e4750
Merge pull request #2089 from akva2/allow_parallel_norne_trigger
added: allow running the norne test in parallel
2019-10-22 09:54:43 +02:00
Arne Morten Kvarving
e6f324e98b added: allow running the norne test in parallel 2019-10-21 13:30:29 +02:00
Markus Blatt
9751984021
Merge pull request #2033 from blattms/avoid_equil_grid-rebased
Avoid using global grid (equilGrid) on non-IO processes.
2019-10-21 11:47:17 +02:00
Markus Blatt
c7d9cdef9a
Merge pull request #2061 from joakim-hove/is-iorank
stdout logging only for rank 0
2019-10-21 10:12:45 +02:00
Joakim Hove
481c09170a
Merge pull request #2068 from stefoss23/add_keywords_M
added keywords beginnign w/ M.
2019-10-20 12:22:24 +02:00
Joakim Hove
5524852a31
Merge pull request #2075 from joakim-hove/use-location
Use Location class for keyword location
2019-10-19 23:30:51 +02:00
Joakim Hove
7211cb4486 Use Location class for keyword location 2019-10-19 21:59:10 +02:00
Kai Bao
501122ca0d
Merge pull request #2076 from GitPaean/converting_aquifier_unix
converting the aquifer files to be unix format
2019-10-19 21:40:03 +02:00
Kai Bao
c4a9bd346c converting the aquifer files to be unix format
to avoid ^M in git diff and when editing.
2019-10-19 20:53:35 +02:00
Bård Skaflestad
a4eaf07243
Merge pull request #2071 from totto82/fix_restart
Always allocate buffers when restarting
2019-10-18 18:09:48 -05:00
Markus Blatt
3dad4f21e8 Fixed unused parameter warning wehn compiling without MPI. 2019-10-18 16:23:22 +02:00
Markus Blatt
42247105bf Addressed reviewer's comments. 2019-10-18 16:23:22 +02:00
Tor Harald Sandve
0b6899a135 Comment out failing tests
The tests fails due to fix in VFPHelpers.hpp that disallow extrapolation higher then 3.0.
2019-10-18 16:08:07 +02:00
Tor Harald Sandve
cd0bf8045d change control eq tol for standard wells 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
9bd44dc79a quell some more warnings 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
af2e150118 fixed: missing break 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
17a6861f09 quell unused parameter warning 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
33dee9f7f8 quell shadowing warnings 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
47dc94f21e the usual rebase fixup commit 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
5e1ec249cd don't count wells not under group controll when computing guiderates 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
614025b28b clean up the logging message 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
5dcfd1c8f1 check bhp and thp constrains first 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
4fea282934 fixup-rebase 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
32b31a2606 Address review comments. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
f618073492 Some small logic fixes.
- Make sure to reopen revived wells.
 - Do not use thp limit for potential calculations when well is bhp controlled.
 - Stopped wells do not check controls.
 - Set thp to control when appropriate in updateWellStateWithTarget().
2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
6b011c1bfb Use new method to determine operability under THP control. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
a536b90891 Improve stopped wells logic and log messages. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
2b9f5fb4fb Use robustSolveBhpAtThpLimitProd() for potentials and initialization. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
7581275b03 Add robustSolveBhpAtThpLimitProd() method. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
d5d890ff23 Make checkConstraints() stop after first broken constraint. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
e8daf663ab Solve the bhp = bhpfunc(thp, rate(bhp)) equation better. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
f55c9647b7 Allow up to factor 3 extrapolation in VFP. 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
c21428419a support REIN for solvent 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
0b96b31d8c add some safaguards for trivial guiderates 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
88d8e2a68e don't set the control from the schedule, unfix the restart issue 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
f71d6c8623 implement proper guiderate support
Tested on simple problems including GUIDERAT
2019-10-18 16:08:07 +02:00