OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 09:40:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4027 from aritorto/lambda

Browse Source 
Code modernization
This commit is contained in:
Markus Blatt 2022-08-26 12:19:47 +02:00 committed by GitHub
commit c58a30068e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 78 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
opm/simulators/linalg/MILU.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright 2015 Dr. Blatt - HPC-Simulation-Software & Services
Copyright 2015, 2022 Dr. Blatt - HPC-Simulation-Software & Services
Copyright 2015 Statoil AS
This file is part of the Open Porous Media project (OPM).
@ -32,6 +32,21 @@
#include <array>
template <typename T>
T Opm::detail::identityFunctor(const T& t){return t;};
template <typename T>
T Opm::detail::oneFunctor(const T&){return 1.0;};
template <typename T>
T Opm::detail::signFunctor(const T& t){if (t< 0){return -1;} else{return 1;}};
template <typename T>
T Opm::detail::isPositiveFunctor(const T& t){if (t<0){return 0;} else{return 1;}};
template <typename T>
T Opm::detail::absFunctor(const T& t){return std::abs(t);};
namespace Opm
{
@ -55,8 +70,8 @@ MILU_VARIANT convertString2Milu(const std::string& milu)
namespace detail
{
template<class M, class F1, class F2>
void milu0_decomposition(M& A, F1 absFunctor, F2 signFunctor,
template<class M>
void milu0_decomposition(M& A, FieldFunct<M> absFunctor, FieldFunct<M> signFunctor,
std::vector<typename M::block_type>* diagonal)
{
if( diagonal )
@ -217,16 +232,17 @@ void milun_decomposition(const M& A, int n, MILU_VARIANT milu, M& ILU,
detail::milu0_decomposition ( ILU);
break;
case MILU_VARIANT::MILU_2:
detail::milu0_decomposition ( ILU, detail::IdentityFunctor(),
detail::SignFunctor() );
detail::milu0_decomposition ( ILU, identityFunctor<typename M::field_type>,
signFunctor<typename M::field_type>);
break;
case MILU_VARIANT::MILU_3:
detail::milu0_decomposition ( ILU, detail::AbsFunctor(),
detail::SignFunctor() );
detail::milu0_decomposition ( ILU, absFunctor<typename M::field_type>,
signFunctor<typename M::field_type>);
break;
case MILU_VARIANT::MILU_4:
detail::milu0_decomposition ( ILU, detail::IdentityFunctor(),
detail::IsPositiveFunctor() );
detail::milu0_decomposition ( ILU, identityFunctor<typename M::field_type> ,
isPositiveFunctor<typename M::field_type>);
break;
default:
#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
@ -238,26 +254,30 @@ void milun_decomposition(const M& A, int n, MILU_VARIANT milu, M& ILU,
}
}
#define INSTANCE(F1,F2,...) \
template void milu0_decomposition<__VA_ARGS__, F1, F2> \
(__VA_ARGS__&, F1, F2, \
std::vector<typename __VA_ARGS__::block_type>*);
#define INSTANCE_ILUN(...) \
template double Opm::detail::identityFunctor(const double&);
template double Opm::detail::oneFunctor(const double&);
template double Opm::detail::signFunctor(const double&);
template double Opm::detail::isPositiveFunctor(const double&);
template double Opm::detail::absFunctor(const double&);
#define INSTANCE(...) \
template void milu0_decomposition<__VA_ARGS__> \
(__VA_ARGS__&,std::function<double(const double&)>, std::function<double(const double&)>, \
std::vector<typename __VA_ARGS__::block_type>*);
#define INSTANCE_ILUN(...) \
template void milun_decomposition(const __VA_ARGS__&, int, MILU_VARIANT, \
__VA_ARGS__&,Reorderer&,Reorderer&);
#define INSTANCE_FULL(...) \
INSTANCE(AbsFunctor,SignFunctor,__VA_ARGS__) \
INSTANCE(IdentityFunctor,IsPositiveFunctor,__VA_ARGS__) \
INSTANCE(IdentityFunctor,OneFunctor,__VA_ARGS__) \
INSTANCE(IdentityFunctor,SignFunctor,__VA_ARGS__) \
#define INSTANCE_FULL(...) \
INSTANCE(__VA_ARGS__) \
INSTANCE_ILUN(__VA_ARGS__)
#define INSTANCE_BLOCK(Dim) \
#define INSTANCE_BLOCK(Dim) \
INSTANCE_FULL(Dune::BCRSMatrix<MatrixBlock<double,Dim,Dim>>)
#define INSTANCE_FM(Dim) \
#define INSTANCE_FM(Dim) \
INSTANCE_FULL(Dune::BCRSMatrix<Dune::FieldMatrix<double,Dim,Dim>>)
INSTANCE_FM(1)

93
opm/simulators/linalg/MILU.hpp
View File

@ -1,5 +1,5 @@
/*
Copyright 2015 Dr. Blatt - HPC-Simulation-Software & Services
Copyright 2015, 2022 Dr. Blatt - HPC-Simulation-Software & Services
Copyright 2015 Statoil AS
This file is part of the Open Porous Media project (OPM).
@ -22,9 +22,12 @@
#include <cmath>
#include <cstddef>
#include <functional>
#include <string>
#include <vector>
namespace Opm
{
@ -43,9 +46,26 @@ enum class MILU_VARIANT{
MILU_VARIANT convertString2Milu(const std::string& milu);
namespace detail
{
template <typename T>
T identityFunctor(const T&);
template <typename T>
T oneFunctor(const T&);
template <typename T>
T signFunctor(const T&);
template <typename T>
T isPositiveFunctor(const T&);
template <typename T>
T absFunctor(const T&);
struct Reorderer
{
virtual std::size_t operator[](std::size_t i) const = 0;
@ -72,74 +92,21 @@ struct RealReorderer : public Reorderer
const std::vector<std::size_t>* ordering_;
};
struct IdentityFunctor
{
template<class T>
T operator()(const T& t)
{
return t;
}
};
struct OneFunctor
{
template<class T>
T operator()(const T&)
{
return 1.0;
}
};
struct SignFunctor
{
template<class T>
double operator()(const T& t)
{
if (t < 0.0)
{
return -1;
}
else
{
return 1.0;
}
}
};
template<class M>
using FieldFunct = std::function<typename M::field_type(const typename M::field_type&)>;
struct IsPositiveFunctor
{
template<class T>
double operator()(const T& t)
{
if (t < 0.0)
{
return 0;
}
else
{
return 1;
}
}
};
struct AbsFunctor
{
template<class T>
T operator()(const T& t)
{
return std::abs(t);
}
};
template<class M, class F1=IdentityFunctor, class F2=OneFunctor >
void milu0_decomposition(M& A, F1 absFunctor = F1(), F2 signFunctor = F2(),
template <typename M>
void milu0_decomposition(M& A, FieldFunct<M> absFunctor = signFunctor<typename M::field_type>,
FieldFunct<M> signFunctor = oneFunctor<typename M::field_type>,
std::vector<typename M::block_type>* diagonal = nullptr);
template<class M>
void milu0_decomposition(M& A,
std::vector<typename M::block_type>* diagonal)
void milu0_decomposition(M& A, std::vector<typename M::block_type>* diagonal)
{
milu0_decomposition(A, detail::IdentityFunctor(), detail::OneFunctor(),
diagonal);
}
milu0_decomposition(A, identityFunctor<typename M::field_type>, oneFunctor<typename M::field_type>, diagonal);
};
template<class M>
void milun_decomposition(const M& A, int n, MILU_VARIANT milu, M& ILU,

14
opm/simulators/linalg/ParallelOverlappingILU0_impl.hpp
View File

@ -1,5 +1,5 @@
/*
Copyright 2015 Dr. Blatt - HPC-Simulation-Software & Services
Copyright 2015, 2022 Dr. Blatt - HPC-Simulation-Software & Services
Copyright 2015 Statoil AS
This file is part of the Open Porous Media project (OPM).
@ -442,16 +442,16 @@ update()
detail::milu0_decomposition ( *ILU);
break;
case MILU_VARIANT::MILU_2:
detail::milu0_decomposition ( *ILU, detail::IdentityFunctor(),
detail::SignFunctor() );
detail::milu0_decomposition ( *ILU, detail::identityFunctor<typename Matrix::field_type>,
detail::signFunctor<typename Matrix::field_type> );
break;
case MILU_VARIANT::MILU_3:
detail::milu0_decomposition ( *ILU, detail::AbsFunctor(),
detail::SignFunctor() );
detail::milu0_decomposition ( *ILU, detail::absFunctor<typename Matrix::field_type>,
detail::signFunctor<typename Matrix::field_type> );
break;
case MILU_VARIANT::MILU_4:
detail::milu0_decomposition ( *ILU, detail::IdentityFunctor(),
detail::IsPositiveFunctor() );
detail::milu0_decomposition ( *ILU, detail::identityFunctor<typename Matrix::field_type>,
detail::isPositiveFunctor<typename Matrix::field_type> );
break;
default:
if (interiorSize_ == A_->N())