Commit 79bcb0ed authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Fixed a sequential problem in ARH reader.

parent 09c533ad
......@@ -36,12 +36,20 @@ namespace AMDiS {
DOFVector<double>* vec0 = NULL,
DOFVector<double>* vec1 = NULL,
DOFVector<double>* vec2 = NULL,
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
bool writeParallel = true,
#else
bool writeParallel = false,
#endif
int nProcs = -1);
static void read(string filename, Mesh *mesh,
vector<DOFVector<double>*> vecs,
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
bool writeParallel = true,
#else
bool writeParallel = false,
#endif
int nProcs = -1);
static int getNumValueVectors(string filename)
......
......@@ -290,8 +290,10 @@ namespace AMDiS {
pair<DegreeOfFreedom, DegreeOfFreedom> testVertex =
make_pair(it->first.second, it->first.first);
TEST_EXIT_DBG(periodicVertices.count(testVertex) == 1)("Should not happen!\n");
TEST_EXIT_DBG(periodicVertices[testVertex] == it->second)("Should not happen!\n");
TEST_EXIT_DBG(periodicVertices.count(testVertex) == 1)
("Should not happen!\n");
TEST_EXIT_DBG(periodicVertices[testVertex] == it->second)
("Should not happen!\n");
}
for (PerBoundMap<DofEdge>::iterator it = periodicEdges.begin();
......
......@@ -315,7 +315,8 @@ namespace AMDiS {
}
/// Returns a vector with all macro elements that have a given vertex DOF in common.
/// Returns a vector with all macro elements that have a given vertex DOF
/// in common.
vector<ElementObjectData>& getElements(DegreeOfFreedom vertex)
{
return vertexElements[vertex];
......@@ -334,7 +335,8 @@ namespace AMDiS {
}
/// Returns a vector with all macro elements that have a given vertex DOF in common.
/// Returns a vector with all macro elements that have a given vertex DOF
/// in common.
vector<ElementObjectData>& getElementsVertex(int elIndex, int ithVertex)
{
ElementObjectData elObj(elIndex, ithVertex);
......@@ -506,7 +508,8 @@ namespace AMDiS {
void deserialize(istream &in, map<int, ElementObjectData>& data);
private:
/// The mesh that is used to store all its element information in the database.
/// The mesh that is used to store all its element information in
/// the database.
Mesh *mesh;
/// Maps to each vertex DOF all element objects that represent this vertex.
......
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