Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added P3M guard for bonded_coulomb_p3m_sr #2349

Merged
merged 1 commit into from
Oct 29, 2018
Merged

added P3M guard for bonded_coulomb_p3m_sr #2349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/bonded_interactions/bonded_coulomb_p3m_sr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions src/python/espressomd/interactions.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand All @@ -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)
Expand Down