Changeset 11bab4 for src/Potentials

Timestamp:

Oct 3, 2016, 11:26:02 AM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_FitPotential_needs_atomicnumbers

Children:

de81b9

Parents:

0b7036

Message:

Extractors now need a subgraph and the set of particle types.

Location:

src/Potentials/Specifics

Files:

• ConstantPotential.cpp (modified) (1 diff)
• ManyBodyPotential_Tersoff.cpp (modified) (1 diff)
• PairPotential_Harmonic.cpp (modified) (1 diff)
• PairPotential_LennardJones.cpp (modified) (1 diff)
• PairPotential_Morse.cpp (modified) (1 diff)
• ThreeBodyPotential_Angle.cpp (modified) (1 diff)

src/Potentials/Specifics/ConstantPotential.cpp

@@ -184 +184 @@
       boost::bind(&Extractors::filterArgumentsByParticleTypes,
           _1,
-          getParticleTypes());
+          getParticleTypes(), getSubgraph());
   return returnfunction;
 }

src/Potentials/Specifics/ManyBodyPotential_Tersoff.cpp

@@ -704 +704 @@
       boost::bind(&Extractors::filterArgumentsByParticleTypes,
           _1,
-          getParticleTypes());
+          getParticleTypes(), getSubgraph());
   return returnfunction;
 }

src/Potentials/Specifics/PairPotential_Harmonic.cpp

@@ -202 +202 @@
       boost::bind(&Extractors::filterArgumentsByParticleTypes,
           _1,
-          getParticleTypes());
+          getParticleTypes(), getSubgraph());
   return returnfunction;
 }

src/Potentials/Specifics/PairPotential_LennardJones.cpp

@@ -212 +212 @@
       boost::bind(&Extractors::filterArgumentsByParticleTypes,
           _1,
-          getParticleTypes());
+          getParticleTypes(), getSubgraph());
   return returnfunction;
 }

src/Potentials/Specifics/PairPotential_Morse.cpp

@@ -228 +228 @@
       boost::bind(&Extractors::filterArgumentsByParticleTypes,
           _1,
-          getParticleTypes());
+          getParticleTypes(), getSubgraph());
   return returnfunction;
 }

src/Potentials/Specifics/ThreeBodyPotential_Angle.cpp

@@ -230 +230 @@
         boost::bind(&Extractors::filterArgumentsByParticleTypes,
             _1,
-            getParticleTypes()),
-        getParticleTypes()
+            getParticleTypes(), getSubgraph()),
+        getParticleTypes(), getSubgraph()
       );
   return returnfunction;