diff --git a/opm/autodiff/AdditionalObjectDeleter.hpp b/opm/autodiff/AdditionalObjectDeleter.hpp new file mode 100644 index 000000000..985bf741f --- /dev/null +++ b/opm/autodiff/AdditionalObjectDeleter.hpp @@ -0,0 +1,58 @@ + /* + Copyright 2015 Dr. Blatt - HPC-Simulation-Software & Services + Copyright 2015 Statoil AS + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ +#ifndef OPM_ADDITIONALOBJECTDELETER_HEADER_INCLUDED +#define OPM_ADDITIONALOBJECTDELETER_HEADER_INCLUDED +namespace Opm +{ +//! \brief A custom deleter that will delete an additional object, too. +//! +//! In dune-istl most parallel preconditioners hold a reference to +//! a sequential preconditioner. +//! In CPRPreconditioner and NewtonIterationBlackoilInterleaved we use unique_ptr +//! for the memory management. +//! Ergo we need to construct the sequential preconditioner with new and +//! make sure that it gets deleted together with the enclosing parallel +//! preconditioner. Therefore this deleter stores a pointer to it and deletes +//! it during destruction. +//! \tparam The type of the additional object to be deleted. +template +class AdditionalObjectDeleter +{ +public: + //! \brief empty constructor. + AdditionalObjectDeleter() + : additional_object_() + {} + //! \brief Constructor taking the object that needs to deleted. + AdditionalObjectDeleter(T& additional_object) + : additional_object_(&additional_object){} + //! \brief Delete an object and the additional one. + template + void operator()(T1* pt) + { + delete pt; + delete additional_object_; + } +private: + T* additional_object_; +}; + +} +#endif diff --git a/opm/autodiff/CPRPreconditioner.hpp b/opm/autodiff/CPRPreconditioner.hpp index 91a5962de..816ba0cee 100644 --- a/opm/autodiff/CPRPreconditioner.hpp +++ b/opm/autodiff/CPRPreconditioner.hpp @@ -47,36 +47,12 @@ #include #include +#include +#include namespace Opm { namespace { -//! \brief A custom deleter for the parallel preconditioners. -//! -//! In dune-istl they hold a reference to the sequential preconditioner. -//! In CPRPreconditioner we use unique_ptr for the memory management. -//! Ergo we need to construct the sequential preconditioner with new and -//! make sure that it gets deleted together with the enclosing parallel -//! preconditioner. Therefore this deleter stores a pointer to it and deletes -//! it during destruction. -template -class ParallelPreconditionerDeleter -{ -public: - ParallelPreconditionerDeleter() - : ilu_() - {} - ParallelPreconditionerDeleter(PREC& ilu) - : ilu_(&ilu){} - template - void operator()(T* pt) - { - delete pt; - delete ilu_; - } -private: - PREC* ilu_; -}; /// /// \brief A traits class for selecting the types of the preconditioner. /// @@ -124,7 +100,7 @@ struct CPRSelector > EllipticPreconditioner; /// \brief The type of the unique pointer to the preconditioner of the elliptic part. typedef std::unique_ptr > > + AdditionalObjectDeleter > > EllipticPreconditionerPointer; typedef EllipticPreconditioner Smoother; @@ -146,11 +122,11 @@ struct CPRSelector > //! \param ilu A reference to the wrapped preconditioner //! \param p The parallel information for template parameter deduction. template -ParallelPreconditionerDeleter +AdditionalObjectDeleter createParallelDeleter(ILU& ilu, const Dune::OwnerOverlapCopyCommunication& p) { (void) p; - return ParallelPreconditionerDeleter(ilu); + return AdditionalObjectDeleter(ilu); } #endif