jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2009-08-18 18:01:06 +00:00
parent 29a5c558f3
commit 9c7587f5bf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/update.cpp
View File

@ -41,7 +41,7 @@ Update::Update(LAMMPS *lmp) : Pointers(lmp)
ntimestep = 0; ntimestep = 0;
first_update = 0; first_update = 0;
whichflag = -1; whichflag = 0;
firststep = laststep = 0; firststep = laststep = 0;
beginstep = endstep = 0; beginstep = endstep = 0;
@ -80,12 +80,12 @@ Update::~Update()
void Update::init() void Update::init()
{ {
// init the appropriate integrate or minimize class // init the appropriate integrate and/or minimize class
// if neither (e.g. from write_restart) then just return // if neither (e.g. from write_restart) then just return
if (whichflag == -1) return; if (whichflag == 0) return;
else if (whichflag == 0) integrate->init(); if (whichflag == 1) integrate->init();
else if (whichflag == 1) minimize->init(); else if (whichflag == 2) minimize->init();
// only set first_update if a run or minimize is being performed // only set first_update if a run or minimize is being performed
@ -261,7 +261,7 @@ void Update::reset_timestep(int narg, char **arg)
double Update::memory_usage() double Update::memory_usage()
{ {
double bytes = 0.0; double bytes = 0.0;
if (whichflag == 0) bytes += integrate->memory_usage(); if (whichflag == 1) bytes += integrate->memory_usage();
else if (whichflag == 1) bytes += minimize->memory_usage(); else if (whichflag == 2) bytes += minimize->memory_usage();
return bytes; return bytes;
} }