Eliminate fix_event override warning

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5491 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
athomps 2011-01-05 18:27:11 +00:00
parent 0c112cf3db
commit bb98ae8294
7 changed files with 14 additions and 14 deletions

View File

@ -35,10 +35,10 @@ class FixEvent : public Fix {
// methods specific to FixEvent
virtual void store_event(); // base class stores quenched atoms
void store_event(); // store quenched atoms
void restore_event(); // restore quenched atoms
void store_state();
void restore_state();
void store_state(); // store hot atoms
void restore_state(); // restore hot atoms
private:
double **xevent; // atom coords at last event

View File

@ -56,9 +56,9 @@ FixEventPRD::~FixEventPRD()
update clock = elapsed time since last event, across all replicas
------------------------------------------------------------------------- */
void FixEventPRD::store_event(int timestep, int delta_clock)
void FixEventPRD::store_event_prd(int timestep, int delta_clock)
{
FixEvent::store_event();
store_event();
event_timestep = timestep;
clock += delta_clock;
event_number++;

View File

@ -41,7 +41,7 @@ class FixEventPRD : public FixEvent {
// methods specific to FixEventPRD, invoked by PRD
void store_event(int, int);
void store_event_prd(int, int);
private:

View File

@ -56,9 +56,9 @@ FixEventTAD::~FixEventTAD()
set event_timestep = when event occurred
------------------------------------------------------------------------- */
void FixEventTAD::store_event(int timestep)
void FixEventTAD::store_event_tad(int timestep)
{
FixEvent::store_event();
store_event();
event_timestep = timestep;
}

View File

@ -39,7 +39,7 @@ class FixEventTAD : public FixEvent {
// methods specific to FixEventTAD, invoked by TAD
void store_event(int);
void store_event_tad(int);
private:

View File

@ -607,9 +607,9 @@ void PRD::share_event(int ireplica, int flag)
// don't change the clock or timestep if this is a restart
if (flag == 0 && fix_event->event_number != 0)
fix_event->store_event(fix_event->event_timestep,0);
fix_event->store_event_prd(fix_event->event_timestep,0);
else {
fix_event->store_event(update->ntimestep,delta);
fix_event->store_event_prd(update->ntimestep,delta);
fix_event->replica_number = ireplica;
fix_event->correlated_event = 0;
if (flag == 2) fix_event->correlated_event = 1;

View File

@ -250,7 +250,7 @@ void TAD::command(int narg, char **arg)
quench();
timer->barrier_start(TIME_LOOP);
time_start = timer->array[TIME_LOOP];
fix_event->store_event(update->ntimestep);
fix_event->store_event_tad(update->ntimestep);
log_event();
fix_event->restore_state();
@ -885,7 +885,7 @@ void TAD::add_event()
// store quenched state for new event
fix_event_list[ievent]->store_event(update->ntimestep);
fix_event_list[ievent]->store_event_tad(update->ntimestep);
// store hot state for new event
@ -963,7 +963,7 @@ void TAD::perform_event(int ievent)
fix_event->event_number++;
fix_event->event_timestep = update->ntimestep;
fix_event_list[ievent]->restore_event();
fix_event->store_event(fix_event_list[ievent]->event_timestep);
fix_event->store_event_tad(fix_event_list[ievent]->event_timestep);
// output stats and dump for quenched state