Commit c46cba15 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

remove some conversion warnings

parent a8554166
...@@ -37,7 +37,7 @@ class FMpiBufferWriter : public FAbstractBufferWriter { ...@@ -37,7 +37,7 @@ class FMpiBufferWriter : public FAbstractBufferWriter {
/** Test and exit if not enought space */ /** Test and exit if not enought space */
void expandIfNeeded(const size_t requestedSpace) { void expandIfNeeded(const size_t requestedSpace) {
if( arrayCapacity < int(currentIndex + requestedSpace) ){ if( arrayCapacity < int(currentIndex + requestedSpace) ){
arrayCapacity = int((currentIndex + requestedSpace + 1) * 1.5); arrayCapacity = int(double(currentIndex + requestedSpace + 1) * 1.5);
char* arrayTmp = new char[arrayCapacity]; char* arrayTmp = new char[arrayCapacity];
memcpy(arrayTmp, array.get(), sizeof(char)*currentIndex); memcpy(arrayTmp, array.get(), sizeof(char)*currentIndex);
array.reset(arrayTmp); array.reset(arrayTmp);
......
...@@ -674,7 +674,7 @@ private: ...@@ -674,7 +674,7 @@ private:
for(int idxProc = 0 ; idxProc < nbProcess ; ++idxProc){ for(int idxProc = 0 ; idxProc < nbProcess ; ++idxProc){
const long long int toSendAtProcAtLevel = indexToSend[idxLevel * nbProcess + idxProc]; const long long int toSendAtProcAtLevel = indexToSend[idxLevel * nbProcess + idxProc];
if(toSendAtProcAtLevel != 0){ if(toSendAtProcAtLevel != 0){
sendBuffer[idxLevel * nbProcess + idxProc] = new FMpiBufferWriter(comm.getComm(),toSendAtProcAtLevel); sendBuffer[idxLevel * nbProcess + idxProc] = new FMpiBufferWriter(comm.getComm(),int(toSendAtProcAtLevel));
sendBuffer[idxLevel * nbProcess + idxProc]->write(int(toSend[idxLevel * nbProcess + idxProc].getSize())); sendBuffer[idxLevel * nbProcess + idxProc]->write(int(toSend[idxLevel * nbProcess + idxProc].getSize()));
...@@ -693,7 +693,7 @@ private: ...@@ -693,7 +693,7 @@ private:
const long long int toReceiveFromProcAtLevel = globalReceiveMap[(idxProc * nbProcess * OctreeHeight) + idxLevel * nbProcess + idProcess]; const long long int toReceiveFromProcAtLevel = globalReceiveMap[(idxProc * nbProcess * OctreeHeight) + idxLevel * nbProcess + idProcess];
if(toReceiveFromProcAtLevel){ if(toReceiveFromProcAtLevel){
recvBuffer[idxLevel * nbProcess + idxProc] = new FMpiBufferReader(comm.getComm(),toReceiveFromProcAtLevel); recvBuffer[idxLevel * nbProcess + idxProc] = new FMpiBufferReader(comm.getComm(),int(toReceiveFromProcAtLevel));
FMpi::MpiAssert( MPI_Irecv(recvBuffer[idxLevel * nbProcess + idxProc]->data(), FMpi::MpiAssert( MPI_Irecv(recvBuffer[idxLevel * nbProcess + idxProc]->data(),
recvBuffer[idxLevel * nbProcess + idxProc]->getCapacity(), MPI_PACKED,idxProc, recvBuffer[idxLevel * nbProcess + idxProc]->getCapacity(), MPI_PACKED,idxProc,
......
Supports Markdown
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