tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'USER-DPD_kokkos' into USER-DPD_kokkos_ssa_debug

Browse Source
This commit is contained in:
Tim Mattox
2017-03-01 10:29:33 -05:00
parent b26a434a50 0982331c71
commit bf1794f59a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/KOKKOS/pair_table_rx_kokkos.cpp
View File

@ -984,7 +984,7 @@ void PairTableRXKokkos<DeviceType>::coeff(int narg, char **arg)
nspecies = atom->nspecies_dpd;
if(nspecies==0) error->all(FLERR,"There are no rx species specified.");
int n;
n = strlen(arg[3]) + 1;
n = strlen(arg[4]) + 1;
site1 = new char[n];
strcpy(site1,arg[4]);
@ -995,7 +995,7 @@ void PairTableRXKokkos<DeviceType>::coeff(int narg, char **arg)
if (ispecies == nspecies && strcmp(site1,"1fluid") != 0)
error->all(FLERR,"Site1 name not recognized in pair coefficients");
n = strlen(arg[4]) + 1;
n = strlen(arg[5]) + 1;
site2 = new char[n];
strcpy(site2,arg[5]);

4
src/USER-DPD/pair_multi_lucy_rx.cpp
View File

@ -387,11 +387,11 @@ void PairMultiLucyRX::coeff(int narg, char **arg)
nspecies = atom->nspecies_dpd;
int n;
n = strlen(arg[3]) + 1;
n = strlen(arg[4]) + 1;
site1 = new char[n];
strcpy(site1,arg[4]);
n = strlen(arg[4]) + 1;
n = strlen(arg[5]) + 1;
site2 = new char[n];
strcpy(site2,arg[5]);

4
src/USER-DPD/pair_table_rx.cpp
View File

@ -315,7 +315,7 @@ void PairTableRX::coeff(int narg, char **arg)
nspecies = atom->nspecies_dpd;
if(nspecies==0) error->all(FLERR,"There are no rx species specified.");
int n;
n = strlen(arg[3]) + 1;
n = strlen(arg[4]) + 1;
site1 = new char[n];
strcpy(site1,arg[4]);
@ -326,7 +326,7 @@ void PairTableRX::coeff(int narg, char **arg)
if (ispecies == nspecies && strcmp(site1,"1fluid") != 0)
error->all(FLERR,"Site1 name not recognized in pair coefficients");
n = strlen(arg[4]) + 1;
n = strlen(arg[5]) + 1;
site2 = new char[n];
strcpy(site2,arg[5]);