Robert Kloefkorn
8afe8c3f96
[bugfix][ISTLSolverEbos] fix compilation when dune-fem is used in
...
conjunction with opm-simulators.
2020-03-31 14:22:11 +02:00
Atgeirr Flø Rasmussen
8ef508cc08
Merge pull request #2491 from blattms/flexible-fixes
...
Fixes ILU0 when using flexible solvers.
2020-03-24 17:39:27 +01:00
Atgeirr Flø Rasmussen
1e84624ea7
Add override spec to silence warnings.
2020-03-23 11:57:59 +01:00
Markus Blatt
03b2c44dce
Prevent some unnecessary copies.
2020-03-23 09:40:14 +01:00
Markus Blatt
b41b449c7d
Removed suplicated code for calculating quasi impes weights.
...
Maintaining two versions is just to error prone.
2020-03-23 09:40:14 +01:00
Markus Blatt
c14bf078a1
Make ParallelOverlappingILU0 updateable & use it to construct ILU0/n
...
This should force the flexible solver approach to recalculate the
decomposition during update.
Closes #2490
2020-03-23 09:39:51 +01:00
Markus Blatt
c0a82ff335
Merge pull request #2475 from Tongdongq/separate_wellcontributions_for_gpu
...
Separate wellcontributions for gpu
2020-03-20 12:14:06 +01:00
T.D. (Tongdong) Qiu
ab2d9a8c76
Changed int idx to indicate which matrix is added to WellContributions to an enum
2020-03-20 10:04:58 +01:00
T.D. (Tongdong) Qiu
75268f1166
Changed ISTLSolverEbos-BdaBridge usage. BdaBridge->solve_system() is not called when GPU is not selected or disabled
2020-03-19 16:08:29 +01:00
T.D. (Tongdong) Qiu
947f419ef8
Fixed memory issues when cusparseSolver is disabled by unsupported blocksize
2020-03-19 14:09:42 +01:00
T.D. (Tongdong) Qiu
04fe46a9da
Only accept CUDA 9.0 for the WellContributions kernel. Also removed unused variables
2020-03-19 11:46:57 +01:00
T.D. (Tongdong) Qiu
8223cd1db8
Simplified filling of WellContributions object. Added comments
2020-03-19 11:15:49 +01:00
T.D. (Tongdong) Qiu
fdcf46792a
BdaBridge and WellContributions are only included and compiled when CUDA is found
2020-03-18 19:03:14 +01:00
T.D. (Tongdong) Qiu
d29b6a6e5e
Removed unnecessary line continuation chars. Merged unsupported cases in switch
2020-03-18 15:14:38 +01:00
T.D. (Tongdong) Qiu
009b5076a4
Removed CPU implementation of WellContributions
2020-03-18 15:08:48 +01:00
T.D. (Tongdong) Qiu
ce73337769
Disable GPU when using MPI
2020-03-18 13:53:40 +01:00
T.D. (Tongdong) Qiu
d067c08be7
Added header to CMake_files, updated copyright year
2020-03-16 12:57:35 +01:00
Markus Blatt
1c2d3fbcc7
Do not use local id set to index matrices.
...
That the local ids were consecutive and starting from 0 was just
a coincidence and they should never be used to access linear systems
or vectors. This commit fixes this by using the correct mappers instead.
Note the we removed some computations from the constructor of
ISTLSolverEbosCpr as it inherits from ISTLSolverEbos and the operations
already happnen in constructor of the base class.
2020-03-13 17:56:49 +01:00
andrthu
3d0d0f9624
Remove GhostLast ILU
2020-03-13 15:03:31 +01:00
T.D. (Tongdong) Qiu
581cbc6a3e
cusparseSolver can now apply wellcontributions separately, so --matrix-add-wellcontributions=true is not required anymore
2020-03-13 14:21:59 +01:00
andrthu
c91eb330d3
remove 2.6 and move ownerFirst in lb
2020-03-11 12:42:55 +01:00
andrthu
866a661255
New owners-first based linear algebra operations (SoMV, SP and ILU.apply).
2020-03-11 12:41:38 +01:00
Markus Blatt
22d4e784d3
Merge pull request #2356 from akva2/boost_prune
...
Lessen boost usage
2020-02-21 13:15:03 +01:00
Arne Morten Kvarving
4ba7d3a7bc
changed: replace boost::any with std::any
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
d56b7e338d
quell warning about unused local typedef
...
strictly speaking the gcc diagnostics are wrong, the typedef is actually
used once templates are invoked on the structs.
simply use the typedef in the structs itself to avoid the warning
like is done for other variants.
2020-02-19 10:15:07 +01:00
Arne Morten Kvarving
226a6cb434
disable json input for boost 1.48
2020-02-17 15:21:07 +01:00
Atgeirr Flø Rasmussen
2cbeff2aca
Silence warnings.
2020-02-13 11:04:02 +01:00
Atgeirr Flø Rasmussen
83a5cf1f91
Do not use std::pointer_to_binary_function.
...
Removed from C++17.
2020-02-13 11:03:05 +01:00
Atgeirr Flø Rasmussen
5fe48dab8b
Merge pull request #2327 from akva2/bump_dune
...
Bump required dune version to 2.6
2020-02-11 09:41:44 +01:00
Arne Morten Kvarving
22a291a3af
Merge pull request #2331 from akva2/janitoring
...
changed: rename local typedef to avoid shadowing warning
2020-02-10 15:24:15 +01:00
Arne Morten Kvarving
96b2e97b15
changed: rename local typedef to avoid shadowing warning
2020-02-10 12:30:14 +01:00
Arne Morten Kvarving
cfa0904321
fixed: quell deprecation warnings with dune 2.7
2020-02-07 15:19:44 +01:00
Arne Morten Kvarving
d28ed77036
fixed: add explicit template instantation for blocksize 1
...
fixes linking of flow_onephase with bda/cuda enabled
2020-02-07 15:18:40 +01:00
Arne Morten Kvarving
4978e72039
bump required dune version to 2.6
...
remove compatiblity code with older versions
2020-02-06 16:24:39 +01:00
Markus Blatt
7e700c11e0
Move PreconditionerFactory into namespace Opm.
...
This fixes name clashes with DUNE's own factory that is introduced
in DUNE 2.7. Hence it closes issue #2266 .
BTW: Dune's factory has more template parameters than ours.
2020-01-07 17:59:23 +01:00
Markus Blatt
b9062396be
Merge pull request #2209 from Tongdongq/master
...
Added cusparseSolver, needs GPU to be used
2019-12-20 11:37:27 +01:00
T.D. (Tongdong) Qiu
103cc9b83a
Added return explanation in comments
2019-12-18 17:09:33 +01:00
T.D. (Tongdong) Qiu
57344fd5e0
Added doxygen-style comments
2019-12-18 17:05:33 +01:00
T.D. (Tongdong) Qiu
6506ab5f55
Added some const qualifiers and comments
2019-12-18 16:37:29 +01:00
T.D. (Tongdong) Qiu
a491e64883
Added some whitespace around brackets in accordance with OPM suggested coding standard
2019-12-18 15:54:14 +01:00
T.D. (Tongdong) Qiu
950d1c92c1
Replaced tabs with 4 spaces
2019-12-18 15:50:09 +01:00
T.D. (Tongdong) Qiu
b543947e66
Addressed some comments of PR#2209
2019-12-18 15:47:35 +01:00
Robert Kloefkorn
2fa90d24f6
[bugfix][ebos] Make compile with PolyhedralGrid again.
2019-12-18 11:03:42 +01:00
T.D. (Tongdong) Qiu
293bd5816f
Replaced exit() with OPM_THROW. Replaced primitive pointer with unique_ptr.
2019-12-16 10:05:12 +01:00
Robert Kloefkorn
8e800f0c93
[bugfix][BlackoilAmg] Fix compilation error when using DUNE 2.7
2019-12-11 11:22:28 +01:00
T.D. (Tongdong) Qiu
13e524dba2
Only print warning that cusparseSolver did not converge if it was chosen with --use-gpu=true
2019-12-09 10:02:21 +01:00
T.D. (Tongdong) Qiu
b355537e04
Replaced prints with OpmLog. BdaBridge disables GPU and continues with Dune if unsupported blocksize is used
2019-12-06 17:23:32 +01:00
T.D. (Tongdong) Qiu
8b92c5dca6
Removed extra copy of nnzs, now sends pointer to start of Dune::BCRSMatrix data to cusparseSolver.
2019-12-06 14:33:52 +01:00
T.D. (Tongdong) Qiu
48900df882
Fixed 'unused variable' warnings
2019-12-06 11:27:17 +01:00
T.D. (Tongdong) Qiu
a4cb582cfb
Moved warning prints from cusparseSolver to BdaBridge. Moved solving logic from BdaBridge to cusparseSolver. Added cusparseSolverStatus enum.
2019-12-06 11:05:41 +01:00