Changeset 35760a for src/Potentials/Specifics/FourBodyPotential_Torsion.cpp

Timestamp:

Oct 3, 2016, 5:34:49 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_FitPotential_needs_atomicnumbers

Children:

91a3f7

Parents:

6aed89

git-author:

Frederik Heber <heber@…> (10/03/16 17:29:46)

git-committer:

Frederik Heber <heber@…> (10/03/16 17:34:49)

Message:

tempcommit: Merge with b794f5e8

File:

• src/Potentials/Specifics/FourBodyPotential_Torsion.cpp (modified) (2 diffs)

src/Potentials/Specifics/FourBodyPotential_Torsion.cpp

@@ -65 +65 @@
 const std::string FourBodyPotential_Torsion::potential_token("torsion");
 Coordinator::ptr FourBodyPotential_Torsion::coordinator(Memory::ignore(new FourBody_TorsionAngle()));
+static PotentialSubgraph generateSubgraph()
+{
+  return PotentialSubgraph();
+}
+const PotentialSubgraph FourBodyPotential_Torsion::subgraph(generateSubgraph());
 
 FourBodyPotential_Torsion::FourBodyPotential_Torsion() :
@@ -260 +265 @@
   params[FourBodyPotential_Torsion::equilibrium_distance] = 2.*(random()/(rng_max-rng_min));
 }
-
-const PotentialSubgraph&
-FourBodyPotential_Torsion::getSubgraph() const
-{
-  return subgraph;
-}