Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
fweik committed Oct 1, 2019
1 parent cbfe10a commit 2ae4be1
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion src/core/forces_inline.hpp
Expand Up @@ -251,7 +251,6 @@ inline void add_non_bonded_pair_force(Particle &p1, Particle &p2,
/* bond creation and breaking */
/***********************************************/


/***********************************************/
/* non-bonded pair potentials */
/***********************************************/
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -241,7 +241,6 @@ struct IA_parameters {
SoftSphere_Parameters soft_sphere;
#endif


#ifdef MEMBRANE_COLLISION
Membrane_Parameters membrane;
#endif
Expand Down
2 changes: 0 additions & 2 deletions src/core/particle_data.cpp
Expand Up @@ -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_property<Utils::Vector3d,
Expand Down Expand Up @@ -1598,7 +1597,6 @@ void pointer_to_rotational_inertia(Particle const *p, double const *&res) {
}
#endif


#ifdef MEMBRANE_COLLISION
void pointer_to_out_direction(const Particle *p, const double *&res) {
res = p->p.out_direction.data();
Expand Down
2 changes: 0 additions & 2 deletions src/core/particle_data.hpp
Expand Up @@ -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.};
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 2ae4be1

Please sign in to comment.