diff --git a/src/Configuration.cpp b/src/Configuration.cpp index e0477785132816e068b7a9dea72a2a64b7469178..e18fc06b5dbc25e3319362f3fdebaf8cc266bd03 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -549,8 +549,8 @@ Configuration::~Configuration() { partGridFileScale[i] = NULL; } } - delete partGridFile; - delete partGridFileScale; + delete [] partGridFile; + delete [] partGridFileScale; //delete numPartGridFiles; delete[] partForceXGridFile; delete[] partForceYGridFile; @@ -795,7 +795,7 @@ void Configuration::setDefaults() { readProductPotentialsFromFile = false; numProductPotentials = 0; - + productPotentials = NULL; readRestraintsFromFile = false; numRestraints = 0; diff --git a/src/GPUManager.cpp b/src/GPUManager.cpp index 0353197101c2e3ba8dbd6bbf0e9e769169e1c7ef..df56a55013644ea2a2eaa2226d5af12b710c4662 100644 --- a/src/GPUManager.cpp +++ b/src/GPUManager.cpp @@ -138,15 +138,6 @@ void GPUManager::sync(int gpu_id) { // gpuErrchk( cudaSetDevice(gpus[gpu_id].id) ); // gpuErrchk( cudaSetDevice(wg_curr) ); } -void GPUManager::sync() { - int curr; - gpuErrchk( cudaGetDevice(&curr) ); - for (auto it = gpus.begin(); it != gpus.end(); ++it) { - gpuErrchk( cudaSetDevice(it->id) ); - gpuErrchk( cudaDeviceSynchronize() ); - } - gpuErrchk( cudaSetDevice(curr) ); -} int GPUManager::current() { int c;