diff --git a/src/core/forces_inline.hpp b/src/core/forces_inline.hpp index eb47a04b5a4..f22d88e7d94 100644 --- a/src/core/forces_inline.hpp +++ b/src/core/forces_inline.hpp @@ -251,7 +251,6 @@ inline void add_non_bonded_pair_force(Particle &p1, Particle &p2, /* bond creation and breaking */ /***********************************************/ - /***********************************************/ /* non-bonded pair potentials */ /***********************************************/ diff --git a/src/core/nonbonded_interactions/nonbonded_interaction_data.cpp b/src/core/nonbonded_interactions/nonbonded_interaction_data.cpp index 3f325117817..72191efb755 100644 --- a/src/core/nonbonded_interactions/nonbonded_interaction_data.cpp +++ b/src/core/nonbonded_interactions/nonbonded_interaction_data.cpp @@ -148,7 +148,6 @@ static double recalc_maximal_cutoff(const IA_parameters &data) { (data.soft_sphere.cut + data.soft_sphere.offset)); #endif - #ifdef MEMBRANE_COLLISION max_cut_current = std::max(max_cut_current, data.membrane.cut); #endif diff --git a/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp b/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp index 5b4d72d9661..ae87235f4c1 100644 --- a/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp +++ b/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp @@ -241,7 +241,6 @@ struct IA_parameters { SoftSphere_Parameters soft_sphere; #endif - #ifdef MEMBRANE_COLLISION Membrane_Parameters membrane; #endif diff --git a/src/core/particle_data.cpp b/src/core/particle_data.cpp index 33356d129fa..e3a2b482669 100644 --- a/src/core/particle_data.cpp +++ b/src/core/particle_data.cpp @@ -881,7 +881,6 @@ void rotate_particle(int part, const Utils::Vector3d &axis, double angle) { } #endif - #ifdef MEMBRANE_COLLISION void set_particle_out_direction(int part, double *out_direction) { mpi_update_particle_propertyp.out_direction.data(); diff --git a/src/core/particle_data.hpp b/src/core/particle_data.hpp index ea92052ace4..b5183d16171 100644 --- a/src/core/particle_data.hpp +++ b/src/core/particle_data.hpp @@ -110,7 +110,6 @@ struct ParticleProperties { static constexpr Utils::Vector3d rinertia = {1., 1., 1.}; #endif - #ifdef MEMBRANE_COLLISION /** parameters for membrane collision mechanisms */ Utils::Vector3d out_direction = {0., 0., 0.}; @@ -634,7 +633,6 @@ void set_particle_rotation(int part, int rot); */ void rotate_particle(int part, const Utils::Vector3d &axis, double angle); - #ifdef MEMBRANE_COLLISION /** Call only on the master node: set particle out_direction. * @param part the particle.