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@4193 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2010-05-24 18:59:33 +00:00
parent edbfa5caab
commit a7358b40c3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/fix_ave_histo.cpp
View File

@ -107,37 +107,44 @@ FixAveHisto::FixAveHisto(LAMMPS *lmp, int narg, char **arg) :
iarg = 9; iarg = 9;
while (iarg < narg) { while (iarg < narg) {
ids[nvalues] = NULL;
if (strcmp(arg[iarg],"x") == 0) { if (strcmp(arg[iarg],"x") == 0) {
which[nvalues] = X; which[nvalues] = X;
argindex[nvalues++] = 0; argindex[nvalues++] = 0;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"y") == 0) { } else if (strcmp(arg[iarg],"y") == 0) {
which[nvalues] = X; which[nvalues] = X;
argindex[nvalues++] = 1; argindex[nvalues++] = 1;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"z") == 0) { } else if (strcmp(arg[iarg],"z") == 0) {
which[nvalues] = X; which[nvalues] = X;
argindex[nvalues++] = 2; argindex[nvalues++] = 2;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"vx") == 0) { } else if (strcmp(arg[iarg],"vx") == 0) {
which[nvalues] = V; which[nvalues] = V;
argindex[nvalues++] = 0; argindex[nvalues++] = 0;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"vy") == 0) { } else if (strcmp(arg[iarg],"vy") == 0) {
which[nvalues] = V; which[nvalues] = V;
argindex[nvalues++] = 1; argindex[nvalues++] = 1;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"vz") == 0) { } else if (strcmp(arg[iarg],"vz") == 0) {
which[nvalues] = V; which[nvalues] = V;
argindex[nvalues++] = 2; argindex[nvalues++] = 2;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"fx") == 0) { } else if (strcmp(arg[iarg],"fx") == 0) {
which[nvalues] = F; which[nvalues] = F;
argindex[nvalues++] = 0; argindex[nvalues++] = 0;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"fy") == 0) { } else if (strcmp(arg[iarg],"fy") == 0) {
which[nvalues] = F; which[nvalues] = F;
argindex[nvalues++] = 1; argindex[nvalues++] = 1;
ids[nvalues] = NULL;
} else if (strcmp(arg[iarg],"fz") == 0) { } else if (strcmp(arg[iarg],"fz") == 0) {
which[nvalues] = F; which[nvalues] = F;
argindex[nvalues++] = 2; argindex[nvalues++] = 2;
ids[nvalues] = NULL;
} else if ((strncmp(arg[iarg],"c_",2) == 0) || } else if ((strncmp(arg[iarg],"c_",2) == 0) ||
(strncmp(arg[iarg],"f_",2) == 0) || (strncmp(arg[iarg],"f_",2) == 0) ||
@ -605,7 +612,7 @@ void FixAveHisto::end_of_step()
compute->compute_array(); compute->compute_array();
compute->invoked_flag |= INVOKED_ARRAY; compute->invoked_flag |= INVOKED_ARRAY;
} }
bin_vector(compute->size_array_rows,compute->array[j-1], bin_vector(compute->size_array_rows,&compute->array[0][j-1],
compute->size_array_cols); compute->size_array_cols);
} }
@ -628,7 +635,7 @@ void FixAveHisto::end_of_step()
if (j == 0) if (j == 0)
bin_vector(compute->size_local_rows,compute->vector_local,1); bin_vector(compute->size_local_rows,compute->vector_local,1);
else else
bin_vector(compute->size_local_rows,compute->array_local[j], bin_vector(compute->size_local_rows,&compute->array_local[0][j],
compute->size_local_cols); compute->size_local_cols);
} }
@ -658,7 +665,7 @@ void FixAveHisto::end_of_step()
} else if (kind == LOCAL) { } else if (kind == LOCAL) {
if (j == 0) bin_vector(fix->size_local_rows,fix->vector_local,1); if (j == 0) bin_vector(fix->size_local_rows,fix->vector_local,1);
else else
bin_vector(fix->size_local_rows,fix->array_local[j-1], bin_vector(fix->size_local_rows,&fix->array_local[0][j-1],
fix->size_local_cols); fix->size_local_cols);
} }