From e8b64a9080fdb5bf6ce03918c1ca59ebfd298b13 Mon Sep 17 00:00:00 2001
From: stamoor <stamoor@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 26 Sep 2014 18:45:18 +0000
Subject: [PATCH] Fixed memory error in ewald_disp.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12563 f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
 src/KSPACE/ewald_disp.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/KSPACE/ewald_disp.cpp b/src/KSPACE/ewald_disp.cpp
index afbb57f1f1..a8a5bc6d1f 100644
--- a/src/KSPACE/ewald_disp.cpp
+++ b/src/KSPACE/ewald_disp.cpp
@@ -408,8 +408,15 @@ void EwaldDisp::allocate_peratom()
 
 void EwaldDisp::deallocate_peratom()                        // free memory
 {
-  memory->destroy(energy_self_peratom);
-  memory->destroy(virial_self_peratom);
+  if (energy_self_peratom) {
+    memory->destroy(energy_self_peratom);
+    energy_self_peratom = NULL;
+  }
+
+  if (virial_self_peratom) {
+    memory->destroy(virial_self_peratom);
+    virial_self_peratom = NULL;
+  }
 }