OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-26 17:20:59 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,910 Commits 24 Branches 102 Tags 84 MiB
698b748270
Commit Graph

9361 Commits

Author SHA1 Message Date
Kai Bao
fc259fdb91
Merge pull request #4086 from GitPaean/better_naming_max_strict_iter 
changing max_strict_iter_ to min_strict_cnv_iter_
 2022-09-08 10:01:59 +02:00
Kai Bao
087eb56a64 changing max_strict_iter_ to min_strict_cnv_iter_ 
to make the naming reflect the actual usage more clearly.
 2022-09-07 14:28:41 +02:00
Arne Morten Kvarving
bb0701ed01 remove unused serialization code 2022-09-07 10:10:16 +02:00
Markus Blatt
15ca494164
Merge pull request #4084 from akva2/tran_distribute_eclmpiserializer 
changed: use EclMpiSerializer to distribute transmissibilities
 2022-09-07 10:05:05 +02:00
Arne Morten Kvarving
e93e18a55d changed: use EclMpiSerializer to distribute transmissibilities 2022-09-07 09:39:15 +02:00
Arne Morten Kvarving
b53ab951d0 drop primitive serializer support for data:: types 2022-09-06 16:04:02 +02:00
Arne Morten Kvarving
5b81e9eaee fixed: do not include EclMpiSerializer without mpi 2022-09-06 14:03:32 +02:00
Arne Morten Kvarving
1d00ed47ba changed: use EclMpiSerializer in loadParallelRestart 2022-09-06 12:02:07 +02:00
Bård Skaflestad
459b116128
Merge pull request #4068 from akva2/segmentpressures_test 
added: data::SegmentPressures mpiserializer test
 2022-09-05 14:23:49 +02:00
Bård Skaflestad
674ce11265
Merge pull request #4071 from atgeirr/fix-cartmapping-wellcontrib 
Use compressedIndexForInterior() for mapping cartesian indices.
 2022-09-05 13:25:01 +02:00
Arne Morten Kvarving
a5c8ed50d5 added: data::SegmentPressures mpiserializer test 2022-09-05 13:05:46 +02:00
Atgeirr Flø Rasmussen
e9cba9e0c1 Use compressedIndexForInterior() for mapping cartesian indices. 2022-09-05 12:42:54 +02:00
Arne Morten Kvarving
6ff0d0cdc4 added: data::GuideRateValue mpiserializer test 2022-09-05 11:17:44 +02:00
Arne Morten Kvarving
237832b86d added: primitive serializer support for std::bitset 2022-09-05 11:17:27 +02:00
Tor Harald Sandve
8075c1218b
Merge pull request #4029 from totto82/fix_group_multilevel 
Simplify and fix check for violation of GRUP for multiple level of guiderates
 2022-09-02 12:59:34 +02:00
Tor Harald Sandve
3ad04d8326 fix analytical aquifers + energy 2022-09-02 08:57:55 +02:00
Bård Skaflestad
d5401eeb43
Merge pull request #4044 from atgeirr/fix-restart-initialization 
Ensure intensive quantities are calculated at start of simulation.
 2022-09-01 17:10:32 +02:00
Bård Skaflestad
93b059eca1
Merge pull request #4046 from akva2/mswellhelper_priv 
make MSWellHelpers templates private
 2022-09-01 16:44:15 +02:00
Bård Skaflestad
d1ba2ce5bc
Merge pull request #4045 from akva2/wellgrouphelper_priv 
Make one more template private in WellGroupHelper
 2022-09-01 16:33:43 +02:00
Arne Morten Kvarving
5052a09d6e make MSWellHelpers templates private 2022-09-01 15:17:04 +02:00
Arne Morten Kvarving
5d9ee32853 WellGroupHelpers: simply template instantation 
use types for ParallelCommunication.hpp
 2022-09-01 14:55:19 +02:00
Arne Morten Kvarving
2135a4268d WellGroupHelpers: make template private 2022-09-01 14:55:19 +02:00
Atgeirr Flø Rasmussen
92538b0612 Ensure intensive quantities are calculated at start of simulation. 
Moving it ensures it is also done for restart simulation runs. Without
this, the well model will actually initialize the IQs, but only for
owned cells, not overlap/ghost cells, which caused parallel failure.
 2022-09-01 14:00:42 +02:00
Arne Morten Kvarving
5824af3f1b use libfmt 
also change from debug to error
 2022-09-01 13:54:40 +02:00
Arne Morten Kvarving
6bd790fd16 avoid pointer semantics 2022-09-01 13:48:01 +02:00
Arne Morten Kvarving
a6517d6111 remove unused template 2022-09-01 13:37:54 +02:00
Arne Morten Kvarving
18d8914ef1 wellhelpers: remove indentation for namespaces 2022-09-01 13:37:11 +02:00
Arne Morten Kvarving
69db0dd175 wellhelpers: make templates private 
to increase header encapsulation
 2022-09-01 13:37:11 +02:00
Arne Morten Kvarving
2c0ff6f81e consistently use ParallelCommunication.hpp for communication definition 2022-09-01 12:26:11 +02:00
Arne Morten Kvarving
004e7e55fb avoid two communication calls 
one less network latency cost
 2022-08-31 12:54:47 +02:00
Tor Harald Sandve
3e27c23222 scale energy residual to have the same relative order as the mass balance residuals 2022-08-29 15:05:01 +02:00
Markus Blatt
c58a30068e
Merge pull request #4027 from aritorto/lambda 
Code modernization
 2022-08-26 12:19:47 +02:00
Bård Skaflestad
949bb6ecb5
Merge pull request #4031 from akva2/use_std_array 
changed: consistently use std::array
 2022-08-26 10:14:17 +02:00
Bård Skaflestad
17ef437993
Merge pull request #4032 from akva2/remove_param_group 
changed: remove unneeded includes for ParameterGroup
 2022-08-26 09:55:55 +02:00
Arne Morten Kvarving
3b0b5b4708 changed: remove unneeded includes for ParameterGroup 2022-08-26 09:21:46 +02:00
Antonella Ritorto
57183081c8 Code modernization 
Change from Functor class to functions.
 2022-08-26 08:54:48 +02:00
Arne Morten Kvarving
a9590215dc changed: consistently use std::array 2022-08-26 08:28:46 +02:00
Arne Morten Kvarving
71ca7a0c40 changed: no need to pull in polyhedralgrid if it is not used 2022-08-26 08:25:05 +02:00
Tor Harald Sandve
9b7ba49495 Simplify and fix check for violation of GRUP for multiple level of guiderates 2022-08-25 16:09:53 +02:00
Arne Morten Kvarving
1a348c0d29 changed: get rid of duplicate MatrixBlock headers/classes 
this has already led to some confusion. move some of the code
upstream to opm-models and remove the rest of the duplicated code.

the remainder of MatrixBlock.hpp is renamed to SmallDenseMatrixUtils.hpp
 2022-08-25 12:48:53 +02:00
Atgeirr Flø Rasmussen
432df26ecc
Merge pull request #4025 from bska/remove-dune-unused 
Prefer Attributes to Macros
 2022-08-25 08:29:33 +02:00
Bård Skaflestad
a56cd6752c
Revert "changed: reduce some code duplication" 2022-08-24 20:34:52 +02:00
Bård Skaflestad
f3fc5331f0 Prefer Attributes to Macros 2022-08-24 17:05:55 +02:00
Bård Skaflestad
e66c7f6444
Merge pull request #4022 from akva2/reduce_dup 
changed: reduce some code duplication
 2022-08-24 16:53:16 +02:00
Bård Skaflestad
fe04df94e6
Merge pull request #4023 from atgeirr/fix-packing 
Add packing support for classes needing it.
 2022-08-24 16:44:06 +02:00
Atgeirr Flø Rasmussen
c0e5996b70
Merge pull request #4024 from atgeirr/silence-override-warning 
Add override qualifier to silence warning.
 2022-08-24 16:07:04 +02:00
Arne Morten Kvarving
447d77b579 changed: get rid of duplicate MatrixBlock headers/classes 
this has already led to some confusion. move some of the code
upstream to opm-models and remove the rest of the duplicated code.

the remainder of MatrixBlock.hpp is renamed to SmallDenseMatrixUtils.hpp
 2022-08-24 15:54:01 +02:00
Atgeirr Flø Rasmussen
6cf02813e5 Add override qualifier to silence warning. 2022-08-24 15:36:56 +02:00
Atgeirr Flø Rasmussen
51e5459be5 Add packing support for classes needing it. 
Since Rates is not longer a POD, it needs explicit
packSize()/pack()/unpack() support. This also applies
to classes containing Rates, namely Connection and Segment.
Similarly, SegmentPressures is not a POD.
 2022-08-24 15:11:27 +02:00
Bård Skaflestad
6d3d64a843
Merge pull request #4015 from GitPaean/handling_numerical_aquifer_no_connection 
ignoring analytical aquifers without valid connections
 2022-08-24 09:59:26 +02:00
Kai Bao
c25e1392ba ignoring analytical aquifers without valid connections 2022-08-23 15:50:50 +02:00
Arne Morten Kvarving
3faccb4a17 changed: reduce some code duplication 2022-08-23 09:31:27 +02:00
Arne Morten Kvarving
3ef07d7f62 changed: put ParallelOverlappingILU0 in separate compile unit 
i chose to split in a separate _impl file because this code is so
generic that there may be downstream users who want to use on other
matrix types than what we use in opm-simulators.
 2022-08-22 11:21:31 +02:00
Markus Blatt
c631a4ee63
Merge pull request #4018 from akva2/preconditionerfactory_separate 
changed: split PreconditionerFactory in _impl file
 2022-08-22 10:16:45 +02:00
Arne Morten Kvarving
ec089af048 changed: split PreconditionerFactory in _impl file 
and put instances in separate cpp files.
 2022-08-22 09:33:15 +02:00
Atgeirr Flø Rasmussen
04fe35a82e
Merge pull request #4013 from GitPaean/num_aquifer_construct_simpli 
simplifying the constructor for AquiferNumerical
 2022-08-22 08:20:34 +02:00
Markus Blatt
e7cc14de4c Revert: Split PreconditionerFactory in _impl file 
This reverts commit 7f8c88769e.
Apparently the macros unconditionally use Classes that are only
there for parallel builds.
 2022-08-19 14:42:55 +02:00
Arne Morten Kvarving
7f8c88769e changed: split PreconditionerFactory in _impl file 
and put instances in separate cpp files.
 2022-08-19 12:43:28 +02:00
Tor Harald Sandve
0f969dd7a5 check ipr for wells prevented to change to thp 2022-08-19 10:48:56 +02:00
Tor Harald Sandve
7a8eed6a6c adapt to renaming in opm-common 2022-08-19 10:33:19 +02:00
Tor Harald Sandve
96222f8afb dont use explicit vfp lookup for newly opened wells 2022-08-19 10:33:19 +02:00
Tor Harald Sandve
9364d4c54b Add option for wvfpexp item 2 plus minor fixes 2022-08-19 10:33:19 +02:00
Tor Harald Sandve
e875849497 Adapt test cases and vfpprint 2022-08-19 10:33:19 +02:00
Tor Harald Sandve
b1b23a57de Add option for explicit vfp lookup for problmatic wells 2022-08-19 10:33:19 +02:00
Bård Skaflestad
b87154223b Restore Non-MPI Builds 
Commit 371b2592f misordered the closing brace of a namespace and
the conditional declarations dependent upon MPI availability.  This
commit restores the expected order and fixes non-MPI builds.
 2022-08-18 16:08:41 +02:00
Kai Bao
d69c80b84a simplifying the constructor for AquiferNumerical 
removing the unused global_cell and avoid the unnecessary construction of cartesianToCompressed
 2022-08-18 15:55:04 +02:00
Arne Morten Kvarving
371b2592f5 changed: put ParallelIstlInformation in separate compile unit 2022-08-18 09:15:28 +02:00
Atgeirr Flø Rasmussen
c94ff12e4c Bugfix and simplification of cartesian mapping. 
We already have the mapping available, and using the equilGrid() is only valid
on rank 0.
 2022-08-17 14:13:13 +02:00
Bård Skaflestad
1ca731a388
Merge pull request #4007 from atgeirr/limit-terminal-warnings-during-deck-input 
Limit warnings to terminal during deck input.
 2022-08-16 18:20:05 +02:00
Atgeirr Flø Rasmussen
04180031e1 Limit warnings to terminal during deck input. 
With this, the tag limit of 10 is used from the very start of the run,
and not only after the deck has been read.
 2022-08-16 14:43:07 +02:00
Arne Morten Kvarving
a32a32649d changed: put MILU in separate compile unit 2022-08-16 10:46:20 +02:00
Arne Morten Kvarving
d2ba2e75e8 remove include of Well header 2022-08-11 11:49:42 +02:00
Arne Morten Kvarving
4917c860fe BlackOilAquiferModel: use aquifers through base interface 2022-08-11 10:04:49 +02:00
Arne Morten Kvarving
271d5bee3a added: (re)introduce AquiferInterface 
now a base class for both analytical and numerical aquifers
 2022-08-11 09:59:49 +02:00
Arne Morten Kvarving
f166920e75 changed: rename AquiferInterface to AquiferAnalytical 2022-08-11 09:59:49 +02:00
Arne Morten Kvarving
66b4f1edb7 Aquiferxxx: some modernization 
- typedef -> using
- use constexpr
 2022-08-11 09:59:46 +02:00
Bård Skaflestad
e73d3368e0
Merge pull request #3989 from Tongdongq/tweak-opencl-launch-params 
Tweak opencl launch params v2
 2022-08-10 14:22:52 +02:00
Tong Dong Qiu
18d9f8cca7 Include missing header 2022-08-10 14:03:32 +02:00
Atgeirr Flø Rasmussen
a5c8d40cfa Remove unneeded timeIdx arguments, also silence other warnings. 2022-08-10 10:01:54 +02:00
Tong Dong Qiu
58b20fe2fb Tweak ILU opencl kernel launch params 2022-08-09 13:39:35 +02:00
Tong Dong Qiu
d0aa42e9e3 Reduce source code line lengths 2022-08-09 13:38:57 +02:00
Tong Dong Qiu
5607329b05 Backport to fix ChowPatelIlu 2022-08-09 11:49:47 +02:00
Atgeirr Flø Rasmussen
90e8a9af69 Do not change true impes weights. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
322dcbfb36 Make getWaterFlux() take const ref argument. Minor formatting cleanups. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
cabe64cc58 Further reduction of modifications. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
5fba14373b Modification to reduce PR to minimal changes. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
5042b02138 Rename method and move to impl file. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
0da2b68e0b Adapt to changed interface. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
b1bcab31b9 Refactor addToSource to add interface not using element context. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen
66a1c46413 Remove unused code branch. 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen
5d0ae333f4 Fix: add template argument. 2022-08-09 11:09:48 +02:00
hnil
f751279841 fixed true impes for new code 2022-08-09 11:09:48 +02:00
hnil
4f6755025c -prototype on trueimpes in new system 
-probably better threading
 2022-08-09 11:09:48 +02:00
hnil
6d3b0a7c1f tried to make openmp work 2022-08-09 11:09:48 +02:00
hnil
5a39724606 added functions for direct setting of well rates contribution to reservoir 2022-08-09 11:09:48 +02:00
hnil
8f5e0940fe restructuring to be able to call without local indices 2022-08-09 11:09:48 +02:00
hnil
d53b6ad9fa added spesialisation for using simple property updating 2022-08-09 11:09:48 +02:00
hnil
060877a08b runs first steps of norne 2022-08-09 11:09:48 +02:00
hnil
95308d7d02 ensure intensive quantities is updated 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen
93ce28e9a2
Merge pull request #3972 from ElyesAhmed/alugrid2 
Alugrid2
 2022-08-04 15:43:24 +02:00
Arne Morten Kvarving
36b167b451 remove use of Unused.hpp 2022-08-02 11:53:54 +02:00
Markus Blatt
af28030123
Merge pull request #3983 from blattms/fix-perf-all-zero 
[bugfix] Fixes deadlocks with agressively distributed wells
 2022-07-29 09:37:10 +02:00
Elyes Ahmed
5c2b60bcd0 rebasing 2022-07-28 20:40:34 +02:00
Markus Blatt
941957c13e Fix shadowed variable warning. 2022-07-28 19:50:24 +02:00
Markus Blatt
c22114af41 Handle injection/producer targets correctly for distributed wells. 
We should never return in a function if there are no local
perforations for a distributed well, but that is what we did before
this fix.
 2022-07-28 17:52:26 +02:00
Arne Morten Kvarving
eeeeb283c5 remove unnecessary includes 2022-07-26 19:03:39 +02:00
Markus Blatt
f7dec58ee2 Fix deadlock for distributed wells when calculating densities/pressures 
There was a check that is supposed that all rates are zero but for
distributed wells it only checked local perforations. Of course that
can lead to different outcome on processes for distributed wells.
 2022-07-15 17:58:04 +02:00
Markus Blatt
412cf1d6cd
Merge pull request #3976 from blattms/well-fix-distributed-tw 
[bugfix] Fix well transmissibility weights for distributed wells.
 2022-07-15 10:39:48 +02:00
Markus Blatt
bfd1d3187a [bugfix] Fix well transmissibility weights for distributed wells. 
If we compute a sum over all perforations than we need to cater for the
case of distributed wells. That is we need to also sum up over all processes
involved after performing the local sum.

One of these global sums was missing in computeWellConnectionDensitesPressures
for producers when we compute the weights based on well transmissibilities.
 2022-07-13 13:40:16 +02:00
Bård Skaflestad
bdfe58f500
Merge pull request #3975 from OPMUSER/Unsupported-Keywords 
Unsupported keywords
 2022-07-12 13:00:50 +02:00
OPMUSER
f9ba52e91b Update UnsupportedFlowKeywords.cpp 
Remove MINPORV from unsupported keyword list
 2022-07-09 20:13:30 +08:00
Elyes Ahmed
cd169660e8 rewriting MaxWellConnections 2022-07-08 13:44:38 +02:00
OPMUSER
65addddb06 Update UnsupportedFlowKeywords.cpp 
Remove TEMPVD from the unsupported key list, as tested as working.
 2022-07-08 18:20:18 +08:00
OPMUSER
b784a6d78b Update UnsupportedFlowKeywords.cpp 
Remove RTEMPA from the unsupported keywords list as testing shows it is supported.
 2022-07-08 17:36:12 +08:00
Bård Skaflestad
9d9ec6c522
Revert "Tweak opencl launch params" 2022-07-07 15:21:53 +02:00
Markus Blatt
f22d58a1d0
Merge pull request #3953 from Tongdongq/tweak-opencl-launch-params 
Tweak opencl launch params
 2022-07-07 10:43:15 +02:00
Tor Harald Sandve
04b0c3515d
Merge pull request #3957 from totto82/regStw 
regularize equation for problematic std wells
 2022-06-30 11:24:20 +02:00
Tor Harald Sandve
cf1abb086f remove msw(ms) from regulariztion parameter 2022-06-29 15:39:51 +02:00
Kai Bao
1b3cee8088 using C++17 style for to reduce nesting level of for loop 2022-06-29 14:20:35 +02:00
Tor Harald Sandve
eef455106d regularize equation for std wells 2022-06-29 12:47:44 +02:00
Kai Bao
64143cd417 when a valve is shut, the rate and pressure drop will be zero 2022-06-29 11:54:36 +02:00
Tong Dong Qiu
85776f528a Tweak ILU opencl kernel launch params 2022-06-28 12:42:52 +02:00
Bård Skaflestad
5b2d1ca5ec
Merge pull request #3959 from blattms/warn-long-fault 
Warn about fault names with more than 8 characters
 2022-06-28 10:29:36 +02:00
Arne Morten Kvarving
133856b943 changed: avoid lambda capture 
clang warns it's not necessary to use a capture for this.
i opted to make it constexpr and avoid the capture with gcc as well.
 2022-06-27 14:47:56 +02:00
Arne Morten Kvarving
9751b78992 fixed: add virtual dtor to class with virtual members 2022-06-27 14:47:44 +02:00
Arne Morten Kvarving
1794934f0d anonymize unused parameters 2022-06-27 14:47:44 +02:00
Markus Blatt
6aea0fab37 Added instantiations of OrderedMap with truncated keys for parallel. 2022-06-27 13:09:09 +02:00
Markus Blatt
ebb8fc7aae Warn about about long fault -name 2022-06-27 13:09:08 +02:00
Markus Blatt
e14823c6d8
Merge pull request #3941 from akva2/remove_int_sim_config 
Remove support for internal simulator configuration
 2022-06-27 11:05:18 +02:00
Markus Blatt
25a92c2c2c
Merge pull request #3958 from Tongdongq/fix-gpu-well-apply 
Fix stdwell apply on GPU
 2022-06-24 16:02:34 +02:00
Arne Morten Kvarving
a4d254b749 changed: introduce EclGenericVanguard::setParams 
this is used transferring ownership of setup structures to the
simulator. drop all the flowEbosXXX set deck methods and use the
generic vanguard. also means various structs that were only passed
in the blackoil simulator are now passed in all simulators.
 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
00c374be5c changed: remove support for internal summaryconfig handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
4510f40b6d changed: remove support for internal schedule handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
1a35c5ac47 changed: remove support for internal eclstate handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
371c8058bc changed: remove support for internal deck handling in simulators 2022-06-24 15:06:13 +02:00
Tong Dong Qiu
1f1fa10927 Fix stdwell apply on GPU 2022-06-24 13:48:59 +02:00
Tong Dong Qiu
842a9a9317 Reduce source code line lengths 2022-06-23 10:21:34 +02:00
Tong Dong Qiu
c4ebed1718 Backport to fix ChowPatelIlu 2022-06-23 10:17:14 +02:00
Markus Blatt
f3bf15ab2f
Merge pull request #3946 from Tongdongq/fix-gpu-verbose-timing 
Fix: verbose timing for openclSolver
 2022-06-22 16:13:57 +02:00
Arne Morten Kvarving
da57e15271 fixed: fix build with dune 2.6 2022-06-20 14:16:43 +02:00
Tong Dong Qiu
4384872f8e Only use timers when printing their results, 
and actually wait for kernels to finish when timing GPU
 2022-06-17 16:02:56 +02:00
Atgeirr Flø Rasmussen
ffb09ee53e
Merge pull request #3937 from atgeirr/pressure-bhp-cpr 
Pressure bhp cpr
 2022-06-16 17:15:49 +02:00
Atgeirr Flø Rasmussen
c871e603f8 Do not insert unused options. 2022-06-16 16:24:41 +02:00
Atgeirr Flø Rasmussen
66ff942b2f Move MatrixBlock specializations inside namespace. 
This is necessary since the calls are ns-qualified in the
matrix market code.
 2022-06-16 11:37:40 +02:00
Tor Harald Sandve
60d0fe0f87
Merge pull request #3879 from totto82/rsrvinj2 
WIP implement rsrv item 10 WCONINJE
 2022-06-16 08:30:31 +02:00
Bård Skaflestad
7512c0c247
Merge pull request #3906 from totto82/regMSW100 
change default reg factor for MSW to 100
 2022-06-13 20:15:33 +02:00
Atgeirr Flø Rasmussen
2992ec25d8 Address issues raised in review. 2022-06-10 15:59:45 +02:00
Atgeirr Flø Rasmussen
7fe3839500 Use MatrixBlock consistently, also whitespace cleanup. 2022-06-10 11:08:24 +02:00
Atgeirr Flø Rasmussen
16b1756339 Add necessary include statements. 2022-06-09 10:38:47 +02:00
hnil
98acda0977 - change FieldMatrix to MatrixBlock in Tracer model to not need extra initializations in linear solver 2022-06-08 17:03:27 +02:00
Atgeirr Flø Rasmussen
a0f16089f7 Re-add explicit instantiation of FlexibleSolver to reduce compile time. 2022-06-08 17:03:27 +02:00
hnil
06a8b0ee3d fixed bug after changing duneD to invDuneD 2022-06-08 17:03:27 +02:00
hnil
4ead854b69 - taking pullrequest information into account 
- Moving transfere level to be template of OwningTwolevelPrecontitioner
 2022-06-08 17:03:27 +02:00
hnil
8f4cf8a952 removed compiler warnings 2022-06-08 17:03:27 +02:00
hnil
66c4a8c862 made resue interval separate paramter 2022-06-08 17:03:27 +02:00
hnil
3bed1ebbdb fixed bug in default options for cprw 2022-06-08 17:03:27 +02:00
hnil
541edeaf67 - add default for CPRW 
- cleanded code
 2022-06-08 17:03:27 +02:00
hnil
8a757a4935 removed comments 2022-06-08 17:03:27 +02:00
hnil
6c407506a9 cleaning code 2022-06-08 17:03:27 +02:00
hnil
5a917dd11e changed diagonal elements for cprw on multiscale wells 2022-06-08 17:03:27 +02:00
hnil
a8acd40f4a Changes to make ms wells work with cprw 2022-06-08 17:03:27 +02:00
hnil
141a816e5d new restart options 2022-06-08 17:03:25 +02:00
hnil
12fba38d99 Added maximum sparsity pattern which made full reuse possible. May degrade som of the performance fore not full reuse(not tested). 2022-06-08 17:02:02 +02:00
hnil
aba1d5047d working with no resue on norne 2022-06-08 17:02:02 +02:00
hnil
c697e70a69 changed definition of extra equations. made norne go to step 27. HACK 2022-06-08 17:02:02 +02:00
hnil
4975d5d9e7 - fixed extended communicator 
- fixed scaling of well cpr
 2022-06-08 17:02:02 +02:00
hnil
da572d1f60 -Fixed buges related to cpr with wells. 
- change interfaces to have access to pressureVarIndex
- added option in cmake files to propagate checking in dune-istl
 2022-06-08 17:02:02 +02:00
Atgeirr Flø Rasmussen
fef06a77af Updated for upstream changes. 2022-06-08 17:02:02 +02:00
hnil
f3acfcde0b Adding functions for pressure system manipulation to well models. 
Also add well-aware operator and transfer policy.
This will be used for CPR with custom operators.
 2022-06-08 17:01:33 +02:00
Bård Skaflestad
e6dff88eb7 Temporarily Limit Block-Jacobi Partitioner to OpenCL Only 
The block-Jacobi partitioner (commit e360c00b7) uses grid interfaces
that are only available in CpGrid and this blocks introducing other
grid managers such as ALUGrid.  Since the partitioner was only added
for OpenCL, guard special purposes accesses with HAVE_OPENCL.

This is a temporary measure and we will venture to restore the
partitioner later, although possibly restricted to CpGrid only.
 2022-06-08 16:14:39 +02:00
Bård Skaflestad
b593baff2f
Merge pull request #3926 from totto82/fix_operability 
Fix well operability
 2022-06-08 16:09:02 +02:00
Tor Harald Sandve
1f876d1800 implement rsrv item 10 WCONINJE 
MSW not supported yet
 2022-06-08 13:55:29 +02:00
Tor Harald Sandve
46c8aa3306 fix hydrostatic correction for branched wells in IPR 2022-06-08 12:29:05 +02:00
Markus Blatt
ac59429e01
Merge pull request #3935 from Tongdongq/fix-replace-zero-diagonal 
Fix: zeros were not replaced correctly in the diagonal for GPU
 2022-06-08 12:28:30 +02:00
Tong Dong Qiu
91a54645fb Fix: zeros were not replaced correctly in the diagonal 
And minor changes
 2022-06-08 10:00:22 +02:00
Tor Harald Sandve
3adaa1b987 fix component/phase mixup 2022-06-07 14:14:13 +02:00
Tor Harald Sandve
e965dac3ee Only flag a bhp producer/injector operable if the sum of IPR are negative/positive 2022-06-07 10:47:22 +02:00
Tor Harald Sandve
147fe77779
Merge pull request #3934 from totto82/stopnocross 
stopped wells where cross flow is not allowed are not added to the container
 2022-06-07 10:36:07 +02:00
Tor Harald Sandve
cec8e7c724
Merge pull request #3924 from totto82/steeringBHPtoHighestRate 
Steer bhp towards the solution with the highest production rate
 2022-06-07 10:35:53 +02:00
Tor Harald Sandve
6cc71375b4 stopped wells where cross flow is not allowed are not added to the container 2022-06-07 10:01:02 +02:00
Bård Skaflestad
be4221ea92
Merge pull request #3869 from plgbrts/vapoilwat 
adding three-phase simulator including water evaporation and salt precipitation
 2022-05-25 15:33:53 +02:00
Tor Harald Sandve
6f410e7b03 Steer bhp towards the solution with the highest production rate 2022-05-25 15:30:36 +02:00
Tor Harald Sandve
cce9e2d0b3
Merge pull request #3910 from hakonhagland/python_rates2 
Dynamically update Opm::Schedule from Python
 2022-05-25 08:42:13 +02:00
Bård Skaflestad
252d0afe8e Emit Actual Message on Input Failure 
This gives more information to the user and hopefully aids them in
resolving the underlying issue.
 2022-05-20 16:30:19 +02:00
Markus Blatt
02aaec82f7
Merge pull request #3815 from Tongdongq/subdomain-matrix-for-opencl 
Subdomain matrix for opencl ILU preconditioner
 2022-05-20 16:05:14 +02:00
Kai Bao
15bf35ffe0 removing unused well_state0 in iterateWellEqWithControl 
for MSW.
 2022-05-18 10:18:35 +02:00
Paul Egberts
a255613452
Merge branch 'master' into vapoilwat 2022-05-11 11:55:54 +02:00
Paul Egberts
6fe10a3e23 add throw for case msw is true and vapwat is true 2022-05-11 11:50:54 +02:00
Håkon Hægland
91ac3a2a32 Dynamically update schedule from Python 
Adds some methods that enables Opm::Schedule to be dynamically modified
from Python. A test case in test_schedule.py illustrates the use case.
 2022-05-05 13:10:39 +02:00
Tong Dong Qiu
b00d31042c Check if memory for nnzs is contiguous 2022-05-04 16:15:57 +02:00
Tor Harald Sandve
ea82bebb3a
Merge pull request #3909 from totto82/fix_reg_msw 
reset regularize_ before starting the inner iterations
 2022-05-03 13:44:00 +02:00
Tor Harald Sandve
4150ec5f67
Merge pull request #3756 from osae/letRelperms 
Support for LET-based saturation functions.
 2022-05-03 13:39:32 +02:00
Paul Egberts
5a23084846 restored MultisegmentWellEval.cpp 2022-05-03 11:54:41 +02:00
Tor Harald Sandve
dfe0982286 reset regularize_ before starting the inner iterations 2022-05-03 08:25:26 +02:00
Kai Bao
57d8f1aa24 update primary variables in prepareTimeStep 
it should not change running results.
 2022-05-02 13:47:16 +02:00
Tor Harald Sandve
6bf90c9ebe change default reg factor for MSW to 100 2022-05-02 09:41:43 +02:00
Tor Harald Sandve
74d8db36c5
Merge pull request #3859 from totto82/default_strict 
use a relaxed (but not too relaxed) well tolerance when iter>6
 2022-04-29 15:53:53 +02:00
Kai Bao
7145ec32ee renaming function updateWellState 
to updatePrimaryVariablesNewton

this should be a fallout during the well code refactoring
 2022-04-29 12:55:54 +02:00
Arne Morten Kvarving
7edca13df6 fixed: add missing config.h include 2022-04-28 11:38:02 +02:00
Markus Blatt
51d8c9536e Spelling fix geomtry -> geometry. 
Actually one should rename the function used from opm-common, too.
But that is for later...
 2022-04-27 20:52:30 +02:00
Markus Blatt
c66fb8a93d Added support for water-only and water-only + thermal to flow. 
Also run the onephase tests with flow now.
 2022-04-26 17:07:09 +02:00
Tor Harald Sandve
52fca6c91d use a relaxed (but not too relaxed) well tolerance when iter>6 
also shut unsolvable wells during iterations as default

Note however that getWellConvergence return false if a well is unsolvable
i.e. it will cut the timestep and redo the iteration if the well is unsolvable
and only shut it completly if the time step is below the
MinTimeStepBeforeShuttingProblematicWellsInDays (default 0.01 days)
 2022-04-26 10:55:22 +02:00
Tor Harald Sandve
4b5a53eaeb
Merge pull request #3887 from totto82/init_alt_eps 
use alternative init for wells with all rates less than eps
 2022-04-26 10:46:19 +02:00
Tor Harald Sandve
bd145913e8 use alternative init for wells with all rates less than eps 2022-04-26 09:32:18 +02:00
Atgeirr Flø Rasmussen
75ccd88f4f
Merge pull request #3888 from totto82/stop_tgr2 
fix trivial group target
 2022-04-26 08:34:06 +02:00
Atgeirr Flø Rasmussen
374b25639e
Merge pull request #3872 from totto82/fix_stop_inoperable 
Fix STOP in combination with inoperable/unsolvable
 2022-04-25 10:31:02 +02:00
Tor Harald Sandve
d00a2e2341 fix trivial group target 2022-04-25 08:10:19 +02:00
Markus Blatt
d58e11d591
Merge pull request #3875 from OPMUSER/Radial-Spider-Grid-Update-Backport-Candidate 
Radial and Spider Grid Keywords Not Supported
 2022-04-22 14:24:54 +02:00
Tor Harald Sandve
92175cf094 Fix STOP in combination with inoperable/unsolvable 2022-04-22 09:15:09 +02:00
Tor Harald Sandve
c8bef3bcd5 only check if wells has negative potentials if check_well_operabilty=true(default) 2022-04-22 08:19:33 +02:00
Tong Dong Qiu
cb1ee68967 Fix ILU0 creation for NONE reordering 2022-04-21 17:19:02 +02:00
Tong Dong Qiu
50d7c0f61d Tweak verbosity for opencl 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
68b604c85f Speed up reordering for opencl 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
fc298d8f9c Allow cusparseSolver to use jacMatrix 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
4db112cafa Use row_wise mode to build jacMatrix 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
1a1bc24bef Delay creating sparsity pattern for jacobi Matrix 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
2683019280 Bugfix: set vector size for MSwells was removed during refactoring 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
448af67ce6 Merge duplicate functions 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
6ca5f167b2 Allow BISAI to use jacMatrix 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
6f89629f92 Fix wrong print, remove unused variables 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
1cec56fa68 Use implicit mode to build jacMatrix 
Fix print variable
 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
550ce92902 Faster copying to jacMatrix 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
3797b7297d Merge some duplicate functions 2022-04-21 17:19:01 +02:00
Tong Dong Qiu
d963820e48 Pass BlockedMatrix to BdaSolvers 2022-04-21 17:19:00 +02:00
Tong Dong Qiu
7f5322f7d4 Store a BlockedMatrix in BdaBridge 2022-04-21 17:19:00 +02:00
Tong Dong Qiu
9dec714590 Allow to use jacobi matrix for ILU with CPR 
Fix whitespace
 2022-04-21 17:19:00 +02:00
Tong Dong Qiu
61f693dbaf reenable normal opencl 
Rebased
 2022-04-21 17:18:54 +02:00
Tong Dong Qiu
dee5e16fb8 subdomain matrix for opencl 
Rebased
 2022-04-21 17:18:40 +02:00
Tong Dong Qiu
e360c00b73 add block-jacobi partitioner option. Add block-jacobi matrix for use in OpenCL preconditioner 
Rebased
 2022-04-21 17:18:32 +02:00
Tor Harald Sandve
969dff4ede
Merge pull request #3864 from totto82/regMSW 
regularize MSW equation when iter > strict_inner_iter
 2022-04-21 09:15:15 +02:00
Tor Harald Sandve
03c1884533
Merge pull request #3873 from totto82/aprox_thp 
tighten approximated solution bhpFromThpLimit from 3 to 0.1 bar
 2022-04-21 08:56:57 +02:00
Tor Harald Sandve
fd6cf1ccbd regularize MSW equation when iter > strict_inner_iter 2022-04-21 08:44:50 +02:00
Håkon Hægland
9d04895ddb Fix assertion error for 2p oil water 
VFP calculations for two phase gas lift does not work unless the
rates are adpated to include a zero gas rate.
 2022-04-20 21:47:15 +02:00
Håkon Hægland
11907495c1 Well testing of gas lift wells 
Assign a maximum ALQ value to each GLIFT producer when doing well testing
in beginTimeStep(). This allows the well to be considered open. Then,
later in the timestep, when assemble() is called, the full gas lift
optimization procedure can adjust the ALQ to its correct value.

It is also observed that in some cases when gas lift is switched off by
setting ALQ to zero, and later in the schedule is switched back on again,
it might not be possible to determine bhp from thp for low small ALQ values.
Instead of aborting the gas lift optimization, we should try increasing
ALQ until we get convergence or until the maximum ALQ for the well is
reached.
 2022-04-20 10:51:34 +02:00
OPMUSER
89461ed058 Radial and Spider Grid Keywords Not Supported 
Add the DR, DTHETA and OUTRAD keywords as unsupported keywords with messages to enable the user to debug the input deck.

Back port candidate for release.
 2022-04-20 14:19:56 +08:00
Tor Harald Sandve
a1d11540a6 tighten approximated solution bhpFromThpLimit from 3 to 0.1 bar 2022-04-19 14:21:20 +02:00
Paul Egberts
17f2365406 clean up comments 2022-04-11 22:15:35 +02:00
Paul Egberts
c2fa5fc5a8 adding three-phase simulator including water evaporation and saltpreciopitation 2022-04-11 21:56:44 +02:00
Tor Harald Sandve
edf8786a58 avoid throw for nan residuals instead return well as unconverged 2022-04-11 09:52:25 +02:00
Markus Blatt
ff410d268a
Merge pull request #3863 from totto82/unsolvable_fix 
fix to --shut-unsolvable-wells=true option
 2022-04-11 07:33:46 +02:00
Paul Egberts
ab3be6dce4 adjustments to account for vaporized water 2022-04-08 22:36:39 +02:00
Tor Harald Sandve
6f29bf715c
Merge pull request #3778 from GitPaean/always_inner 
[testing] always using inner iterations for testing purpose.
 2022-04-08 15:44:33 +02:00
Ove Sævareid
81249bccc4 Support for LET-based saturation functions. 2022-04-08 12:01:54 +02:00
Tor Harald Sandve
e501a84958 support item 4 wvfpexp 2022-04-08 08:43:13 +02:00
Tor Harald Sandve
0c9bb3990e
Merge pull request #3830 from plgbrts/vapwat 
Adding explicit input specification of water-gas ratio (RVW) and RVW output plus simulator gas-water system with salt precipitation and water evaporation for
 2022-04-07 09:03:26 +02:00
Markus Blatt
282951dc44
Merge pull request #3848 from blattms/binary-package-version-no-buildtime 
Use empty string for buildtime if BUILD_TIMESTAMP is not set.
 2022-04-05 14:54:58 +02:00
Tor Harald Sandve
e2e0ec9dd9 fix to --shut-unsolvable-wells=true option 2022-04-05 14:42:27 +02:00
Tor Harald Sandve
fba9046201 Some more clean-up based on review 2022-04-04 11:37:31 +02:00
Tor Harald Sandve
69ffed06de Address comments from review 
1) Add debug messages
2) Fix bug of missing else in the code
 2022-04-04 08:24:32 +02:00
Tor Harald Sandve
5b53fcd8a6 guard against d = 0 2022-04-04 08:24:32 +02:00