OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2857 from blattms/fix-nvcc-umfpack-compilation

Browse Source 
Fixes compilation of CUDA.
This commit is contained in:
Markus Blatt 2020-10-15 11:50:28 +02:00 committed by GitHub
commit 320cf46a5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/simulators/linalg/bda/MultisegmentWellContribution.hpp
View File

@ -26,7 +26,9 @@
#include <cuda_runtime.h>
#endif
#include <dune/istl/umfpack.hh>
#if HAVE_SUITESPARSE_UMFPACK
#include<umfpack.h>
#endif
#include <dune/common/version.hh>
namespace Opm
@ -79,8 +81,7 @@ private:
public:
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 7)
using UMFPackIndex =
typename Dune::UMFPack<Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1>>>::UMFPackMatrix::Index;
using UMFPackIndex = SuiteSparse_long;
#else
using UMFPackIndex = int;
#endif

7
opm/simulators/linalg/bda/WellContributions.hpp
View File

@ -31,7 +31,9 @@
#include <vector>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <dune/istl/umfpack.hh>
#if HAVE_SUITESPARSE_UMFPACK
#include<umfpack.h>
#endif
#include <dune/common/version.hh>
namespace Opm
@ -58,8 +60,7 @@ class WellContributions
{
public:
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 7)
using UMFPackIndex =
typename Dune::UMFPack<Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1>>>::UMFPackMatrix::Index;
using UMFPackIndex = SuiteSparse_long;
#else
using UMFPackIndex = int;
#endif