Changeset 1c8a80 for src

Timestamp:

Nov 5, 2017, 1:55:28 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued_betteresults

Children:

93effb

Parents:

c459c4

git-author:

Frederik Heber <frederik.heber@…> (06/27/17 21:03:16)

git-committer:

Frederik Heber <frederik.heber@…> (11/05/17 01:55:28)

Message:

FIX: ForceAnnealing would not reset force components prior to loading forces from file.

File:

• src/Actions/MoleculeAction/ForceAnnealingAction.cpp (modified) (1 diff)

src/Actions/MoleculeAction/ForceAnnealingAction.cpp

@@ -95 +95 @@
       Walker->setPositionAtStep(CurrentStep+1,
           Walker->getPositionAtStep(CurrentStep));
-      Walker->setAtomicVelocityAtStep(CurrentStep+1,
-          Walker->getAtomicVelocityAtStep(CurrentStep));
-      Walker->setAtomicForceAtStep(CurrentStep+1,
-          Walker->getAtomicForceAtStep(CurrentStep));
+      if (!params.forcesfile.get().string().empty()) {
+        // don't use forces or velocities from old step
+        Walker->setAtomicVelocityAtStep(CurrentStep+1, zeroVec);
+        Walker->setAtomicForceAtStep(CurrentStep+1, zeroVec);
+      } else {
+        // force have already been calculated, hence copy them
+        Walker->setAtomicVelocityAtStep(CurrentStep+1,
+            Walker->getAtomicVelocityAtStep(CurrentStep));
+        Walker->setAtomicForceAtStep(CurrentStep+1,
+            Walker->getAtomicForceAtStep(CurrentStep));
+      }
     }
     // increment to next time step: re-creates bond graph