Commit Graph
11787 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 52c695937b Implement extended network model. 2020-10-15 10:54:03 +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
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
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
Arne Morten Kvarving 3db98e3bef fix typo 2020-10-06 12:36:27 +02:00
Kai Bao 64746e21bf Merge pull request #2826 from akva2/janitoring
fixed: make some indices constexpr
2020-10-06 11:21:40 +02:00
Bård Skaflestad e39333895c Provide Simulator's Dynamic CTF in data::Connection
This is in preparation of implementing the WELPI feature.
2020-10-05 23:14:24 +02:00
Bård Skaflestad 14e34378b0 Merge pull request #2829 from GitPaean/wip_aquifer_keywords
aquifer summary keywords
2020-10-05 22:51:40 +02:00
Markus Blatt 5553d2d1f3 Renamed variables/functions for number of cells. 2020-10-05 20:02:13 +02:00
Markus Blatt f791884639 Used std::distance instead of manual for-loop. 2020-10-05 14:31:48 +02:00
Markus Blatt ca8de16285 Fixes parallel computation of average formation factors.
This was using the sum of the sum of all cells of the partitions.
Hence the shared cells were counted twice.
2020-10-05 14:08:59 +02:00
Atgeirr Flø Rasmussen 0aa3f51eb7 Merge pull request #2836 from akva2/avoid_macro
avoid usage of property system macro
2020-10-05 09:54:53 +02:00
Arne Morten Kvarving c888410a07 avoid usage of property system macros 2020-10-05 09:01:58 +02:00
Atgeirr Flø Rasmussen f6569b6a4f Merge pull request #2832 from alfbr/improve-output
Improve output
2020-10-05 08:49:09 +02:00
Atgeirr Flø Rasmussen aa5db0ddcf Merge pull request #2833 from hakonhagland/override
Fix inconsistent-missing-override warnings
2020-10-04 23:09:02 +02:00
Alf Birger Rustad 958f368ce7 indent 2020-10-03 12:25:47 +02:00
Alf Birger Rustad 207d2678fa Fix indent 2020-10-03 12:23:46 +02:00
Alf Birger Rustad 5a8f274c36 Typo and white space 2020-10-03 12:21:05 +02:00
Håkon Hægland c0b493c4ce Fix inconsistent-missing-override warnings 2020-10-03 10:43:09 +02:00
Alf Birger Rustad 3204b55a35 Forgot two 2020-10-02 15:20:23 +02:00
Alf Birger Rustad 885c182b7e Added one more decimal for hundreds of a second. 2020-10-02 15:13:41 +02:00
Tor Harald Sandve 165fa96250 Merge pull request #2824 from hakonhagland/gas_lift3
Implements support for gas lift optimization.
2020-10-02 14:48:27 +02:00
Alf Birger Rustad 3832be4f28 Typo 2020-10-02 14:27:51 +02:00
Alf Birger Rustad a25868dc52 Untabify and add three missing parantheses 2020-10-02 14:26:09 +02:00
Alf Birger Rustad 9e89883aec Allow more digits in simulation time 2020-10-02 14:18:06 +02:00
Alf Birger Rustad a081394f32 Fixed alignement 2020-10-02 14:06:25 +02:00
Kai Bao ed89f25d1b providing the aquifer data for summary output 2020-10-02 13:13:20 +02:00
Alf Birger Rustad 7cebf7fb5a Added space 2020-10-02 12:48:35 +02:00