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

Compile fix for Dune 2.2.

Browse Source 
Some BCRSMatrix members are new in 2.3.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-09-30 09:57:45 +02:00
parent 1602fce6b9
commit e256be267c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/DuneMatrix.hpp
View File

@ -27,6 +27,8 @@
#include <opm/core/utility/platform_dependent/disable_warnings.h> #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <dune/common/version.hh>
// Include matrix header with hackery to make it possible to inherit. // Include matrix header with hackery to make it possible to inherit.
#define private protected #define private protected
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
@ -52,9 +54,12 @@ namespace Opm
this->n = rows; this->n = rows;
this->m = cols; this->m = cols;
this->nnz = ia[rows]; this->nnz = ia[rows];
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 3)
this->allocationSize = this->nnz; this->allocationSize = this->nnz;
this->avg = 0; this->avg = 0;
this->overflowsize = -1.0; this->overflowsize = -1.0;
#endif
this->a = new B[this->nnz]; this->a = new B[this->nnz];
static_assert(sizeof(B) == sizeof(double), "This constructor requires a block type that is the same as a double."); static_assert(sizeof(B) == sizeof(double), "This constructor requires a block type that is the same as a double.");