Markus Blatt
cca38ddc36
Fixed spelling in error message.
2020-08-20 10:17:26 +02:00
Markus Blatt
94eb0d5ffe
Fixes method name in throw message.
2020-08-19 08:11:50 +02:00
Markus Blatt
0c0be3a941
Reset duneDSolver only once.
2020-08-18 17:55:50 +02:00
Markus Blatt
ae8e2fb8c2
Removed commented out code from MSWell.
2020-08-18 17:55:50 +02:00
Markus Blatt
e96c4a9908
Removed unused method invDXDirect.
2020-08-18 17:55:50 +02:00
Markus Blatt
7261759065
Reuse UMFPack decomposition whenever possible.
...
We hold a shared pointer to the umpfack solver that gets reset
whenever the matrix is changed. When applying the decomposition
we will be recomputed if the solver pointer is null.
2020-08-18 17:55:50 +02:00
Markus Blatt
ce409737fe
Allow applyUMFPack to decompose if needed.
2020-08-18 17:55:50 +02:00
Markus Blatt
a011244d9c
refactored invDxDirect to allow for reusing the decomposition.
2020-08-18 17:55:50 +02:00
Bård Skaflestad
af9a9fa512
Merge pull request #2699 from totto82/pvtwsaltSaltvd
...
Implement SALTVD
2020-08-18 12:32:26 +02:00
Tor Harald Sandve
9d72b6ad1a
clean-up saltved implementation based on code review
2020-08-18 11:04:39 +02:00
Tor Harald Sandve
491b532a6a
Add trivial saltvd table for cases without saltvd given in the deck
2020-08-18 10:55:43 +02:00
Tor Harald Sandve
bd9186b41d
implement Saltvd
2020-08-18 10:55:43 +02:00
Joakim Hove
74e9eea189
Merge pull request #2724 from joakim-hove/tlmixpar
...
Test TLMixpar pack/unpack
2020-08-14 12:57:06 +02:00
Kai Bao
b88501bc7d
Merge pull request #2711 from blattms/fix-unused-vars-wells
...
Remove unused variable groups from BlackoilWellModel::wellsToState.
2020-08-12 22:29:07 +02:00
Joakim Hove
9f5e69cde3
Test TLMixpar pack/unpack
2020-08-12 14:46:04 +02:00
Atgeirr Flø Rasmussen
8d999ad448
Merge pull request #2664 from GitPaean/addinginneritartionsstdwell
...
Adding inner iterations for standard wells.
2020-08-11 16:37:00 +02:00
Kai Bao
08b93424f3
setting UseInnerIterationsWells default to be false
...
and reducing default MaxInnerIterWells to be 50, which should not matter
much. We should try to reduce it further to something like 20, 10 later.
2020-08-11 09:46:23 +02:00
Kai Bao
a38dc27bcb
refactoring for iterateWellEquations
2020-08-11 09:10:19 +02:00
Kai Bao
11807747cb
renaming solveWellEqUntilConverged to be iterateWellEquations
2020-08-11 09:10:19 +02:00
Tor Harald Sandve
fefa5c22ce
make assembleWellEqIteration private
2020-08-11 09:10:19 +02:00
Tor Harald Sandve
fc45b1bd47
Add inner iterations for standard wells also
2020-08-11 09:10:19 +02:00
Markus Blatt
c1effde738
Merge pull request #2722 from blattms/fix-reorder-ilu0-opencl
...
[OpenCL] Fixes out of bounds read in reordering code in ILU0.
2020-08-07 18:09:12 +02:00
Markus Blatt
5743a979e3
Formatting: added missing space.
2020-08-07 09:38:10 +02:00
Markus Blatt
8d3eac81a5
[OpenCL] Fixes out of bounds read in reordering code in ILU0.
...
rowPerColor only has size numColors!
2020-08-05 21:22:01 +02:00
Markus Blatt
da40f0200e
Merge pull request #2720 from blattms/correctly-free-cuda-mem-for-ms
...
Also free memory allocated with CUDA later with CUDA
2020-08-04 13:50:33 +02:00
Markus Blatt
c28a12636a
Also free memory allocated with CUDA also with CUDA
...
With multisegment wells we allocate WellContributions::hx and hy with
`CudaMallocHost`. Yet we tried to deallocate them with
`delete[]`. This caused segementation faults e.g. for
model1/MSW_MODEL_1. Now we use `CudaFreeHost` for freeing if we used
CUDA.
Closes #2719
2020-08-04 12:54:27 +02:00
Atgeirr Flø Rasmussen
3a0469cde1
Merge pull request #2704 from bska/remove-basic-warning
...
Cell Data: Don't Warn About Supported Output Directives
2020-07-28 15:52:59 +02:00
Bård Skaflestad
8c8635d221
Cell Data: Don't Warn About Supported Output Directives
...
This commit ensures that we don't issue misleading warning about
output creation directives such as
BASIC
FREQ
RESTART
that could be, and typically are, put into keywords like RPTRST and
RPTSCHED. Previously, we would interpret these directives as names
of cell vectors and we would get very confusing diagnostic messages
of the form
Keyword 'BASIC' is unhandled for output to file
which suggests that 'BASIC' is unsupported despite the output system
supporting the directive for quite some time. While here, also
apply the same reasoning to the vectors we always output such as
SWAT, SGAS, or PRESSURE.
2020-07-28 13:36:25 +02:00
Atgeirr Flø Rasmussen
af413f474c
Merge pull request #2715 from atgeirr/fix-opencl-cmake
...
Fix CMake variable case bug.
2020-07-28 13:17:13 +02:00
Atgeirr Flø Rasmussen
0205f54caf
Fix CMake variable case bug.
...
This caused compile failure on a system without the c++ OpenCL binding header cl.hpp.
2020-07-28 12:42:55 +02:00
Markus Blatt
6c1f8bd872
Merge pull request #2707 from blattms/fix-opencl-warnings
...
Fix some warnings in the OpenCl Solver.
2020-07-21 14:18:26 +02:00
Markus Blatt
13ff454e56
Remove unused variable groups from BlackoilWellModel::wellsToState.
...
Alternatively it could be marked as [[maybe_unused]] if it will be
used sometime in the future.
2020-07-21 11:35:43 +02:00
Markus Blatt
f37fa8bbd9
Prevent unused variable warnings without CUDA in WellContributions.
2020-07-21 11:24:19 +02:00
Markus Blatt
59064b4ac2
Prevent warning about shadowing dim_wells and dim.
2020-07-10 13:40:38 +02:00
Markus Blatt
efd3aeb290
Catch exceptions by const reference to prevent warnings.
...
e.g. gcc issued: "warning: catching polymorphic type ‘class cl::Error’ by value [-Wcatch-value=]"
2020-07-10 13:40:38 +02:00
Markus Blatt
faaee51d09
Merge pull request #2682 from Tongdongq/openclSolver
...
Added openclSolver
2020-07-10 13:38:32 +02:00
T.D. (Tongdong) Qiu
5971a7ae9e
Split WellContributions into .cpp and .cu
2020-07-10 11:13:55 +02:00
Bård Skaflestad
2212229481
Merge pull request #2705 from joakim-hove/actionx-wlist
...
Add WListManager argument when constructing ActionContext
2020-07-09 15:59:27 +02:00
Tongdongq
f90bb85960
Merge pull request #1 from blattms/openCLSolver-g++-8.3
...
include missing header for OpenCLSolver with g++-8.3
2020-07-09 09:25:08 +02:00
Joakim Hove
8f78a15938
Add WListManager argument when constructing ActionContext
2020-07-09 07:30:37 +02:00
Bård Skaflestad
47d4a5087f
Merge pull request #2698 from totto82/applyPVTWsalt
...
Pass the salt concentration to the water PVT
2020-07-08 09:32:51 +02:00
T.D. (Tongdong) Qiu
af02fc3924
Added try-catch around the linear solve
2020-07-07 16:07:42 +02:00
T.D. (Tongdong) Qiu
0b20762e59
Clarified parameter help print and chosen OpenCL platform and device
2020-07-07 14:26:02 +02:00
T.D. (Tongdong) Qiu
ab49f60eca
Added opencl.hpp to define variables and import opencl
...
Added opencl.cpp to get OpenCL error strings
2020-07-07 13:46:47 +02:00
T.D. (Tongdong) Qiu
91591abd56
Removed removed file from cmake install list
2020-07-07 11:42:00 +02:00
Markus Blatt
7a571c98db
include missing header for OpenCLSolver with g++-8.3
...
Without I got compilation errors.
2020-07-07 11:10:19 +02:00
T.D. (Tongdong) Qiu
478e2ee971
Improved rowsPerColor usage
2020-07-07 11:00:38 +02:00
T.D. (Tongdong) Qiu
5aa8dda487
Changed default parallel strategy to GRAPH_COLORING
2020-07-06 13:56:27 +02:00
T.D. (Tongdong) Qiu
4c037b0998
Removed unused test kernels
2020-07-06 13:56:27 +02:00
T.D. (Tongdong) Qiu
a164a57220
Added memory management to BlockedMatrix
2020-07-06 13:55:50 +02:00