From f64544a5fe4c7e17f80353f5148fc89ffe8aafd3 Mon Sep 17 00:00:00 2001
From: Stan Moore <stamoor@sandia.gov>
Date: Tue, 5 Dec 2017 08:34:24 -0700
Subject: [PATCH] Move instantiation of MemoryKokkos class

---
 src/KOKKOS/kokkos.cpp | 2 ++
 src/lammps.cpp        | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp
index 62f0df4181..5a74223353 100644
--- a/src/KOKKOS/kokkos.cpp
+++ b/src/KOKKOS/kokkos.cpp
@@ -34,6 +34,8 @@ KokkosLMP::KokkosLMP(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
   kokkos_exists = 1;
   lmp->kokkos = this;
 
+  delete memory;
+  memory = new MemoryKokkos(lmp);
   memoryKK = (MemoryKokkos*) memory;
 
   auto_sync = 1;
diff --git a/src/lammps.cpp b/src/lammps.cpp
index 65a833d8ee..bde7ca035d 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -472,9 +472,6 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
 
   kokkos = NULL;
   if (kokkosflag == 1) {
-    delete memory;
-    memory = new MemoryKokkos(this);
-
     kokkos = new KokkosLMP(this,kklast-kkfirst,&arg[kkfirst]);
     if (!kokkos->kokkos_exists)
       error->all(FLERR,"Cannot use -kokkos on without KOKKOS installed");