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
11,811 Commits 31 Branches 117 Tags
5d489239949993649b88245ac90ddd5ee495bc88
Commit Graph
11811 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 5d48923994 Merge pull request #2856 from plgbrts/temp 
fix temperature reporting for injectors
 2020-10-22 14:25:35 +02:00
Tor Harald Sandve 990ce70287 Merge pull request #2849 from goncalvesmachadoc/aquifer 
Prepare Well Implemantion For Water and Water-Gas System
 2020-10-22 14:08:12 +02:00
Joakim Hove 15be2f32d4 Merge pull request #2742 from joakim-hove/udq-test-M1 
Add regression test udq_actionx/UDQ_M1
 2020-10-22 11:24:24 +02:00
Joakim Hove de5eaa8227 Add regression test udq_actionx/UDQ_M1 2020-10-22 09:03:29 +02:00
Arne Morten Kvarving eb1bd7932f Merge pull request #2868 from akva2/janitoring 
changed: remove unused parameters
 2020-10-21 14:15:02 +02:00
Arne Morten Kvarving 7d13d347db changed: remove unused parameters 2020-10-21 13:32:12 +02:00
Tor Harald Sandve 41f40e5002 Merge pull request #2626 from atgeirr/network-thp 
Network-controlled THP limit
 2020-10-21 12:33:42 +02:00
Atgeirr Flø Rasmussen 7e737b143d Address review comments. 2020-10-21 09:50:31 +02:00
Bård Skaflestad 29a4ff6ae0 Merge pull request #2865 from akva2/change_mpi_procs 
changed: run tests on 4 processors
 2020-10-21 09:35:16 +02:00
Arne Morten Kvarving 10b2e540fb changed: run tests on 4 processors 
more than 4 is problematic on some build machines
 2020-10-20 08:13:31 +02:00
Arne Morten Kvarving 1351dc69bc Merge pull request #2864 from atgeirr/silence-warning 
Silence unused argument warning.
 2020-10-19 11:18:25 +02:00
Atgeirr Flø Rasmussen e7d1d6603a Silence unused argument warning. 2020-10-19 09:13:37 +02:00
Atgeirr Flø Rasmussen 77099d1b65 Merge pull request #2863 from bska/fix-unused-gridforconn 
Move 'gridForConn' Into Cuda/OpenCL Block
 2020-10-19 07:48:47 +02:00
Bård Skaflestad 9a71bbe4b0 Move 'gridForConn' Into Cuda/OpenCL Block 
It is only used within this context and produces a warning of the
form

  ISTLSolverEbos.hpp:128:25: warning: unused variable ‘gridForConn’

unless the build configures accelerator support.
 2020-10-19 02:28:05 +02:00
Atgeirr Flø Rasmussen 24b2393334 Add parameter --alternative-well-rate-init. 
With this, a slightly more sophisticated procedure is used for well rate intialization.
Since it changes existing results, it defaults to false, giving the existing behaviour.
 2020-10-15 17:56:11 +02:00
Atgeirr Flø Rasmussen 6155188a70 Remove unused file SimFIBODetails.hpp. 2020-10-15 16:35:35 +02:00
Atgeirr Flø Rasmussen 8eb4d1dc70 Implemented computeCurrentWellRates() for multisegment wells. 
Also add effect of rock compressibility on well connection transmissibility factors,
which was added to StandardWell earlier but not MultisegmentWell.
 2020-10-15 16:24:55 +02:00
Atgeirr Flø Rasmussen 7e87ea3200 Refactor to put updateWellStateRates() in base class. 2020-10-15 14:15:05 +02:00
Markus Blatt 320cf46a5f Merge pull request #2857 from blattms/fix-nvcc-umfpack-compilation 
Fixes compilation of CUDA.
release/2020.10/branch-point 		2020-10-15 11:50:28 +02:00
Atgeirr Flø Rasmussen 52c695937b Implement extended network model. 2020-10-15 10:54:03 +02:00
Markus Blatt 44fadfb88a Fixes compilation of CUDA. 
nvcc exits compilation if the header dune/istl/basearray.hh (form DUNE
2.6) is included as it does not seem to understand the friend declaration
there (friend class for a struct).

```
/usr/include/dune/istl/basearray.hh:101:49: error: ‘typename Dune::Imp::base_array_unmanaged<B, A>::RealIterator’ names ‘template<class B, class A> template<class T> struct Dune::Imp::base_array_unmanaged<B, A>::RealIterator’, which is not a type
       friend class RealIterator<const ValueType>;
                                                 ^
```
 2020-10-14 19:23:57 +02:00
Paul Egberts 9ecd153099 fix temperature reporting for injectors 2020-10-14 17:52:04 +02:00
Cintia Goncalves Machado a697e7faf6 fix return position 2020-10-14 14:55:38 +02:00
Bård Skaflestad f8c276d023 Merge pull request #2845 from bska/welpi 
Add Calculator for Connection/Well Productivity Index
 2020-10-13 16:58:36 +02:00
Bård Skaflestad 7bf4b76dac Add Doxygen Documentation to Well PI Calculator 
Suggested by [at]atgeirr.
 2020-10-13 15:42:35 +02:00
Bård Skaflestad b6e0bd1b7b Add Calculator for Connection/Well Productivity Index 
Switches between using the logarithmic and unit scaling factor based
on whether or not the well has an explicit, positive drainage radius
(WELSPECS item 7).  Does presently not include the D factor.

Add a set of unit tests to exercise the facility.
 2020-10-13 15:42:35 +02:00
Atgeirr Flø Rasmussen 2aeefc71c1 Merge pull request #2827 from totto82/timestepping 
add options for timestepping
 2020-10-13 14:25:26 +02:00
Atgeirr Flø Rasmussen 43d5d2c532 Merge pull request #2850 from atgeirr/silence-warnings 
Silence warnings from range-for.
 2020-10-13 08:19:48 +02:00
Markus Blatt 884e02c0e2 Merge pull request #2848 from atgeirr/unify-linsolve-only 
Unify linear solvers
 2020-10-13 08:09:27 +02:00
Atgeirr Flø Rasmussen ea0abd1331 Bugfix: do not substr() on too small strings. 2020-10-12 21:58:58 +02:00
Atgeirr Flø Rasmussen dedbe78cee Copyright additions. 2020-10-12 17:06:11 +02:00
Atgeirr Flø Rasmussen 316b28923d Rename parameter --linear-solver-configuration to --linsolver. 2020-10-12 17:03:00 +02:00
Cintia Goncalves Machado 920f071f5f fix fractions 2020-10-12 16:46:39 +02:00
Atgeirr Flø Rasmussen f169cf90d8 Remove --linear-solver-configuration-file parameter. 
This is now handled by passing a string to --linear-solver-configuration that
ends with ".json".
 2020-10-12 16:41:09 +02:00
Arne Morten Kvarving d3f77869b5 Merge pull request #2853 from akva2/package_python 
add python package to debian packaging
 2020-10-12 14:15:02 +02:00
Arne Morten Kvarving f3182140a6 add python package to debian packaging 2020-10-12 11:24:04 +02:00
Atgeirr Flø Rasmussen f262eec9bf Silence warnings from range-for. 2020-10-12 09:39:37 +02:00
Atgeirr Flø Rasmussen 385880485a Fix logic of shouldCreateSolver(). 2020-10-11 22:46:02 +02:00
Atgeirr Flø Rasmussen 30a4fe55b0 Add "amg" option to --linear-solver-configuration. 2020-10-11 09:31:48 +02:00
Atgeirr Flø Rasmussen 842afd312e Refactor setupPropertyTree(). 2020-10-11 09:24:05 +02:00
Atgeirr Flø Rasmussen 00438c4860 Remove unused parts (not just comment out). 2020-10-11 08:44:21 +02:00
Atgeirr Flø Rasmussen 0a70d95bee Refactor shouldCreateSolver(). 2020-10-11 08:20:19 +02:00
Cintia Goncalves Machado 23e7886297 prepareWellImplForLackOfOil 2020-10-10 16:05:12 +02:00
Atgeirr Flø Rasmussen 1c208e9a92 Avoid unnecessary extra matrix manipulation. 
When using the ParallelOverlappingILU0 it is not necessary to fix the overlap rows.
 2020-10-10 10:09:23 +02:00
Atgeirr Flø Rasmussen ac3004da9d Merge pull request #2847 from blattms/blackoilmodel-getLocalNonshutWells 
Added BlackoilWellModel::getLocalNonshutWells to reduce code duplicat…
 2020-10-09 16:35:50 +02:00
Markus Blatt ba1bc7c23c Added BlackoilWellModel::getLocalNonshutWells to reduce code duplication. 2020-10-09 15:27:09 +02:00
Atgeirr Flø Rasmussen 65817c9068 Removed old amg/cpr code that can be replaced. 
The replacement consists of using the FlexibleSolver code.
 2020-10-08 15:12:41 +02:00
Atgeirr Flø Rasmussen f528adb604 Merge pull request #2837 from blattms/fix-parallel-average-formation-factors 
Fixes parallel computation of average formation factors.
 2020-10-06 19:37:12 +02:00
Bård Skaflestad 406feea8e7 Merge pull request #2835 from bska/chase-ctfac-api-update 
Provide Simulator's Dynamic CTF in data::Connection
 2020-10-06 14:33:12 +02:00
Alf Birger Rustad 2949c54957 Merge pull request #2838 from akva2/janitoring 
fix typo
 2020-10-06 14:10:23 +02:00