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 #3492 from blattms/dune-2.8

Browse Source 
Fixes and removes deprecation warnings for Dune 2.8
This commit is contained in:
Bård Skaflestad
2021-09-14 21:11:25 +02:00
committed by GitHub
parent dfab5d2824 8abf2159c4
commit 1dc9cf755e
10 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/linalg/FlexibleSolver_impl.hpp
View File

@@ -21,9 +21,10 @@
#ifndef OPM_FLEXIBLE_SOLVER_IMPL_HEADER_INCLUDED
#define OPM_FLEXIBLE_SOLVER_IMPL_HEADER_INCLUDED
#include <opm/simulators/linalg/matrixblock.hh>
#include <opm/simulators/linalg/ilufirstelement.hh>
#include <opm/simulators/linalg/FlexibleSolver.hpp>
#include <opm/simulators/linalg/PreconditionerFactory.hpp>
#include <opm/simulators/linalg/matrixblock.hh>
#include <dune/common/fmatrix.hh>
#include <dune/istl/bcrsmatrix.hh>

9
opm/simulators/linalg/ParallelOverlappingILU0.hpp
View File

@@ -25,6 +25,7 @@
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/version.hh>
#include <dune/istl/preconditioner.hh>
#include <dune/istl/ilu.hh>
#include <dune/istl/paamg/smoother.hh>
#include <dune/istl/paamg/graph.hh>
#include <dune/istl/paamg/pinfo.hh>
@@ -430,7 +431,11 @@ namespace Opm
detail::IsPositiveFunctor() );
break;
default:
#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bilu0_decomposition( ILU );
#else
Dune::ILU::blockILU0Decomposition( ILU );
#endif
break;
}
}
@@ -1022,7 +1027,11 @@ public:
break;
default:
if (interiorSize_ == A_->N())
#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bilu0_decomposition( *ILU );
#else
Dune::ILU::blockILU0Decomposition( *ILU );
#endif
else
detail::ghost_last_bilu0_decomposition(*ILU, interiorSize_);
break;