core: remove angle_dist bond.

espressomd · Oct 26, 2018 · fb88fd8 · fb88fd8
1 parent 2c1ebd2
commit fb88fd8
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 286 deletions.
diff --git a/src/core/bonded_interactions/CMakeLists.txt b/src/core/bonded_interactions/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_library(bonded_interactions SHARED
     angle_cosine.cpp
     angle_cossquare.cpp
-    angle_dist.cpp
     angle_harmonic.cpp
     bonded_coulomb.cpp
     bonded_coulomb_p3m_sr.cpp

diff --git a/src/core/bonded_interactions/angle_dist.cpp b/src/core/bonded_interactions/angle_dist.cpp
diff --git a/src/core/bonded_interactions/angle_dist.hpp b/src/core/bonded_interactions/angle_dist.hpp
diff --git a/src/core/energy_inline.hpp b/src/core/energy_inline.hpp
@@ -28,7 +28,6 @@
 
 #include "bonded_interactions/angle_cosine.hpp"
 #include "bonded_interactions/angle_cossquare.hpp"
-#include "bonded_interactions/angle_dist.hpp"
 #include "bonded_interactions/angle_harmonic.hpp"
 #include "bonded_interactions/bonded_interaction_data.hpp"
 #include "bonded_interactions/bonded_tab.hpp"
@@ -394,11 +393,6 @@ inline void add_bonded_energy(Particle *p1) {
         bond_broken = angle_cossquare_energy(p1, p2, p3, iaparams, &ret);
         break;
 #endif
-#ifdef BOND_ANGLEDIST
-      case BONDED_IA_ANGLEDIST:
-        bond_broken = angledist_energy(p1, p2, p3, iaparams, &ret);
-        break;
-#endif
 #ifdef TABULATED
       case BONDED_IA_TABULATED:
         if (iaparams->num == 2)

diff --git a/src/core/forces_inline.hpp b/src/core/forces_inline.hpp
@@ -25,7 +25,6 @@
 
 #include "bonded_interactions/angle_cosine.hpp"
 #include "bonded_interactions/angle_cossquare.hpp"
-#include "bonded_interactions/angle_dist.hpp"
 #include "bonded_interactions/angle_harmonic.hpp"
 #include "bonded_interactions/bonded_tab.hpp"
 #include "bonded_interactions/dihedral.hpp"
@@ -617,11 +616,6 @@ inline void add_bonded_force(Particle *p1) {
               calc_tab_angle_force(p1, p2, p3, iaparams, force, force2);
         break;
 #endif
-#ifdef BOND_ANGLEDIST
-      case BONDED_IA_ANGLEDIST:
-        bond_broken = calc_angledist_force(p1, p2, p3, iaparams, force, force2);
-        break;
-#endif
 #ifdef IMMERSED_BOUNDARY
       case BONDED_IA_IBM_TRIEL:
         bond_broken = IBM_Triel_CalcForce(p1, p2, p3, iaparams);

diff --git a/src/features.def b/src/features.def
@@ -116,9 +116,6 @@ MEMBRANE_COLLISION
 
 BOND_ANGLE                      requires not BOND_ANGLE_OLD
 
-BOND_ANGLEDIST
-BOND_ANGLEDIST_HARMONIC         implies BOND_ANGLEDIST
-
 /* Immersed-Boundary Bayreuth version */
 IMMERSED_BOUNDARY
 IMMERSED_BOUNDARY               requires VIRTUAL_SITES