From 029f0ee8744309da03328c7bf687135837b06481 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Wed, 8 Jun 2011 20:23:48 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6339
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/USER-CUDA/verlet_cuda.cpp | 2 --
 src/update.cpp                | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/USER-CUDA/verlet_cuda.cpp b/src/USER-CUDA/verlet_cuda.cpp
index 8819f29384..1a75e55de3 100644
--- a/src/USER-CUDA/verlet_cuda.cpp
+++ b/src/USER-CUDA/verlet_cuda.cpp
@@ -85,7 +85,6 @@ void VerletCuda::setup()
 	cuda->oncpu = true;
 	cuda->begin_setup = true;
 	cuda->finished_run = false;
-	strcpy(update->integrate_style,"verlet");
 	
 	time_pair=0;
 	time_kspace=0;
@@ -345,7 +344,6 @@ void VerletCuda::setup_minimal(int flag)
 	cuda->begin_setup = true;
 	cuda->finished_run = false;
 	MYDBG(printf("# CUDA VerletCuda::setup start\n"); )
-	    strcpy(update->integrate_style,"verlet");
 	    time_pair=0;
 	    time_kspace=0;
 	    time_comm=0;
diff --git a/src/update.cpp b/src/update.cpp
index 403eb5141f..cc6f49b16f 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -255,9 +255,9 @@ void Update::new_integrate(char *style, int narg, char **arg,
     else success = 0;
   }
 
-  sflag = 0;
-
   if (!success) {
+    sflag = 0;
+
     if (0) return;
 
 #define INTEGRATE_CLASS