From 9879ce34aa53c073bad20e45eb8e129738cf1210 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 20 May 2011 16:08:57 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6178 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/update.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/update.cpp b/src/update.cpp index c6b135eec6..6750343cda 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -25,11 +25,14 @@ #include "region.h" #include "compute.h" #include "output.h" +#include "accelerator.h" #include "memory.h" #include "error.h" using namespace LAMMPS_NS; +enum{NOACCEL,OPT,GPU,USERCUDA}; // same as lammps.cpp + /* ---------------------------------------------------------------------- */ Update::Update(LAMMPS *lmp) : Pointers(lmp) @@ -53,11 +56,19 @@ Update::Update(LAMMPS *lmp) : Pointers(lmp) unit_style = NULL; set_units("lj"); - str = (char *) "verlet"; - n = strlen(str) + 1; - integrate_style = new char[n]; - strcpy(integrate_style,str); - integrate = new Verlet(lmp,0,NULL); + if (lmp->accelerator == USERCUDA) { + str = (char *) "verlet/cuda"; + n = strlen(str) + 1; + integrate_style = new char[n]; + strcpy(integrate_style,str); + integrate = new VerletCuda(lmp,0,NULL); + } else { + str = (char *) "verlet"; + n = strlen(str) + 1; + integrate_style = new char[n]; + strcpy(integrate_style,str); + integrate = new Verlet(lmp,0,NULL); + } str = (char *) "cg"; n = strlen(str) + 1;