Merge pull request #2349 from KonradBreitsprecher/bonded_coulomb_guards

added P3M guard for bonded_coulomb_p3m_sr
espressomd · Oct 29, 2018 · 8d18569 · 8d18569
2 parents b4e2b9a + 178abd7
commit 8d18569
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/core/bonded_interactions/bonded_coulomb_p3m_sr.cpp b/src/core/bonded_interactions/bonded_coulomb_p3m_sr.cpp
@@ -25,7 +25,7 @@
 #include "bonded_coulomb_p3m_sr.hpp"
 #include "communication.hpp"
 
-#ifdef ELECTROSTATICS
+#ifdef P3M
 
 int bonded_coulomb_p3m_sr_set_params(int bond_type, double q1q2) {
   if (bond_type < 0)

diff --git a/src/python/espressomd/interactions.pxd b/src/python/espressomd/interactions.pxd
@@ -519,15 +519,11 @@ cdef extern from "bonded_interactions/thermalized_bond.hpp":
     int thermalized_bond_set_params(int bond_type, double temp_com, double gamma_com, double temp_distance, double gamma_distance, double r_cut)
 cdef extern from "bonded_interactions/bonded_coulomb.hpp":
     int bonded_coulomb_set_params(int bond_type, double prefactor)
-cdef extern from "bonded_interactions/bonded_coulomb_p3m_sr.hpp":
-    int bonded_coulomb_p3m_sr_set_params(int bond_type, double q1q2)
-
 
 cdef extern from "immersed_boundary/ImmersedBoundaries.hpp":
     cppclass ImmersedBoundaries:
         void volume_conservation_set_params(const int bond_type, const int softID, const double kappaV)
 
-
 cdef extern from "immersed_boundary/ibm_triel.hpp":
     int IBM_Triel_SetParams(const int bond_type, const int ind1, const int ind2, const int ind3, const double max, const tElasticLaw elasticLaw, const double k1, const double k2)
 cdef extern from "immersed_boundary/ibm_tribend.hpp":
@@ -548,6 +544,9 @@ IF ELECTROSTATICS:
     cdef extern from "bonded_interactions/bonded_coulomb.hpp":
         int bonded_coulomb_set_params(int bond_type, double prefactor)
 
+IF P3M:
+    cdef extern from "bonded_interactions/bonded_coulomb_p3m_sr.hpp":
+        int bonded_coulomb_p3m_sr_set_params(int bond_type, double q1q2)
 
 cdef extern from "nonbonded_interactions/nonbonded_interaction_data.hpp":
     int virtual_set_params(int bond_type)