Changeset 6145577 for src/Atom/AtomicInfo.cpp

Timestamp:

Apr 10, 2018, 6:43:12 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, Candidate_v1.7.0, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, PythonUI_with_named_parameters, StoppableMakroAction, TremoloParser_IncreasedPrecision, stable

Children:

c87d6e

Parents:

8c6b68

git-author:

Frederik Heber <frederik.heber@…> (08/03/17 10:47:26)

git-committer:

Frederik Heber <frederik.heber@…> (04/10/18 06:43:12)

Message:

FIX: ForceAnnealingAction's Undo is again working.

• AtomicInfo::setAtom() and SetAtomsFromAtomicInfo() now accept a time step. This allows to undo changes to the old state (where forces might have been passed to) and the current state (modified by time integration).
• TESTFIX: ForceAnnealing's undo test.conf was no longer valid since the additional time stepping is extracted (and the tests were changed already). I.e. the extra trajectory step is because of step-world-time and not because of force-annealing. Hence, it should not be undone here.

File:

• src/Atom/AtomicInfo.cpp (modified) (2 diffs)

src/Atom/AtomicInfo.cpp

@@ -58 +58 @@
 {}
 
-AtomicInfo::AtomicInfo(const atom &_atom) :
-    Position(_atom.getPosition()),
+AtomicInfo::AtomicInfo(const atom &_atom, unsigned int _step) :
+    Position(_atom.getPositionAtStep(_step)),
     Type(_atom.getType()),
     charge(_atom.getCharge()),
-    Velocity(_atom.getAtomicVelocity()),
-    Force(_atom.getAtomicForce()),
+    Velocity(_atom.getAtomicVelocityAtStep(_step)),
+    Force(_atom.getAtomicForceAtStep(_step)),
     FatherId(_atom.father->getId()),
     MolId(0),
@@ -101 +101 @@
 
 
-bool AtomicInfo::setAtom(atom &_atom) const
+bool AtomicInfo::setAtom(atom &_atom, const unsigned int _step) const
 {
-  _atom.setPosition(Position);
+  _atom.setPositionAtStep(_step, Position);
   _atom.setType(Type);
   _atom.setCharge(charge);
-  _atom.setAtomicVelocity(Velocity);
-  _atom.setAtomicForce(Force);
+  _atom.setAtomicVelocityAtStep(_step, Velocity);
+  _atom.setAtomicForceAtStep(_step, Force);
 
   // set old id