Skip to content
Snippets Groups Projects
Commit 83b679fe authored by Markus Blatt's avatar Markus Blatt
Browse files

Now uses SLListModifyIterator for inserting etries into and deleting

entries from single linked list.

[[Imported from SVN: r1867]]
parent 0c1fee65
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@ void deleteOverlapEntries(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>& ind
typedef typename RemoteIndices::RemoteIndexList::iterator RemoteIterator;
typedef Dune::SLList<TG, typename RemoteIndices::RemoteIndexList::Allocator> GlobalList;
typedef typename GlobalList::iterator GlobalIterator;
typedef Dune::Tuple<RemoteIterator,RemoteIterator,GlobalIterator,const RemoteIterator> IteratorTuple;
typedef Dune::Tuple<RemoteIterator,RemoteIterator,const RemoteIterator> IteratorTuple;
typedef std::map<int,IteratorTuple> IteratorMap;
typedef typename RemoteIndices::RemoteIndexMap::iterator RemoteMapIterator;
......@@ -43,7 +43,6 @@ void deleteOverlapEntries(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>& ind
iterators.insert(std::make_pair(remote->first,
IteratorTuple(remote->second.first->oneBeforeBegin(),
remote->second.first->begin(),
gList.oneBeforeBegin(),
rend
)));
}
......@@ -64,15 +63,14 @@ void deleteOverlapEntries(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>& ind
for(iterator remote = iterators.begin();
remote != end; ++remote) {
// Search for the index
while(Dune::Element<1>::get(remote->second) != Dune::Element<3>::get(remote->second)
while(Dune::Element<1>::get(remote->second) != Dune::Element<2>::get(remote->second)
&& Dune::Element<1>::get(remote->second)->localIndexPair().global() < index->global()) {
// increment all iterators
++(Dune::Element<0>::get(remote->second));
++(Dune::Element<1>::get(remote->second));
++(Dune::Element<2>::get(remote->second));
}
// Delete the entry if present
if(Dune::Element<1>::get(remote->second) != Dune::Element<3>::get(remote->second)
if(Dune::Element<1>::get(remote->second) != Dune::Element<2>::get(remote->second)
&& Dune::Element<1>::get(remote->second)->localIndexPair().global() == index->global()) {
assert(&Dune::Element<1>::get(remote->second)->localIndexPair()==&(*index));
......@@ -83,7 +81,6 @@ void deleteOverlapEntries(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>& ind
// Delete entries
Dune::Element<0>::get(remote->second).deleteNext();
Dune::Element<2>::get(remote->second).deleteNext();
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment