diff --git a/modules/mol/mm/src/observer.hh b/modules/mol/mm/src/observer.hh index fea6fceb6c7768539f18851114cc8ca7708cd5cd..aa88d20ae9863235d32bef61467f169ddbcae961 100644 --- a/modules/mol/mm/src/observer.hh +++ b/modules/mol/mm/src/observer.hh @@ -57,7 +57,7 @@ public: TopologyPtr top, ost::mol::EntityHandle& ent) = 0; - virtual int Rythm() = 0; + virtual int Rhythm() = 0; }; @@ -66,7 +66,7 @@ class TrajObserver : public Observer{ public: - TrajObserver(int rythm): rythm_(rythm), registered_(false) { } + TrajObserver(int rhythm): rhythm_(rhythm), registered_(false) { } void Init(boost::shared_ptr<OpenMM::Context> c, TopologyPtr top, @@ -74,7 +74,7 @@ public: void Notify(); - int Rythm() { return rythm_; } + int Rhythm() { return rhythm_; } CoordGroupHandle GetTraj() { return c_group_; } @@ -82,7 +82,7 @@ private: ost::mol::CoordGroupHandle c_group_; boost::shared_ptr<OpenMM::Context> context_; - int rythm_; + int rhythm_; bool registered_; }; @@ -92,12 +92,12 @@ class TrajWriter : public Observer{ public: - TrajWriter(int rythm, const String& pdb_filename, const String& dcd_filename): rythm_(rythm), - pdb_filename_(pdb_filename), - dcd_filename_(dcd_filename), - stream_(), - registered_(false), - frames_(0) { } + TrajWriter(int rhythm, const String& pdb_filename, const String& dcd_filename): rhythm_(rhythm), + pdb_filename_(pdb_filename), + dcd_filename_(dcd_filename), + stream_(), + registered_(false), + frames_(0) { } void Init(boost::shared_ptr<OpenMM::Context> c, TopologyPtr top, @@ -105,7 +105,7 @@ public: void Notify(); - int Rythm() { return rythm_; } + int Rhythm() { return rhythm_; } void Finalize(); @@ -115,7 +115,7 @@ private: boost::shared_ptr<OpenMM::Context> context_; - int rythm_; + int rhythm_; String pdb_filename_; String dcd_filename_; std::ofstream stream_; diff --git a/modules/mol/mm/src/simulation.cc b/modules/mol/mm/src/simulation.cc index 37ca9263f4763d8301afce843d6300553a0be489..830b9bd5b6a1b14f92fdaf99248c95c279158dbb 100644 --- a/modules/mol/mm/src/simulation.cc +++ b/modules/mol/mm/src/simulation.cc @@ -459,7 +459,7 @@ void Simulation::Steps(int steps){ for(uint i = 0; i < time_to_notify_.size(); ++i){ if(time_to_notify_[i] == 0){ observers_[i]->Notify(); - time_to_notify_[i] = observers_[i]->Rythm(); + time_to_notify_[i] = observers_[i]->Rhythm(); } } steps -= time_to_next_notification; @@ -487,7 +487,7 @@ Real Simulation::GetPotentialEnergy(){ void Simulation::Register(ObserverPtr o){ observers_.push_back(o); - time_to_notify_.push_back(o->Rythm()); + time_to_notify_.push_back(o->Rhythm()); o->Init(context_,top_,ent_); }