Commit 92d14c6f authored by Thomas Witkowski's avatar Thomas Witkowski

Small changes.

parent a9938f46
......@@ -189,9 +189,6 @@ namespace AMDiS {
virtual bool spaceToleranceReached()
{
for (unsigned int i = 0; i < scalContents.size(); i++) {
std::cout << "est_sum:" <<scalContents[i]->est_sum
<< " spaceTol: " << scalContents[i]->spaceTolerance
<< std::endl;
if (!(scalContents[i]->est_sum < scalContents[i]->spaceTolerance))
return false;
}
......
......@@ -579,12 +579,9 @@ namespace AMDiS {
("Wrong number of markers!\n");
Flag markFlag = 0;
for (int i = 0; i < nComponents; i++) {
for (int i = 0; i < nComponents; i++)
if (marker[i])
markFlag |= marker[i]->markMesh(adaptInfo, componentMeshes[i]);
else
WARNING("No marker for component %d\n", i);
}
return markFlag;
}
......
......@@ -19,7 +19,7 @@
#include "Parameters.h"
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
#include "mpi.h"
#include <mpi.h>
#endif
namespace AMDiS {
......
......@@ -28,7 +28,7 @@
#include "Mesh.h"
#if HAVE_PARALLEL_DOMAIN_AMDIS
#include "mpi.h"
#include <mpi.h>
#endif
namespace AMDiS {
......
......@@ -393,15 +393,15 @@ namespace AMDiS {
for (typename map<int, int>::iterator sendIt = sendDataSize.begin();
sendIt != sendDataSize.end(); ++sendIt) {
sendBuffers.push_back(sendIt->second);
request[requestCounter++] =
mpiComm.Isend(&(sendBuffers[i]), 1, MPI_INT, sendIt->first, 0);
request[requestCounter++] =
mpiComm.Isend(&(sendBuffers[i]), 1, MPI_INT, sendIt->first, 0);
i++;
}
for (map<int, int>::iterator recvIt = recvDataSize.begin();
recvIt != recvDataSize.end(); ++recvIt)
request[requestCounter++] =
mpiComm.Irecv(&(recvIt->second), 1, MPI_INT, recvIt->first, 0);
request[requestCounter++] =
mpiComm.Irecv(&(recvIt->second), 1, MPI_INT, recvIt->first, 0);
MPI::Request::Waitall(requestCounter, request);
}
......
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