Changeset b2acca for src/Actions/MoleculeAction/ForceAnnealingAction.cpp

Timestamp:

Apr 10, 2018, 6:43:11 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, 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

Children:

216840

Parents:

ecfcf6

git-author:

Frederik Heber <frederik.heber@…> (06/20/17 20:26:12)

git-committer:

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

Message:

ForceAnnealing can now be used either atom- or bond-centered.

• new keyword "use-bondgraph" to use either case.
• atom is old annealing method, bond graph is new annealing method where the bond neighborhood is shifted as well to anneal to force projected onto the BondVector.
• In the first step we always use atom-centered annealing where we use the given deltat step width. Afterwards Barzilai-Borwein may then proceed.
• TESTS: Removed XFAIL from ForceAnnealing regression tests as they work now again.

File:

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

src/Actions/MoleculeAction/ForceAnnealingAction.cpp

@@ -128 +128 @@
   // perform optimization step
   LOG(1, "Structural optimization.");
-  optimizer(CurrentStep, 1);
+  optimizer(CurrentStep, 1, params.UseBondGraph.get());
   STATUS("Successfully optimized structure by one step.");