Commit Graph
11982 Commits
Author SHA1 Message Date
Arne Morten Kvarving 939a132af7 test_ecl_output: change to boost::test 2020-10-27 12:59:58 +01:00
Arne Morten Kvarving cf15d07a94 changed: measure reltol as percentage in macro
this to make it similar to how BOOST_CHECK_CLOSE works.
2020-10-27 12:55:08 +01:00
Arne Morten Kvarving 3c1c3ba1f6 changed: measure relative error in a more standard way (knuth)
|(value-expected)/expected| < tol or |(value-expected)/value| < tol
instead of
|(value-expected)/(value+expected)|

this is how boost::test defines its check
2020-10-27 12:55:08 +01:00
Arne Morten Kvarving 1006991795 changed: measure reltol as percentage in macro
this to make it similar to how BOOST_CHECK_CLOSE works.
2020-10-27 12:09:44 +01:00
Arne Morten Kvarving 6d1f8c75d6 changed: measure relative error in a more standard way (knuth)
|(value-expected)/expected| < tol or |(value-expected)/value| < tol
instead of
|(value-expected)/(value+expected)|

this is how boost::test defines its check
2020-10-27 12:09:44 +01:00
Atgeirr Flø Rasmussen 778f486bcc Merge pull request #2871 from akva2/flow_object_libs
changed: compile each flow simulator as a object library
2020-10-27 11:54:13 +01:00
Joakim Hove f46e7d998f Add integration test for reporforated norne model 2020-10-27 11:53:52 +01:00
Joakim Hove ea43f8fb0a Merge pull request #2873 from joakim-hove/udq-test-M3
Udq test m3
2020-10-27 11:52:00 +01:00
Bård Skaflestad 5dd56b99cc Merge pull request #2862 from bska/fix-conn-rates
Extract Correct Connection-Level Rates
2020-10-26 14:38:06 +01:00
Joakim Hove ba25f35c57 Add regression testing for model UDQ_M3 2020-10-26 11:21:47 +01:00
Bård Skaflestad 3058047d3c Extract Correct Connection-Level Rates
The Polymer, Brine, and Solvent quantities would be extracted from
elements 0..#perf-1 of their pertinent container rather than from
the elements associated to the particular well.
2020-10-23 22:24:00 +02:00
Joakim Hove 887b13705d Merge pull request #2743 from joakim-hove/udq-test-M2
Add udq test UDQ_M2
2020-10-23 20:32:00 +02:00
Bård Skaflestad ad1406869d Merge pull request #2872 from akva2/janitoring
fix typo
2020-10-23 13:54:44 +02:00
Arne Morten Kvarving 246344fb8f fix typo 2020-10-23 12:34:20 +02:00
Arne Morten Kvarving 9cab259b38 changed: compile each flow simulator as a object library
increases parallelism
2020-10-23 11:53:50 +02:00
Joakim Hove 237db3be6d Add udq test UDQ_M2 2020-10-22 17:12:35 +02:00
Joakim Hove d69d0e95e7 Merge pull request #2869 from joakim-hove/update-referencedata
Use cmake testname in dictionary of tests in update_reference_data.sh
2020-10-22 17:11:31 +02:00
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 1dc586272b Use cmake testname in dictionary of tests in update_reference_data.sh 2020-10-22 11:43:17 +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
tqiu 0cdac39732 Removed deleted ILUReorder.cpp, added headers to CMake 2020-10-19 11:36:25 +02:00
tqiu d25405d39a Renamed parameter to OpenclIluReorder and moved error checking to BdaBridge constructor. 2020-10-19 11:36:25 +02:00
tqiu a372a1e4bd Added cmdline parameter --ilu-reorder-strategy 2020-10-19 11:33:32 +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