Skip to content
Snippets Groups Projects

Feature/fix warnings

Merged Stephan Schulz requested to merge feature/fix_warnings into refactor
All threads resolved!
1 file
+ 13
13
Compare changes
  • Side-by-side
  • Inline
+ 13
13
@@ -239,14 +239,14 @@ void print_points(std::vector<ALL::Point<double>> plist, int step,
weight->SetNumberOfComponents(1);
weight->SetNumberOfTuples(plist.size());
weight->SetName("weight");
for (auto i = 0; i < plist.size(); ++i)
for (auto i = 0; i < (int)plist.size(); ++i)
weight->SetValue(i, plist.at(i).getWeight());
auto domain = vtkSmartPointer<vtkIntArray>::New();
domain->SetNumberOfComponents(1);
domain->SetNumberOfTuples(plist.size());
domain->SetName("domain");
for (auto i = 0; i < plist.size(); ++i)
for (auto i = 0; i < (int)plist.size(); ++i)
domain->SetValue(i, rank);
polydata->GetPointData()->AddArray(weight);
@@ -670,7 +670,7 @@ int main(int argc, char **argv) {
double local_vertex[sys_dim];
if (n_points > 0) {
for (auto v : local_vertex)
for (auto &v : local_vertex)
v = 0.0;
double local_work = 0.0;
@@ -2062,7 +2062,7 @@ int main(int argc, char **argv) {
// all points are sorted into the correct vectors
for (auto p : points) {
for (int n = 0; n < send_neig.size(); ++n) {
for (int n = 0; n < (int)send_neig.size(); ++n) {
int neig_id = send_neig.at(n);
/*
if (localRank == 1)
@@ -2087,7 +2087,7 @@ int main(int argc, char **argv) {
n_points = 0;
std::vector<int> n_send(send_neig.size());
for (int n = 0; n < send_neig.size(); ++n)
for (int n = 0; n < (int)send_neig.size(); ++n)
n_send.at(n) = send_vec.at(n).size();
// communicate number of particles to be send to neighbors
@@ -2098,11 +2098,11 @@ int main(int argc, char **argv) {
std::vector<MPI_Status> ssta(send_neig.size());
std::vector<MPI_Status> rsta(recv_neig.size());
for (int n = 0; n < send_neig.size(); ++n) {
for (int n = 0; n < (int)send_neig.size(); ++n) {
MPI_Isend(n_send.data() + n, 1, MPI_INT, send_neig.at(n), 2000,
comm_col, sreq.data() + n);
}
for (int n = 0; n < recv_neig.size(); ++n) {
for (int n = 0; n < (int)recv_neig.size(); ++n) {
MPI_Irecv(n_recv.data() + n, 1, MPI_INT, recv_neig.at(n), 2000,
comm_col, rreq.data() + n);
}
@@ -2131,7 +2131,7 @@ int main(int argc, char **argv) {
*/
std::vector<std::vector<double>> recv_vec(recv_neig.size());
while (recvs < recv_neig.size()) {
while (recvs < (int)recv_neig.size()) {
int idx;
MPI_Waitany(recv_neig.size(), rreq.data(), &idx, rsta.data());
recv_vec.at(idx).resize(n_recv.at(idx));
@@ -2139,21 +2139,21 @@ int main(int argc, char **argv) {
}
// transfer points from old domains to new domains
for (int n = 0; n < send_neig.size(); ++n) {
for (int n = 0; n < (int)send_neig.size(); ++n) {
MPI_Isend(send_vec.at(n).data(), send_vec.at(n).size(), MPI_DOUBLE,
send_neig.at(n), 3000, comm_col, sreq.data() + n);
}
for (int n = 0; n < recv_neig.size(); ++n) {
for (int n = 0; n < (int)recv_neig.size(); ++n) {
MPI_Irecv(recv_vec.at(n).data(), recv_vec.at(n).size(), MPI_DOUBLE,
recv_neig.at(n), 3000, comm_col, rreq.data() + n);
}
MPI_Waitall(send_neig.size(), sreq.data(), ssta.data());
recvs = 0;
while (recvs < recv_neig.size()) {
while (recvs < (int)recv_neig.size()) {
int idx;
MPI_Waitany(recv_neig.size(), rreq.data(), &idx, rsta.data());
for (int p = 0; p < recv_vec.at(idx).size(); p += 5) {
for (int p = 0; p < (int)recv_vec.at(idx).size(); p += 5) {
ALL::Point<double> tmp(3, recv_vec.at(idx).data() + p,
recv_vec.at(idx).at(p + 3),
(long)(recv_vec.at(idx).at(p + 4)));
@@ -2453,7 +2453,7 @@ int main(int argc, char **argv) {
MPI_Barrier(cart_comm);
MPI_Finalize();
return EXIT_SUCCESS;
} catch (ALL::CustomException e) {
} catch (ALL::CustomException &e) {
std::cout << e.what() << std::endl;
return EXIT_FAILURE;
}
Loading