Changeset 30e1a4 for src/Dynamics/ForceAnnealing.hpp

Timestamp:

Nov 12, 2017, 8:48:40 AM (7 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/ForceAnnealing.hpp (modified) (3 diffs)

src/Dynamics/ForceAnnealing.hpp

@@ -122 +122 @@
       if (_UseBondgraph)
         annealWithBondGraph(_CurrentTimeStep, _offset, maxComponents);
-      anneal(_CurrentTimeStep, _offset, maxComponents);
+      // cannot store RemnantGradient in Atom's Force as it ruins BB stepwidth calculation
+      else
+        anneal(_CurrentTimeStep, _offset, maxComponents);
     }
 
@@ -368 +370 @@
                   boost::cref(bv), boost::ref(projected_forces));
           const Vector RemnantGradient = bv.getRemnantGradientForAtomAtStep(
-              walker, BondVectors, weights, timestep, forcestoring
+              walker, walkerGradient, BondVectors, weights, timestep, forcestoring
           );
           RemnantGradient_per_atom.insert( std::make_pair(walker.getId(), RemnantGradient) );
@@ -513 +515 @@
           + update);
       walker->setAtomicVelocity(update);
-      walker->setAtomicForce( RemnantGradient_per_atom[walker->getId()] );
+//      walker->setAtomicForce( RemnantGradient_per_atom[walker->getId()] );
     }
   }