Commit ffd2dfd1 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Complete revert from last commit.

Sorry for the noise.
(thanks bernd for the heads-up, again)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13467 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 539d8f4f
......@@ -79,48 +79,48 @@ public:
return elementMapper_;
}
auto map(const Element& element) const
int map(const Element& element) const
{
return elementMapper_.map(element);
}
auto map(int elemIdx, int faceIdx)
int map(int elemIdx, int faceIdx)
{
return intersectionMapGlobal_[elemIdx][faceIdx];
}
auto map(int elemIdx, int faceIdx) const
int map(int elemIdx, int faceIdx) const
{
return (intersectionMapGlobal_[elemIdx].find(faceIdx))->second;//use find() for const function!
}
auto map(const Element& element, int faceIdx)
int map(const Element& element, int faceIdx)
{
return intersectionMapGlobal_[map(element)][faceIdx];
}
auto map(const Element& element, int faceIdx) const
int map(const Element& element, int faceIdx) const
{
return intersectionMapGlobal_[map(element)].find(faceIdx)->second;//use find() for const function!
}
auto maplocal(int elemIdx, int faceIdx)
int maplocal(int elemIdx, int faceIdx)
{
return intersectionMapLocal_[elemIdx][faceIdx];
}
auto maplocal(int elemIdx, int faceIdx) const
int maplocal(int elemIdx, int faceIdx) const
{
return (intersectionMapLocal_[elemIdx].find(faceIdx))->second;//use find() for const function!
}
auto maplocal(const Element& element, int faceIdx)
int maplocal(const Element& element, int faceIdx)
{
return intersectionMapLocal_[map(element)][faceIdx];
}
auto maplocal(const Element& element, int faceIdx) const
int maplocal(const Element& element, int faceIdx) const
{
return (intersectionMapLocal_[map(element)].find(faceIdx))->second;//use find() for const function!
}
......
......@@ -68,14 +68,14 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
auto vIdx = mapper_.map(e);
int vIdx = mapper_.map(e);
buff.write(container_[vIdx]);
}
template<class MessageBufferImp, class EntityType>
void scatter(MessageBufferImp &buff, const EntityType &e, size_t n)
{
auto vIdx = mapper_.map(e);
int vIdx = mapper_.map(e);
FieldType tmp;
buff.read(tmp);
......@@ -126,14 +126,14 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
auto vIdx = mapper_.map(e);
int vIdx = mapper_.map(e);
buff.write(container_[vIdx]);
}
template<class MessageBufferImp, class EntityType>
void scatter(MessageBufferImp &buff, const EntityType &e, size_t n)
{
auto vIdx = mapper_.map(e);
int vIdx = mapper_.map(e);
FieldType tmp;
buff.read(tmp);
......@@ -185,14 +185,14 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
auto vIdx = mapper_.map(e);
int vIdx = mapper_.map(e);
buff.write(container_[vIdx]);
}
template<class MessageBufferImp, class EntityType>
void scatter(MessageBufferImp &buff, const EntityType &e, size_t n)
{
auto vIdx = mapper_.map(e);
int vIdx = mapper_.map(e);
FieldType tmp;
buff.read(tmp);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment