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

Fixing some compile warnings

Browse Source
This commit is contained in:
Mark Berrill 2017-09-14 08:40:35 -04:00
parent adbd8d2937
commit 182a661fdf
3 changed files with 153 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/lbpm_serial_decomp.cpp
View File

@ -41,11 +41,11 @@ int main(int argc, char **argv)
//....................................................................... //.......................................................................
int nprocs, nprocx, nprocy, nprocz, nx, ny, nz, nspheres; int nprocs, nprocx, nprocy, nprocz, nx, ny, nz, nspheres;
double Lx, Ly, Lz; double Lx, Ly, Lz;
uint64_t Nx,Ny,Nz; int64_t Nx,Ny,Nz;
uint64_t i,j,k,n; int64_t i,j,k,n;
int BC=0; int BC=0;
char Filename[40]; char Filename[40];
uint64_t xStart,yStart,zStart; int64_t xStart,yStart,zStart;
// char fluidValue,solidValue; // char fluidValue,solidValue;
std::vector<char> solidValues; std::vector<char> solidValues;
@ -80,8 +80,8 @@ int main(int argc, char **argv)
char *SegData = NULL; char *SegData = NULL;
// Rank=0 reads the entire segmented data and distributes to worker processes // Rank=0 reads the entire segmented data and distributes to worker processes
if (rank==0){ if (rank==0){
printf("Dimensions of segmented image: %i x %i x %i \n",Nx,Ny,Nz); printf("Dimensions of segmented image: %ld x %ld x %ld \n",Nx,Ny,Nz);
uint64_t SIZE = Nx*Ny*Nz; int64_t SIZE = Nx*Ny*Nz;
SegData = new char[SIZE]; SegData = new char[SIZE];
FILE *SEGDAT = fopen(Filename,"rb"); FILE *SEGDAT = fopen(Filename,"rb");
if (SEGDAT==NULL) ERROR("Error reading segmented data"); if (SEGDAT==NULL) ERROR("Error reading segmented data");
@ -93,10 +93,10 @@ int main(int argc, char **argv)
} }
// Get the rank info // Get the rank info
uint64_t N = (nx+2)*(ny+2)*(nz+2); int64_t N = (nx+2)*(ny+2)*(nz+2);
// number of sites to use for periodic boundary condition transition zone // number of sites to use for periodic boundary condition transition zone
uint64_t z_transition_size = (nprocz*nz - (Nz - zStart))/2; int64_t z_transition_size = (nprocz*nz - (Nz - zStart))/2;
if (z_transition_size < 0) z_transition_size=0; if (z_transition_size < 0) z_transition_size=0;
char LocalRankFilename[40]; char LocalRankFilename[40];
@ -108,7 +108,7 @@ int main(int argc, char **argv)
printf("Distributing subdomains across %i processors \n",nprocs); printf("Distributing subdomains across %i processors \n",nprocs);
printf("Process grid: %i x %i x %i \n",nprocx,nprocy,nprocz); printf("Process grid: %i x %i x %i \n",nprocx,nprocy,nprocz);
printf("Subdomain size: %i x %i x %i \n",nx,ny,nz); printf("Subdomain size: %i x %i x %i \n",nx,ny,nz);
printf("Size of transition region: %i \n", z_transition_size); printf("Size of transition region: %ld \n", z_transition_size);
for (int kp=0; kp<nprocz; kp++){ for (int kp=0; kp<nprocz; kp++){
for (int jp=0; jp<nprocy; jp++){ for (int jp=0; jp<nprocy; jp++){
@ -119,14 +119,14 @@ int main(int argc, char **argv)
for (k=0;k<nz+2;k++){ for (k=0;k<nz+2;k++){
for (j=0;j<ny+2;j++){ for (j=0;j<ny+2;j++){
for (i=0;i<nx+2;i++){ for (i=0;i<nx+2;i++){
uint64_t x = xStart + ip*nx + i-1; int64_t x = xStart + ip*nx + i-1;
uint64_t y = yStart + jp*ny + j-1; int64_t y = yStart + jp*ny + j-1;
// uint64_t z = zStart + kp*nz + k-1; // int64_t z = zStart + kp*nz + k-1;
uint64_t z = zStart + kp*nz + k-1 - z_transition_size; int64_t z = zStart + kp*nz + k-1 - z_transition_size;
if (z<zStart) z=zStart; if (z<zStart) z=zStart;
if (!(z<Nz)) z=Nz-1; if (!(z<Nz)) z=Nz-1;
uint64_t nlocal = k*(nx+2)*(ny+2) + j*(nx+2) + i; int64_t nlocal = k*(nx+2)*(ny+2) + j*(nx+2) + i;
uint64_t nglobal = z*Nx*Ny+y*Nx+x; int64_t nglobal = z*Nx*Ny+y*Nx+x;
loc_id[nlocal] = SegData[nglobal]; loc_id[nlocal] = SegData[nglobal];
} }
} }

11
threadpool/thread_pool.cpp
View File

@ -544,9 +544,8 @@ void ThreadPool::check_startup( size_t size0 )
id2.reset( 3, d_id_assign, nullptr ); id2.reset( 3, d_id_assign, nullptr );
if ( isValid( id ) || !isValid( id2 ) ) if ( isValid( id ) || !isValid( id2 ) )
pass = false; pass = false;
if ( !pass ) { if ( !pass )
throw std::logic_error( "Thread pool failed to initialize" ); throw std::logic_error( "Thread pool failed to initialize" );
}
} }
@ -584,8 +583,10 @@ void ThreadPool::initialize( const int N, const char *affinity, int N_procs, con
******************************************************************/ ******************************************************************/
ThreadPool::~ThreadPool() ThreadPool::~ThreadPool()
{ {
if ( !is_valid( this ) ) if ( !is_valid( this ) ) {
throw std::logic_error( "Thread pool is not valid" ); std::cerr << "Thread pool is not valid\n";
std::terminate();
}
// Destroy the threads // Destroy the threads
setNumThreads( 0 ); setNumThreads( 0 );
// Delete all remaining data // Delete all remaining data
@ -593,8 +594,8 @@ ThreadPool::~ThreadPool()
d_NULL_HEAD = 0; d_NULL_HEAD = 0;
d_NULL_TAIL = 0; d_NULL_TAIL = 0;
delete d_wait_last; delete d_wait_last;
// Print the performance metrics
#if MONITOR_THREADPOOL_PERFORMANCE == 1 #if MONITOR_THREADPOOL_PERFORMANCE == 1
// Print the performance metrics
printp( "ThreadPool Performance:\n" ); printp( "ThreadPool Performance:\n" );
printp( "add_work: %lu us, %lu us, %lu us, %lu us, %lu us\n", printp( "add_work: %lu us, %lu us, %lu us, %lu us, %lu us\n",
total_add_work_time[0]/1000, total_add_work_time[1]/1000, total_add_work_time[0]/1000, total_add_work_time[1]/1000,