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

Fixes compilation of CUDA.

Browse Source 
nvcc exits compilation if the header dune/istl/basearray.hh (form DUNE
2.6) is included as it does not seem to understand the friend declaration
there (friend class for a struct).

```
/usr/include/dune/istl/basearray.hh:101:49: error: ‘typename Dune::Imp::base_array_unmanaged<B, A>::RealIterator’ names ‘template<class B, class A> template<class T> struct Dune::Imp::base_array_unmanaged<B, A>::RealIterator’, which is not a type
       friend class RealIterator<const ValueType>;
                                                 ^
```
This commit is contained in:
Markus Blatt
2020-10-14 19:23:57 +02:00
parent f8c276d023
commit 44fadfb88a
2 changed files with 8 additions and 6 deletions
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> #include <cuda_runtime.h>
#endif #endif
#include <dune/istl/umfpack.hh> #if HAVE_SUITESPARSE_UMFPACK
#include<umfpack.h>
#endif
#include <dune/common/version.hh> #include <dune/common/version.hh>
namespace Opm namespace Opm
@@ -79,8 +81,7 @@ private:
public: public:
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 7) #if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 7)
using UMFPackIndex = using UMFPackIndex = SuiteSparse_long;
typename Dune::UMFPack<Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1>>>::UMFPackMatrix::Index;
#else #else
using UMFPackIndex = int; using UMFPackIndex = int;
#endif #endif

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

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