Changeset 05a2c5 for src/Fragmentation/Exporters/HydrogenPool.cpp

Timestamp:

May 8, 2017, 2:00:10 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

c1446cd

Parents:

f97bcc

git-author:

Frederik Heber <heber@…> (03/23/17 17:11:47)

git-committer:

Frederik Heber <frederik.heber@…> (05/08/17 14:00:10)

Message:

FIX: Fixing the use of the trajectories that were changed to maps.

• as the atom's trajectories are now stored inside a map, i.e. not every step necessarily needs to be present, there will still some places in the code that were meant for the old vector storing.
• Atom::UpdateStep() updates the current step, not the future step.
• AtomInfo::append/removeTrajectoryStep() now no longer ASSERT that the step is not the current one. Due to the trajectory in map concept (with current it simply sought by lower_bound()) this is no longer necessary.
• HydrogenPool no longer adds all trajectory steps till current time.
• World has commented out code for also copying the current atom positions in case a new time step is added, but this is not used as so far we do not recognize whether it is a new time step ... and also it is not really necessary.

File:

• src/Fragmentation/Exporters/HydrogenPool.cpp (modified) (1 diff)

src/Fragmentation/Exporters/HydrogenPool.cpp

@@ -91 +91 @@
       +" from pool is already in use.");
   LOG(3, "DEBUG: Leasing " << *Walker << ".");
-  UpdateSteps(Walker);
   HydrogenInUse.insert( std::make_pair( Walker->getId(), Walker) );
   HydrogenQueue.pop_front();
 
   return Walker;
-}
-
-void HydrogenPool::UpdateSteps(atom * _atom) const
-{
-  // make sure we are up to current time step
-  const size_t CurrentTime = WorldTime::getTime();
-  for (size_t step = _atom->getTrajectorySize(); step <= CurrentTime; ++step)
-    _atom->UpdateStep(step);
 }