Changeset 30e1a4 for src/Dynamics/BondVectors.cpp

Timestamp:

Nov 12, 2017, 8:48:40 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued_betteresults

Children:

8d3610

Parents:

06b7d9

git-author:

Frederik Heber <frederik.heber@…> (08/02/17 20:25:57)

git-committer:

Frederik Heber <frederik.heber@…> (11/12/17 08:48:40)

Message:

BondVectors::getRemnant...() now requires atom's gradient.

• No more default anneal() without bondgraph, and can't store remnant gradient in force.

File:

• src/Dynamics/BondVectors.cpp (modified) (4 diffs)

src/Dynamics/BondVectors.cpp

@@ -287 +287 @@
 Vector BondVectors::getRemnantGradientForAtomAtStep(
     const atom &_walker,
+    const Vector &_walkerGradient,
     const std::vector<Vector> _BondVectors,
     const BondVectors::weights_t &_weights,
@@ -292 +293 @@
     forcestore_t _forcestore) const
 {
-  const Vector &walkerGradient = _walker.getAtomicForceAtStep(_step);
   BondVectors::weights_t::const_iterator weightiter = _weights.begin();
   std::vector<Vector>::const_iterator vectoriter = _BondVectors.begin();
@@ -303 +303 @@
     const Vector &BondVector = *vectoriter;
 
-    const double temp = (*weightiter)*walkerGradient.ScalarProduct(BondVector);
+    const double temp = (*weightiter)*_walkerGradient.ScalarProduct(BondVector);
     _forcestore(_walker, current_bond, _step, temp);
     LOG(4, "DEBUG: BondVector " << BondVector << " receives projected force of "
-        << temp);
+        << (*weightiter) << "*" << _walkerGradient << "*" << BondVector << " = " << temp);
     forcesum += temp * BondVector;
   }
@@ -314 +314 @@
       "BondVectors::getRemnantGradientForAtomAtStep() - vectoriter is not at end when it should be.");
 
-  return walkerGradient-forcesum;
+  return _walkerGradient-forcesum;
 }