diff --git a/src/angle.cpp b/src/angle.cpp
index 14433fc44d78eaf09d4594663ac72b4e7329fde9..1366c48865b5daa516b58bba254aa0171eaf3da0 100644
--- a/src/angle.cpp
+++ b/src/angle.cpp
@@ -76,7 +76,7 @@ void Angle::init()
    see integrate::ev_set() for values of eflag (0-3) and vflag (0-6)
 ------------------------------------------------------------------------- */
 
-void Angle::ev_setup(int eflag, int vflag)
+void Angle::ev_setup(int eflag, int vflag, int alloc)
 {
   int i,n;
 
@@ -94,25 +94,29 @@ void Angle::ev_setup(int eflag, int vflag)
 
   if (eflag_atom && atom->nmax > maxeatom) {
     maxeatom = atom->nmax;
-    memory->destroy(eatom);
-    memory->create(eatom,comm->nthreads*maxeatom,"angle:eatom");
+    if (alloc) {
+      memory->destroy(eatom);
+      memory->create(eatom,comm->nthreads*maxeatom,"angle:eatom");
+    }
   }
   if (vflag_atom && atom->nmax > maxvatom) {
     maxvatom = atom->nmax;
-    memory->destroy(vatom);
-    memory->create(vatom,comm->nthreads*maxvatom,6,"angle:vatom");
+    if (alloc) {
+      memory->destroy(vatom);
+      memory->create(vatom,comm->nthreads*maxvatom,6,"angle:vatom");
+    }
   }
 
   // zero accumulators
 
   if (eflag_global) energy = 0.0;
   if (vflag_global) for (i = 0; i < 6; i++) virial[i] = 0.0;
-  if (eflag_atom) {
+  if (eflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) eatom[i] = 0.0;
   }
-  if (vflag_atom) {
+  if (vflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) {
diff --git a/src/angle.h b/src/angle.h
index 8c8129bbbb313432beea11f46a6b6fcb20831e53..000c3fe916d84c1766eeb4dd09dbd082fba61387 100644
--- a/src/angle.h
+++ b/src/angle.h
@@ -58,7 +58,7 @@ class Angle : protected Pointers {
   int vflag_either,vflag_global,vflag_atom;
   int maxeatom,maxvatom;
 
-  void ev_setup(int, int);
+  void ev_setup(int, int, int alloc = 1);
   void ev_tally(int, int, int, int, int, double, double *, double *,
                 double, double, double, double, double, double);
 };
diff --git a/src/bond.cpp b/src/bond.cpp
index 8074d9767766c9524008ed4bd9c1794760daf720..5a33f107cf44ade599dff8b5a9a9b81f00d04386 100644
--- a/src/bond.cpp
+++ b/src/bond.cpp
@@ -79,7 +79,7 @@ void Bond::init()
    see integrate::ev_set() for values of eflag (0-3) and vflag (0-6)
 ------------------------------------------------------------------------- */
 
-void Bond::ev_setup(int eflag, int vflag)
+void Bond::ev_setup(int eflag, int vflag, int alloc)
 {
   int i,n;
 
@@ -97,25 +97,29 @@ void Bond::ev_setup(int eflag, int vflag)
 
   if (eflag_atom && atom->nmax > maxeatom) {
     maxeatom = atom->nmax;
-    memory->destroy(eatom);
-    memory->create(eatom,comm->nthreads*maxeatom,"bond:eatom");
+    if (alloc) {
+      memory->destroy(eatom);
+      memory->create(eatom,comm->nthreads*maxeatom,"bond:eatom");
+    }
   }
   if (vflag_atom && atom->nmax > maxvatom) {
     maxvatom = atom->nmax;
-    memory->destroy(vatom);
-    memory->create(vatom,comm->nthreads*maxvatom,6,"bond:vatom");
+    if (alloc) {
+      memory->destroy(vatom);
+      memory->create(vatom,comm->nthreads*maxvatom,6,"bond:vatom");
+    }
   }
 
   // zero accumulators
 
   if (eflag_global) energy = 0.0;
   if (vflag_global) for (i = 0; i < 6; i++) virial[i] = 0.0;
-  if (eflag_atom) {
+  if (eflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) eatom[i] = 0.0;
   }
-  if (vflag_atom) {
+  if (vflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) {
diff --git a/src/bond.h b/src/bond.h
index ffa1f5fb051f0732bce91d2c9800d8ef7452c96c..41604387a3f8e056a92e7b08a25007a062ca3021 100644
--- a/src/bond.h
+++ b/src/bond.h
@@ -60,7 +60,7 @@ class Bond : protected Pointers {
   int vflag_either,vflag_global,vflag_atom;
   int maxeatom,maxvatom;
 
-  void ev_setup(int, int);
+  void ev_setup(int, int, int alloc = 1);
   void ev_tally(int, int, int, int, double, double, double, double, double);
 };
 
diff --git a/src/dihedral.cpp b/src/dihedral.cpp
index 4c941d7225c47e0094d950933caf30be80172496..f5c1c6c44c143604cec5ec3aa9b1bbd8ea03688d 100644
--- a/src/dihedral.cpp
+++ b/src/dihedral.cpp
@@ -76,7 +76,7 @@ void Dihedral::init()
    see integrate::ev_set() for values of eflag (0-3) and vflag (0-6)
 ------------------------------------------------------------------------- */
 
-void Dihedral::ev_setup(int eflag, int vflag)
+void Dihedral::ev_setup(int eflag, int vflag, int alloc)
 {
   int i,n;
 
@@ -94,25 +94,29 @@ void Dihedral::ev_setup(int eflag, int vflag)
 
   if (eflag_atom && atom->nmax > maxeatom) {
     maxeatom = atom->nmax;
-    memory->destroy(eatom);
-    memory->create(eatom,comm->nthreads*maxeatom,"dihedral:eatom");
+    if (alloc) {
+      memory->destroy(eatom);
+      memory->create(eatom,comm->nthreads*maxeatom,"dihedral:eatom");
+    }
   }
   if (vflag_atom && atom->nmax > maxvatom) {
     maxvatom = atom->nmax;
-    memory->destroy(vatom);
-    memory->create(vatom,comm->nthreads*maxvatom,6,"dihedral:vatom");
+    if (alloc) {
+      memory->destroy(vatom);
+      memory->create(vatom,comm->nthreads*maxvatom,6,"dihedral:vatom");
+    }
   }
 
   // zero accumulators
 
   if (eflag_global) energy = 0.0;
   if (vflag_global) for (i = 0; i < 6; i++) virial[i] = 0.0;
-  if (eflag_atom) {
+  if (eflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) eatom[i] = 0.0;
   }
-  if (vflag_atom) {
+  if (vflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) {
diff --git a/src/dihedral.h b/src/dihedral.h
index 5f3909244f8c4a9d09ae443c3037fd2bbd83ce35..d27810c4d6e79ede7d5875daced83861f2461346 100644
--- a/src/dihedral.h
+++ b/src/dihedral.h
@@ -56,7 +56,7 @@ class Dihedral : protected Pointers {
   int vflag_either,vflag_global,vflag_atom;
   int maxeatom,maxvatom;
 
-  void ev_setup(int, int);
+  void ev_setup(int, int, int alloc = 1);
   void ev_tally(int, int, int, int, int, int, double,
                 double *, double *, double *, double, double, double,
                 double, double, double, double, double, double);
diff --git a/src/improper.cpp b/src/improper.cpp
index e20d0d2666aa8cccd63efb75fbe4543b793fc204..089fc43aad09205a0e72aecaa886ef3b78a87d50 100644
--- a/src/improper.cpp
+++ b/src/improper.cpp
@@ -74,7 +74,7 @@ void Improper::init()
    see integrate::ev_set() for values of eflag (0-3) and vflag (0-6)
 ------------------------------------------------------------------------- */
 
-void Improper::ev_setup(int eflag, int vflag)
+void Improper::ev_setup(int eflag, int vflag, int alloc)
 {
   int i,n;
 
@@ -92,25 +92,29 @@ void Improper::ev_setup(int eflag, int vflag)
 
   if (eflag_atom && atom->nmax > maxeatom) {
     maxeatom = atom->nmax;
-    memory->destroy(eatom);
-    memory->create(eatom,comm->nthreads*maxeatom,"improper:eatom");
+    if (alloc) {
+      memory->destroy(eatom);
+      memory->create(eatom,comm->nthreads*maxeatom,"improper:eatom");
+    }
   }
   if (vflag_atom && atom->nmax > maxvatom) {
     maxvatom = atom->nmax;
-    memory->destroy(vatom);
-    memory->create(vatom,comm->nthreads*maxvatom,6,"improper:vatom");
+    if (alloc) {
+      memory->destroy(vatom);
+      memory->create(vatom,comm->nthreads*maxvatom,6,"improper:vatom");
+    }
   }
 
   // zero accumulators
 
   if (eflag_global) energy = 0.0;
   if (vflag_global) for (i = 0; i < 6; i++) virial[i] = 0.0;
-  if (eflag_atom) {
+  if (eflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) eatom[i] = 0.0;
   }
-  if (vflag_atom) {
+  if (vflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton_bond) n += atom->nghost;
     for (i = 0; i < n; i++) {
diff --git a/src/improper.h b/src/improper.h
index be78b6acf9190dc56ab28f0f275a13eeaad64eca..df3c966cdc4704b5d91c03332274fabd0e3ab9b5 100644
--- a/src/improper.h
+++ b/src/improper.h
@@ -56,7 +56,7 @@ class Improper : protected Pointers {
   int vflag_either,vflag_global,vflag_atom;
   int maxeatom,maxvatom;
 
-  void ev_setup(int, int);
+  void ev_setup(int, int, int alloc = 1);
   void ev_tally(int, int, int, int, int, int, double,
                 double *, double *, double *, double, double, double,
                 double, double, double, double, double, double);
diff --git a/src/kspace.cpp b/src/kspace.cpp
index 48626346b185a76a712f20715f3471a16451b3a1..c2113cdf767c899d733ed9dc3d44162ff140563f 100644
--- a/src/kspace.cpp
+++ b/src/kspace.cpp
@@ -206,7 +206,7 @@ void KSpace::pair_check()
    see integrate::ev_set() for values of eflag (0-3) and vflag (0-6)
 ------------------------------------------------------------------------- */
 
-void KSpace::ev_setup(int eflag, int vflag)
+void KSpace::ev_setup(int eflag, int vflag, int alloc)
 {
   int i,n;
 
@@ -227,25 +227,29 @@ void KSpace::ev_setup(int eflag, int vflag)
 
   if (eflag_atom && atom->nmax > maxeatom) {
     maxeatom = atom->nmax;
-    memory->destroy(eatom);
-    memory->create(eatom,maxeatom,"kspace:eatom");
+    if (alloc) {
+      memory->destroy(eatom);
+      memory->create(eatom,maxeatom,"kspace:eatom");
+    }
   }
   if (vflag_atom && atom->nmax > maxvatom) {
     maxvatom = atom->nmax;
-    memory->destroy(vatom);
-    memory->create(vatom,maxvatom,6,"kspace:vatom");
+    if (alloc) {
+      memory->destroy(vatom);
+      memory->create(vatom,maxvatom,6,"kspace:vatom");
+    }
   }
 
   // zero accumulators
 
   if (eflag_global) energy = 0.0;
   if (vflag_global) for (i = 0; i < 6; i++) virial[i] = 0.0;
-  if (eflag_atom) {
+  if (eflag_atom && alloc) {
     n = atom->nlocal;
     if (tip4pflag) n += atom->nghost;
     for (i = 0; i < n; i++) eatom[i] = 0.0;
   }
-  if (vflag_atom) {
+  if (vflag_atom && alloc) {
     n = atom->nlocal;
     if (tip4pflag) n += atom->nghost;
     for (i = 0; i < n; i++) {
diff --git a/src/kspace.h b/src/kspace.h
index c81854e90a4e319f0463ab4d1604dab09923a538..ad29c214728f56eb0eec5739aeac18b076c752b9 100644
--- a/src/kspace.h
+++ b/src/kspace.h
@@ -197,7 +197,7 @@ class KSpace : protected Pointers {
   int kx_ewald,ky_ewald,kz_ewald;   // kspace settings for Ewald sum
 
   void pair_check();
-  void ev_setup(int, int);
+  void ev_setup(int, int, int alloc = 1);
   double estimate_table_accuracy(double, double);
 };
 
diff --git a/src/pair.cpp b/src/pair.cpp
index 685280cfce8262952830306be1f225c3cc3c7f3f..d90ed8bb43a90e422dccf6b39a296b092d2e938f 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -749,7 +749,7 @@ void Pair::del_tally_callback(Compute *ptr)
    see integrate::ev_set() for values of eflag (0-3) and vflag (0-6)
 ------------------------------------------------------------------------- */
 
-void Pair::ev_setup(int eflag, int vflag)
+void Pair::ev_setup(int eflag, int vflag, int alloc)
 {
   int i,n;
 
@@ -767,13 +767,17 @@ void Pair::ev_setup(int eflag, int vflag)
 
   if (eflag_atom && atom->nmax > maxeatom) {
     maxeatom = atom->nmax;
-    memory->destroy(eatom);
-    memory->create(eatom,comm->nthreads*maxeatom,"pair:eatom");
+    if (alloc) {
+      memory->destroy(eatom);
+      memory->create(eatom,comm->nthreads*maxeatom,"pair:eatom");
+    }
   }
   if (vflag_atom && atom->nmax > maxvatom) {
     maxvatom = atom->nmax;
-    memory->destroy(vatom);
-    memory->create(vatom,comm->nthreads*maxvatom,6,"pair:vatom");
+    if (alloc) {
+      memory->destroy(vatom);
+      memory->create(vatom,comm->nthreads*maxvatom,6,"pair:vatom");
+    }
   }
 
   // zero accumulators
@@ -782,12 +786,12 @@ void Pair::ev_setup(int eflag, int vflag)
 
   if (eflag_global) eng_vdwl = eng_coul = 0.0;
   if (vflag_global) for (i = 0; i < 6; i++) virial[i] = 0.0;
-  if (eflag_atom) {
+  if (eflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton) n += atom->nghost;
     for (i = 0; i < n; i++) eatom[i] = 0.0;
   }
-  if (vflag_atom) {
+  if (vflag_atom && alloc) {
     n = atom->nlocal;
     if (force->newton) n += atom->nghost;
     for (i = 0; i < n; i++) {
diff --git a/src/pair.h b/src/pair.h
index 16746a29a8798d15017ad3f28400d8bf8bf4e809..3f66c6095a8199b8b4530761af014854efce0914 100644
--- a/src/pair.h
+++ b/src/pair.h
@@ -221,7 +221,7 @@ class Pair : protected Pointers {
   int copymode;   // if set, do not deallocate during destruction
                   // required when classes are used as functors by Kokkos
 
-  virtual void ev_setup(int, int);
+  virtual void ev_setup(int, int, int alloc = 1);
   void ev_unset();
   void ev_tally_full(int, double, double, double, double, double, double);
   void ev_tally_xyz_full(int, double, double,