diff --git a/src/REPLICA/fix_event.h b/src/REPLICA/fix_event.h index 63ae46a06f..73df5d1575 100644 --- a/src/REPLICA/fix_event.h +++ b/src/REPLICA/fix_event.h @@ -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 diff --git a/src/REPLICA/fix_event_prd.cpp b/src/REPLICA/fix_event_prd.cpp index fef22c15a4..af93c49b9b 100644 --- a/src/REPLICA/fix_event_prd.cpp +++ b/src/REPLICA/fix_event_prd.cpp @@ -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++; diff --git a/src/REPLICA/fix_event_prd.h b/src/REPLICA/fix_event_prd.h index 03b0cb6bb1..2c3a339bf6 100644 --- a/src/REPLICA/fix_event_prd.h +++ b/src/REPLICA/fix_event_prd.h @@ -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: diff --git a/src/REPLICA/fix_event_tad.cpp b/src/REPLICA/fix_event_tad.cpp index c027f4957c..adc95c0cb2 100644 --- a/src/REPLICA/fix_event_tad.cpp +++ b/src/REPLICA/fix_event_tad.cpp @@ -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; } diff --git a/src/REPLICA/fix_event_tad.h b/src/REPLICA/fix_event_tad.h index 129b97b874..3939290ae1 100644 --- a/src/REPLICA/fix_event_tad.h +++ b/src/REPLICA/fix_event_tad.h @@ -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: diff --git a/src/REPLICA/prd.cpp b/src/REPLICA/prd.cpp index de7f1be790..78e86ba202 100644 --- a/src/REPLICA/prd.cpp +++ b/src/REPLICA/prd.cpp @@ -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; diff --git a/src/REPLICA/tad.cpp b/src/REPLICA/tad.cpp index 6ae7c25fed..c1d487ed1b 100644 --- a/src/REPLICA/tad.cpp +++ b/src/REPLICA/tad.cpp @@ -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