Commit 21017269 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

And a fix of the fix, thanks Thomas for bug reporting.

parent 747241d3
...@@ -2215,7 +2215,7 @@ namespace AMDiS { ...@@ -2215,7 +2215,7 @@ namespace AMDiS {
// DOFs. I'm note sure what is correct here. // DOFs. I'm note sure what is correct here.
for (map<int, PeriodicDofMap>::iterator it = stdMpi2.getRecvData().begin(); for (map<int, PeriodicDofMap>::iterator it = stdMpi2.getRecvData().begin();
it != stdMpi2.getRecvData().end(); ++it) it != stdMpi2.getRecvData().end(); ++it)
periodicMap.add(feSpace, it->second, false); periodicMap.add(feSpace, it->second);
} }
......
...@@ -16,15 +16,14 @@ ...@@ -16,15 +16,14 @@
namespace AMDiS { namespace AMDiS {
void PeriodicMap::add(const FiniteElemSpace *feSpace, void PeriodicMap::add(const FiniteElemSpace *feSpace,
PeriodicDofMap &newMap, PeriodicDofMap &newMap)
bool a)
{ {
FUNCNAME("PeriodicMap::add()"); FUNCNAME("PeriodicMap::add()");
for (PeriodicDofMap::iterator it = newMap.begin(); it != newMap.end(); ++it) for (PeriodicDofMap::iterator it = newMap.begin(); it != newMap.end(); ++it)
for (DofMap::iterator dofIt =it->second.begin(); for (DofMap::iterator dofIt =it->second.begin();
dofIt != it->second.end(); ++dofIt) dofIt != it->second.end(); ++dofIt)
add(feSpace, it->first, dofIt->second, dofIt->first, a); add(feSpace, it->first, dofIt->second, dofIt->first);
} }
......
...@@ -101,8 +101,7 @@ namespace AMDiS { ...@@ -101,8 +101,7 @@ namespace AMDiS {
/// this DOFs that maps to a different DOF index than the given one. /// this DOFs that maps to a different DOF index than the given one.
inline void add(const FiniteElemSpace *feSpace, inline void add(const FiniteElemSpace *feSpace,
BoundaryType type, BoundaryType type,
DegreeOfFreedom dof0, DegreeOfFreedom dof1, DegreeOfFreedom dof0, DegreeOfFreedom dof1)
bool a = true)
{ {
FUNCNAME("PeriodicMap::map()"); FUNCNAME("PeriodicMap::map()");
...@@ -111,13 +110,12 @@ namespace AMDiS { ...@@ -111,13 +110,12 @@ namespace AMDiS {
("Should not happen!\n"); ("Should not happen!\n");
periodicDofMap[feSpace][type][dof0] = dof1; periodicDofMap[feSpace][type][dof0] = dof1;
if (a) periodicDofAssociations[feSpace][dof0].insert(type);
periodicDofAssociations[feSpace][dof0].insert(type);
} }
/// Adds a whole periodic mapping to the current one. /// Adds a whole periodic mapping to the current one.
void add(const FiniteElemSpace *feSpace, PeriodicDofMap &newMap, bool a = true); void add(const FiniteElemSpace *feSpace, PeriodicDofMap &newMap);
/// For a given global DOF index, this function returns the set of periodic /// For a given global DOF index, this function returns the set of periodic
......
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