OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,007 Commits 31 Branches 117 Tags
24fd019037f8a76ce35921f554f5a1067369f047
Commit Graph
10007 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove 24fd019037 Merge pull request #2128 from joakim-hove/P 
Add missing keywords on P
 2019-11-01 17:36:42 +01:00
Kai Bao f95718a3c5 Merge pull request #2131 from blattms/fix-wellmodel-numcomponents 
Fix BlackoilWellModel::numComponents for parallel runs.
 2019-11-01 16:28:48 +01:00
Markus Blatt a5506956fb renamed numWells to numLocalWells in BlackoilWellmodel 
as this better reflects that it is not the number of wells in
the whole domain but just the one in the part of the domain
stored in the local process.
 2019-11-01 15:11:21 +01:00
Markus Blatt 905403e2ed Fix BlackoilWellModel::numComponents for parallel runs. 
In the case with active solvent (BlackoilWellModel::has_solvent_ is
true, e.g. case 2D_OILWATER_POLYMER.DATA) and one process have no
wells while another has some this lead to numComponents returning
different values. Later this lead to truncated message in MPI_Allgather.

The underlying problem was the usage of numWells() which returns just
the number of local wells. We resort to using wellsActive which
returns whether there any well active regardless which process knows it.
 2019-11-01 15:07:00 +01:00
Joakim Hove 7c471688f1 Add missing keywords on P 2019-11-01 14:39:38 +01:00
Markus Blatt c676b73822 Merge pull request #2120 from blattms/filter-connections-on-all-procs 
Filter connections on non-IO ranks and remove parallel deadlock
 2019-11-01 13:07:09 +01:00
Joakim Hove 29a514754a Merge pull request #2121 from stefoss23/add_keywords_NOP 
added keywords beginning w/ N, O and P.
 2019-10-31 16:50:08 +01:00
Alf Birger Rustad 8922113869 Merge pull request #2100 from totto82/fixMSW 
BUGFIX. Scale MSW injector
 2019-10-31 15:39:49 +01:00
Steinar Foss 7d84a244d9 added even more keywords beginning w/ P. 2019-10-31 13:16:54 +01:00
Markus Blatt 671ab68709 Merge pull request #2117 from blattms/changelog-2019.10 
Added entries to changelog concerning 2019.10 release
 2019-10-30 21:50:11 +01:00
Steinar Foss aff6ce6f77 added keywords beginning w/ N, O and P. 2019-10-30 16:00:16 +01:00
Markus Blatt a597539342 Filter connections on non-IO ranks, too. 
This removes a deadlock experienced for some models
where we have specified connections to non-active cells.

On non-IO ranks we are using the local grid since in the
future there will be no global grid available. Wells connecting
cells not on these processors are neglected anyway.

Closes #2101
 2019-10-30 13:46:43 +01:00
Arne Morten Kvarving dd2a360e10 Merge pull request #2118 from blattms/fix-one-phase-namespace 
Move BlackOilOnePhaseIndices to Opm namespace
 2019-10-30 09:29:01 +01:00
Markus Blatt e44f0445c4 Fixed indentation of a2db252 2019-10-30 08:55:05 +01:00
Joakim Hove 0eee2c37e6 Merge pull request #2112 from joakim-hove/alternative-parsecontext-init 
Pass ParseContext settings in constructor
 2019-10-30 07:39:56 +01:00
Joakim Hove a06d6d971c Merge pull request #2113 from stefoss23/add_keywords_N 
added keywords beg with N.
 2019-10-30 07:39:19 +01:00
Markus Blatt a2db252271 Move BlackOilOnePhaseIndices to Opm namespace 
to make it consistent with the rest. OPM/opm-models#530 development
must have been started before the renaming in OPM/opm-models#532
and somehow the old namespace survived.

downstream PR of OPM/opm-models#577
 2019-10-29 17:04:37 +01:00
Markus Blatt c7aebc66a8 Added entries to changelog concerning 2019.10 release 2019-10-29 13:27:07 +01:00
Markus Blatt b3141133e3 Merge pull request #2114 from akva2/update_rh_packaging 
update redhat packaging
 2019-10-28 11:59:53 +01:00
Arne Morten Kvarving 033ea20396 update redhat packaging 2019-10-28 11:42:11 +01:00
Steinar Foss 01b57da9e1 added keywords beg with N. 2019-10-26 12:54:59 +02:00
Joakim Hove 252829850e Pass ParseContext settings in constructor 2019-10-25 14:30:13 +02: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
Tor Harald Sandve 9a3ce14885 scale the gas equation, not the control 2019-10-24 10:54:50 +02:00
Tor Harald Sandve e1f09d89cd Scale MSW injector 2019-10-24 10:18:16 +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