git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6218 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2011-05-26 22:15:18 +00:00
parent 0ca2e3b389
commit cfa91c0611
3 changed files with 6 additions and 14 deletions

View File

@ -30,14 +30,12 @@
#include "force.h"
#include "dump.h"
#include "write_restart.h"
#include "accelerator_cuda.h"
#include "memory.h"
#include "error.h"
#include "accelerator.h"
using namespace LAMMPS_NS;
enum{NOACCEL,OPT,GPU,USERCUDA}; // same as lammps.cpp
#define DELTA 1
#define MYMIN(a,b) ((a) < (b) ? (a) : (b))
@ -250,8 +248,7 @@ void Output::write(bigint ntimestep)
if (next_dump_any == ntimestep) {
if (lmp->accelerator == USERCUDA && !lmp->cuda->oncpu)
lmp->cuda->downloadAll();
if (lmp->cuda && !lmp->cuda->oncpu) lmp->cuda->downloadAll();
for (int idump = 0; idump < ndump; idump++) {
if (next_dump[idump] == ntimestep && last_dump[idump] != ntimestep) {
@ -279,8 +276,7 @@ void Output::write(bigint ntimestep)
if (next_restart == ntimestep && last_restart != ntimestep) {
if (lmp->accelerator == USERCUDA && !lmp->cuda->oncpu)
lmp->cuda->downloadAll();
if (lmp->cuda && !lmp->cuda->oncpu) lmp->cuda->downloadAll();
if (restart_toggle == 0) {
char *file = new char[strlen(restart1) + 16];