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
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