OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing some compiler warnings

Browse Source
This commit is contained in:
Mark Berrill 2016-01-12 14:41:22 -05:00
parent aca03a5b29
commit 5d139fe9bc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
analysis/analysis.cpp
View File

@ -496,7 +496,7 @@ void gatherSrcIDMap( map_type& src_map, MPI_Comm comm )
const std::map<BlobIDType,int64_t>& src_ids = it->second;
send_data.push_back(id);
send_data.push_back(src_ids.size());
typename std::map<BlobIDType,int64_t>::const_iterator it2;
std::map<BlobIDType,int64_t>::const_iterator it2;
for (it2=src_ids.begin(); it2!=src_ids.end(); ++it2) {
send_data.push_back(it2->first);
send_data.push_back(it2->second);

4
tests/TestBlobIdentify.cpp
View File

@ -91,7 +91,7 @@ std::vector<bubble_struct> create_bubbles( int N_bubbles, double Lx, double Ly,
}
}
size_t N_bytes = N_bubbles*sizeof(bubble_struct);
MPI_Bcast(&bubbles[0],N_bytes,MPI_CHAR,0,comm);
MPI_Bcast((char*)&bubbles[0],N_bytes,MPI_CHAR,0,comm);
return bubbles;
}
@ -297,7 +297,7 @@ int main(int argc, char **argv)
velocity[i].z = bubbles[i].radius*(2*rand2()-1);
}
}
MPI_Bcast(&velocity[0],bubbles.size()*sizeof(Point),MPI_CHAR,0,comm);
MPI_Bcast((char*)&velocity[0],bubbles.size()*sizeof(Point),MPI_CHAR,0,comm);
fillBubbleData( bubbles, Phase, SignDist, Lx, Ly, Lz, rank_info );
fillData.fill(Phase);
fillData.fill(SignDist);

4
tests/TestCommD3Q19.cpp
View File

@ -247,8 +247,8 @@ int main(int argc, char **argv)
MPI_Bcast(&Nx,1,MPI_INT,0,comm);
MPI_Bcast(&Ny,1,MPI_INT,0,comm);
MPI_Bcast(&Nz,1,MPI_INT,0,comm);
MPI_Bcast(&nBlocks,1,MPI_INT,0,comm);
MPI_Bcast(&nthreads,1,MPI_INT,0,comm);
MPI_Bcast(&nBlocks,1,MPI_UNSIGNED,0,comm);
MPI_Bcast(&nthreads,1,MPI_UNSIGNED,0,comm);
MPI_Bcast(&timestepMax,1,MPI_INT,0,comm);
MPI_Bcast(&Nx,1,MPI_INT,0,comm);