ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2015-02-13 20:21:06 +00:00
parent dfc6073e7a
commit b8541b66ba
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compute_gyration_chunk.cpp
View File

@ -33,9 +33,9 @@ ComputeGyrationChunk::ComputeGyrationChunk(LAMMPS *lmp, int narg, char **arg) :
// ID of compute chunk/atom // ID of compute chunk/atom
int n = strlen(arg[6]) + 1; int n = strlen(arg[3]) + 1;
idchunk = new char[n]; idchunk = new char[n];
strcpy(idchunk,arg[6]); strcpy(idchunk,arg[3]);
init(); init();

4
src/compute_inertia_chunk.cpp
View File

@ -38,9 +38,9 @@ ComputeInertiaChunk::ComputeInertiaChunk(LAMMPS *lmp, int narg, char **arg) :
// ID of compute chunk/atom // ID of compute chunk/atom
int n = strlen(arg[6]) + 1; int n = strlen(arg[3]) + 1;
idchunk = new char[n]; idchunk = new char[n];
strcpy(idchunk,arg[6]); strcpy(idchunk,arg[3]);
init(); init();

9
src/compute_msd_chunk.cpp
View File

@ -38,9 +38,9 @@ ComputeMSDChunk::ComputeMSDChunk(LAMMPS *lmp, int narg, char **arg) :
// ID of compute chunk/atom // ID of compute chunk/atom
int n = strlen(arg[6]) + 1; int n = strlen(arg[3]) + 1;
idchunk = new char[n]; idchunk = new char[n];
strcpy(idchunk,arg[6]); strcpy(idchunk,arg[3]);
init(); init();
@ -84,13 +84,14 @@ void ComputeMSDChunk::init()
void ComputeMSDChunk::setup() void ComputeMSDChunk::setup()
{ {
if (!firstflag) return; if (!firstflag) return;
compute_array();
firstflag = 0; firstflag = 0;
compute_array();
for (int i = 0; i < nchunk; i++) { for (int i = 0; i < nchunk; i++) {
cominit[i][0] = comall[i][0]; cominit[i][0] = comall[i][0];
cominit[i][1] = comall[i][1]; cominit[i][1] = comall[i][1];
cominit[i][2] = comall[i][2]; cominit[i][2] = comall[i][2];
msd[i][0] = msd[i][1] = msd[i][2] = msd[i][3] = 0.0;
} }
} }
@ -161,7 +162,7 @@ void ComputeMSDChunk::compute_array()
} }
// MSD is difference between current and initial COM // MSD is difference between current and initial COM
// cominit does not yet exist when called from constructor // cominit does not yet exist when called first time from setup()
if (firstflag) return; if (firstflag) return;

4
src/compute_torque_chunk.cpp
View File

@ -38,9 +38,9 @@ ComputeTorqueChunk::ComputeTorqueChunk(LAMMPS *lmp, int narg, char **arg) :
// ID of compute chunk/atom // ID of compute chunk/atom
int n = strlen(arg[6]) + 1; int n = strlen(arg[3]) + 1;
idchunk = new char[n]; idchunk = new char[n];
strcpy(idchunk,arg[6]); strcpy(idchunk,arg[3]);
init(); init();

4
src/compute_vcm_chunk.cpp
View File

@ -40,9 +40,9 @@ ComputeVCMChunk::ComputeVCMChunk(LAMMPS *lmp, int narg, char **arg) :
// ID of compute chunk/atom // ID of compute chunk/atom
int n = strlen(arg[6]) + 1; int n = strlen(arg[3]) + 1;
idchunk = new char[n]; idchunk = new char[n];
strcpy(idchunk,arg[6]); strcpy(idchunk,arg[3]);
init(); init();