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

This commit is contained in:
sjplimp
2011-03-25 21:13:51 +00:00
parent e3cf018311
commit fbb475b9cd
149 changed files with 1402 additions and 1660 deletions

View File

@ -297,12 +297,10 @@ FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) :
vector = new double[nvalues];
vector_total = new double[nvalues];
if (ave == WINDOW)
vector_list = memory->create_2d_double_array(nwindow,nvalues,
"ave/time:vector_list");
memory->create(vector_list,nwindow,nvalues,"ave/time:vector_list");
} else {
array = memory->create_2d_double_array(nrows,nvalues,"ave/time:array");
array_total = memory->create_2d_double_array(nrows,nvalues,
"ave/time:array_total");
memory->create(array,nrows,nvalues,"ave/time:array");
memory->create(array_total,nrows,nvalues,"ave/time:array_total");
if (ave == WINDOW)
memory->create(array_list,nwindow,nrows,nvalues,"ave/time:array_list");
}
@ -441,8 +439,8 @@ FixAveTime::~FixAveTime()
delete [] vector;
delete [] vector_total;
delete [] column;
memory->destroy_2d_double_array(array);
memory->destroy_2d_double_array(array_total);
memory->destroy(array);
memory->destroy(array_total);
memory->destroy(array_list);
}