diff --git a/src/BODY/pair_body_rounded_polygon.cpp b/src/BODY/pair_body_rounded_polygon.cpp index 7dc7956586..23a4da7f07 100644 --- a/src/BODY/pair_body_rounded_polygon.cpp +++ b/src/BODY/pair_body_rounded_polygon.cpp @@ -21,21 +21,21 @@ #include "pair_body_rounded_polygon.h" -#include -#include -#include "math_extra.h" #include "atom.h" #include "atom_vec_body.h" #include "body_rounded_polygon.h" #include "comm.h" -#include "force.h" -#include "fix.h" -#include "modify.h" -#include "neighbor.h" -#include "neigh_list.h" -#include "memory.h" #include "error.h" +#include "fix.h" +#include "force.h" +#include "math_extra.h" +#include "memory.h" +#include "modify.h" +#include "neigh_list.h" +#include "neighbor.h" +#include +#include using namespace LAMMPS_NS; diff --git a/src/BODY/pair_body_rounded_polyhedron.cpp b/src/BODY/pair_body_rounded_polyhedron.cpp index 65179ecb80..6deb06aafb 100644 --- a/src/BODY/pair_body_rounded_polyhedron.cpp +++ b/src/BODY/pair_body_rounded_polyhedron.cpp @@ -23,22 +23,22 @@ #include "pair_body_rounded_polyhedron.h" -#include -#include #include "atom.h" #include "atom_vec_body.h" #include "body_rounded_polyhedron.h" #include "comm.h" -#include "force.h" -#include "fix.h" -#include "modify.h" -#include "neighbor.h" -#include "neigh_list.h" -#include "memory.h" #include "error.h" -#include "math_extra.h" +#include "fix.h" +#include "force.h" #include "math_const.h" +#include "math_extra.h" +#include "memory.h" +#include "modify.h" +#include "neigh_list.h" +#include "neighbor.h" +#include +#include using namespace LAMMPS_NS; using namespace MathConst; @@ -1212,10 +1212,7 @@ int PairBodyRoundedPolyhedron::interaction_edge_to_edge(int ibody, contact_list[num_contacts].unique = 1; num_contacts++; } - } else { - } - return interact; }