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

Do not reimplement null_deleter from dune-common.

Browse Source 
Instead we use Dune::stackobject_to_shared_ptr to create a
shared_ptr that does not delete the pointer.
This commit is contained in:
Markus Blatt 2015-02-06 10:41:10 +01:00
parent 39a6e19099
commit dd63c2489f
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
opm/autodiff/ExtractParallelGridInformationToISTL.cpp
View File

@ -21,29 +21,22 @@
#include "ExtractParallelGridInformationToISTL.hpp"
#include <opm/core/linalg/ParallelIstlInformation.hpp>
#include <dune/common/version.hh>
#include <dune/common/shared_ptr.hh>
namespace Opm
{
#if defined(HAVE_DUNE_CORNERPOINT) && DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
#if defined(HAVE_MPI) && defined(HAVE_DUNE_ISTL)
// Extracts the information about the data decomposition from the grid for dune-istl
struct NullDeleter
{
void operator()(void*)
{}
};
void extractParallelGridInformationToISTL(boost::any& anyComm, const Dune::CpGrid& grid)
{
if(grid.comm().size()>1)
{
// this is a parallel run with distributed data.
NullDeleter null_delete;
Dune::CpGrid& mgrid=const_cast<Dune::CpGrid&>(grid);
Dune::CpGrid::ParallelIndexSet* idx=&(mgrid.getCellIndexSet());
Dune::CpGrid::RemoteIndices* ridx=&(mgrid.getCellRemoteIndices());
anyComm=boost::any(Opm::ParallelISTLInformation(std::shared_ptr<Dune::CpGrid::ParallelIndexSet>(idx, null_delete),
std::shared_ptr<Dune::CpGrid::RemoteIndices>(ridx, null_delete),
Dune::CpGrid::ParallelIndexSet& idx=mgrid.getCellIndexSet();
Dune::CpGrid::RemoteIndices& ridx=mgrid.getCellRemoteIndices();
anyComm=boost::any(Opm::ParallelISTLInformation(Dune::stackobject_to_shared_ptr(idx),
Dune::stackobject_to_shared_ptr(ridx),
grid.comm()));
}
}