From a45de0cadf5a4bf59871bc1ad995c21fbb297e81 Mon Sep 17 00:00:00 2001
From: Berenger Bramas <bbramas@mpcdf.mpg.de>
Date: Mon, 10 Apr 2017 15:47:27 +0200
Subject: [PATCH] Remove warnings for Draco
---
bfps/cpp/particles/abstract_particles_output.hpp | 2 +-
bfps/cpp/particles/alltoall_exchanger.hpp | 8 ++++----
bfps/cpp/particles/particles_input_hdf5.hpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bfps/cpp/particles/abstract_particles_output.hpp b/bfps/cpp/particles/abstract_particles_output.hpp
index ecf42cfe..41e02599 100644
--- a/bfps/cpp/particles/abstract_particles_output.hpp
+++ b/bfps/cpp/particles/abstract_particles_output.hpp
@@ -133,7 +133,7 @@ public:
nb_particles_allocated_recv = nb_to_receive;
}
- exchanger.alltoallv(buffer_particles_send.get(), buffer_particles_recv.get(), mpi_movable_particle_type);
+ exchanger.alltoallv_dt(buffer_particles_send.get(), buffer_particles_recv.get(), mpi_movable_particle_type);
// Trick re-use the buffer to have only real_number
diff --git a/bfps/cpp/particles/alltoall_exchanger.hpp b/bfps/cpp/particles/alltoall_exchanger.hpp
index de549e6e..7b7d4391 100644
--- a/bfps/cpp/particles/alltoall_exchanger.hpp
+++ b/bfps/cpp/particles/alltoall_exchanger.hpp
@@ -60,7 +60,7 @@ public:
}
template <class ItemType>
- void alltoallv(const ItemType in_to_send[],
+ void alltoallv_dt(const ItemType in_to_send[],
ItemType out_to_recv[], const MPI_Datatype& in_type) const {
TIMEZONE("alltoallv");
AssertMpi(MPI_Alltoallv(const_cast<ItemType*>(in_to_send), const_cast<int*>(nb_items_to_send.data()),
@@ -72,11 +72,11 @@ public:
template <class ItemType>
void alltoallv(const ItemType in_to_send[],
ItemType out_to_recv[]) const {
- alltoallv<ItemType>(in_to_send, out_to_recv, particles_utils::GetMpiType(ItemType()));
+ alltoallv_dt<ItemType>(in_to_send, out_to_recv, particles_utils::GetMpiType(ItemType()));
}
template <class ItemType>
- void alltoallv(const ItemType in_to_send[],
+ void alltoallv_dt(const ItemType in_to_send[],
ItemType out_to_recv[], const MPI_Datatype& in_type, const int in_nb_values_per_item) const {
TIMEZONE("alltoallv");
std::vector<int> nb_items_to_send_tmp = nb_items_to_send;
@@ -101,7 +101,7 @@ public:
template <class ItemType>
void alltoallv(const ItemType in_to_send[],
ItemType out_to_recv[], const int in_nb_values_per_item) const {
- alltoallv<ItemType>(in_to_send, out_to_recv,particles_utils::GetMpiType(ItemType()), in_nb_values_per_item);
+ alltoallv_dt<ItemType>(in_to_send, out_to_recv,particles_utils::GetMpiType(ItemType()), in_nb_values_per_item);
}
};
diff --git a/bfps/cpp/particles/particles_input_hdf5.hpp b/bfps/cpp/particles/particles_input_hdf5.hpp
index bd4fece6..fbd29abf 100644
--- a/bfps/cpp/particles/particles_input_hdf5.hpp
+++ b/bfps/cpp/particles/particles_input_hdf5.hpp
@@ -74,7 +74,7 @@ public:
AssertMpi(MPI_Comm_rank(mpi_comm, &my_rank));
AssertMpi(MPI_Comm_size(mpi_comm, &nb_processes));
- assert(in_spatial_limit_per_proc.size() == nb_processes+1);
+ assert(int(in_spatial_limit_per_proc.size()) == nb_processes+1);
hid_t plist_id_par = H5Pcreate(H5P_FILE_ACCESS);
assert(plist_id_par >= 0);
--
GitLab