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
commit 1dc9cf755e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclgenericcpgridvanguard.cc
View File

@ -380,7 +380,7 @@ template class EclGenericCpGridVanguard<Dune::MultipleCodimMultipleGeomTypeMappe
Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>, Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
double>; double>;
#else #else
template class EclGenericCpGridVanguard<Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,Dune::Impl::MCMGFailLayout>, template class EclGenericCpGridVanguard<Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>, Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
double>; double>;
#endif #endif

6
ebos/eclgenericoutputblackoilmodule.cc
View File

@ -1631,10 +1631,10 @@ updateSummaryRegionValues(const Inplace& inplace,
// support the RPR__xxx summary keywords. // support the RPR__xxx summary keywords.
{ {
auto get_vector = [&inplace] auto get_vector = [&inplace]
(const auto& node, (const auto& node_,
const Inplace::Phase phase) const Inplace::Phase phase_)
{ {
return inplace.get_vector(node.fip_region(), phase); return inplace.get_vector(node_.fip_region(), phase_);
}; };
for (const auto& phase : Inplace::phases()) { for (const auto& phase : Inplace::phases()) {

4
ebos/eclgenericthresholdpressure.cc
View File

@ -253,13 +253,13 @@ template class EclGenericThresholdPressure<Dune::CpGrid,
#else #else
template class EclGenericThresholdPressure<Dune::CpGrid, template class EclGenericThresholdPressure<Dune::CpGrid,
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>, Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
double>; double>;
#endif #endif
template class EclGenericThresholdPressure<Dune::PolyhedralGrid<3,3,double>, template class EclGenericThresholdPressure<Dune::PolyhedralGrid<3,3,double>,
Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>, Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>, Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>>,
double>; double>;
} // namespace Opm } // namespace Opm

4
ebos/eclgenerictracermodel.cc
View File

@ -289,14 +289,14 @@ template class EclGenericTracerModel<Dune::CpGrid,
#else #else
template class EclGenericTracerModel<Dune::CpGrid, template class EclGenericTracerModel<Dune::CpGrid,
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>, Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
Opm::EcfvStencil<double,Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,false,false>, Opm::EcfvStencil<double,Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,false,false>,
double>; double>;
#endif #endif
template class EclGenericTracerModel<Dune::PolyhedralGrid<3,3,double>, template class EclGenericTracerModel<Dune::PolyhedralGrid<3,3,double>,
Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>, Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>,Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>>,
Opm::EcfvStencil<double, Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>,false,false>, Opm::EcfvStencil<double, Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>,false,false>,
double>; double>;

4
ebos/eclgenericwriter.cc
View File

@ -537,14 +537,14 @@ template class EclGenericWriter<Dune::CpGrid,
template class EclGenericWriter<Dune::CpGrid, template class EclGenericWriter<Dune::CpGrid,
Dune::CpGrid, Dune::CpGrid,
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>, Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>, Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
double>; double>;
#endif #endif
template class EclGenericWriter<Dune::PolyhedralGrid<3,3,double>, template class EclGenericWriter<Dune::PolyhedralGrid<3,3,double>,
Dune::PolyhedralGrid<3,3,double>, Dune::PolyhedralGrid<3,3,double>,
Dune::GridView<Dune::PolyhedralGridViewTraits<3, 3, double, Dune::PartitionIteratorType(4)>>, Dune::GridView<Dune::PolyhedralGridViewTraits<3, 3, double, Dune::PartitionIteratorType(4)>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>, Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>>,
double>; double>;
} // namespace Opm } // namespace Opm

4
ebos/eclmpiserializer.hh
View File

@ -168,7 +168,7 @@ public:
m_packSize += Mpi::packSize(d, m_comm); m_packSize += Mpi::packSize(d, m_comm);
}; };
auto pack = [&](auto& d) { auto packer = [&](auto& d) {
Mpi::pack(d, m_buffer, m_position, m_comm); Mpi::pack(d, m_buffer, m_position, m_comm);
}; };
@ -177,7 +177,7 @@ public:
std::visit( [&] (auto& arg) { pack_size(arg); }, data); std::visit( [&] (auto& arg) { pack_size(arg); }, data);
} else if (m_op == Operation::PACK) { } else if (m_op == Operation::PACK) {
Mpi::pack(data.index(), m_buffer, m_position, m_comm); Mpi::pack(data.index(), m_buffer, m_position, m_comm);
std::visit([&](auto& arg) { pack(arg); }, data); std::visit([&](auto& arg) { packer(arg); }, data);
} else if (m_op == Operation::UNPACK) { } else if (m_op == Operation::UNPACK) {
size_t index; size_t index;
std::variant<T0,T1>& mutable_data = const_cast<std::variant<T0,T1>&>(data); std::variant<T0,T1>& mutable_data = const_cast<std::variant<T0,T1>&>(data);

4
ebos/ecltransmissibility.cc
View File

@ -1049,13 +1049,13 @@ template class EclTransmissibility<Dune::CpGrid,
#else #else
template class EclTransmissibility<Dune::CpGrid, template class EclTransmissibility<Dune::CpGrid,
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>, Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>, Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
double>; double>;
#endif #endif
template class EclTransmissibility<Dune::PolyhedralGrid<3,3,double>, template class EclTransmissibility<Dune::PolyhedralGrid<3,3,double>,
Dune::GridView<Dune::PolyhedralGridViewTraits<3, 3, double, Dune::PartitionIteratorType(4)>>, Dune::GridView<Dune::PolyhedralGridViewTraits<3, 3, double, Dune::PartitionIteratorType(4)>>,
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>, Dune::Impl::MCMGFailLayout>, Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::PolyhedralGridViewTraits<3,3,double,Dune::PartitionIteratorType(4)>>>,
double>; double>;
} // namespace Opm } // namespace Opm

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

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

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

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

4
tests/test_milu.cpp
View File

@ -85,7 +85,11 @@ void test_milu0(M& A)
// Test that (LU)^-1Ae=e // Test that (LU)^-1Ae=e
A.mv(e, x1); A.mv(e, x1);
#if DUNE_VERSION_GTE(DUNE_ISTL, 2, 8)
Dune::ILU::blockILUBacksolve(ILU, x2, x1);
#else
bilu_backsolve(ILU, x2, x1); bilu_backsolve(ILU, x2, x1);
#endif
diff = x2; diff = x2;
diff -= e; diff -= e;