From 90c0a68a8530123cde1cc9e51202180c4d8b47b4 Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Mon, 4 Jan 2021 12:09:03 -0600
Subject: [PATCH] Correctly free memory in Configuration.cpp for bondAngles
---
src/Configuration.cpp | 6 +++---
src/GPUManager.cpp | 9 ---------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index e047778..e18fc06 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 0353197..df56a55 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;
--
GitLab