From 96744c49338448068b16c1fe24ad2557460b13b1 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 29 Jun 2019 21:30:23 -0400 Subject: [PATCH] more include file cleanup --- src/BODY/body_nparticle.cpp | 1 + src/BODY/body_rounded_polygon.cpp | 1 + src/BODY/body_rounded_polyhedron.cpp | 1 + src/fix_setforce.cpp | 2 +- src/fix_spring.cpp | 2 -- src/fix_spring_chunk.cpp | 2 -- src/fix_spring_rg.cpp | 2 -- src/fix_spring_self.cpp | 2 +- src/fix_store.cpp | 1 - src/fix_store_force.cpp | 1 - src/fix_temp_berendsen.cpp | 1 - src/fix_temp_csld.cpp | 1 - src/fix_temp_csvr.cpp | 3 +-- src/fix_temp_rescale.cpp | 3 --- src/fix_tmd.cpp | 1 - src/fix_vector.cpp | 1 - src/fix_viscous.cpp | 2 -- src/fix_wall.cpp | 4 +--- src/fix_wall_harmonic.cpp | 1 - src/fix_wall_reflect.cpp | 1 - src/fix_wall_region.cpp | 5 +---- src/force.cpp | 3 --- src/group.cpp | 3 +-- src/hashlittle.cpp | 1 - src/image.cpp | 3 +-- src/imbalance.h | 2 +- src/imbalance_var.cpp | 4 +--- src/improper.cpp | 1 - src/improper_hybrid.cpp | 3 +-- src/improper_zero.cpp | 3 --- src/info.cpp | 12 ++++++------ src/input.cpp | 5 ----- src/integrate.cpp | 1 - src/irregular.cpp | 1 - src/irregular.h | 1 + src/kspace.cpp | 2 ++ src/kspace.h | 1 + src/lammps.cpp | 1 - src/library.cpp | 4 +--- src/library.h | 2 ++ src/math_extra.h | 3 --- src/memory.cpp | 2 -- src/memory.h | 1 - src/min.cpp | 2 +- src/min_cg.cpp | 2 -- src/min_fire.cpp | 2 +- src/min_hftn.cpp | 1 + src/min_linesearch.cpp | 7 ++----- src/min_quickmin.cpp | 1 - src/min_sd.cpp | 2 -- src/minimize.cpp | 1 - src/modify.cpp | 1 - src/molecule.cpp | 6 +++--- src/nbin.cpp | 2 +- src/neigh_list.cpp | 4 +--- src/neigh_list.h | 1 - src/neighbor.cpp | 3 --- src/neighbor.h | 1 - src/npair_copy.cpp | 7 ------- src/npair_full_bin.cpp | 1 - src/npair_full_bin_atomonly.cpp | 2 -- src/procmap.cpp | 1 + 62 files changed, 37 insertions(+), 107 deletions(-) diff --git a/src/BODY/body_nparticle.cpp b/src/BODY/body_nparticle.cpp index 21070107f5..b2d9dbaca3 100644 --- a/src/BODY/body_nparticle.cpp +++ b/src/BODY/body_nparticle.cpp @@ -11,6 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ +#include #include #include "body_nparticle.h" #include "my_pool_chunk.h" diff --git a/src/BODY/body_rounded_polygon.cpp b/src/BODY/body_rounded_polygon.cpp index f7741ada88..6e1e49319e 100644 --- a/src/BODY/body_rounded_polygon.cpp +++ b/src/BODY/body_rounded_polygon.cpp @@ -15,6 +15,7 @@ Contributing author: Trung Dac Nguyen (ndactrung@gmail.com) ------------------------------------------------------------------------- */ +#include #include #include "body_rounded_polygon.h" #include "my_pool_chunk.h" diff --git a/src/BODY/body_rounded_polyhedron.cpp b/src/BODY/body_rounded_polyhedron.cpp index 34d918f1f6..4b5208c397 100644 --- a/src/BODY/body_rounded_polyhedron.cpp +++ b/src/BODY/body_rounded_polyhedron.cpp @@ -15,6 +15,7 @@ Contributing author: Trung Dac Nguyen (ndactrung@gmail.com) ------------------------------------------------------------------------- */ +#include #include #include "body_rounded_polyhedron.h" #include "my_pool_chunk.h" diff --git a/src/fix_setforce.cpp b/src/fix_setforce.cpp index fc8b7aeb59..f01008dc10 100644 --- a/src/fix_setforce.cpp +++ b/src/fix_setforce.cpp @@ -11,8 +11,8 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ +#include #include -#include #include "fix_setforce.h" #include "atom.h" #include "update.h" diff --git a/src/fix_spring.cpp b/src/fix_spring.cpp index 328a0eeafd..c87cec2766 100644 --- a/src/fix_spring.cpp +++ b/src/fix_spring.cpp @@ -16,13 +16,11 @@ ------------------------------------------------------------------------- */ #include -#include #include #include "fix_spring.h" #include "atom.h" #include "update.h" #include "respa.h" -#include "domain.h" #include "force.h" #include "group.h" #include "error.h" diff --git a/src/fix_spring_chunk.cpp b/src/fix_spring_chunk.cpp index 5b5d95b111..f6ebadde94 100644 --- a/src/fix_spring_chunk.cpp +++ b/src/fix_spring_chunk.cpp @@ -12,14 +12,12 @@ ------------------------------------------------------------------------- */ #include -#include #include #include "fix_spring_chunk.h" #include "atom.h" #include "update.h" #include "force.h" #include "respa.h" -#include "domain.h" #include "modify.h" #include "compute_chunk_atom.h" #include "compute_com_chunk.h" diff --git a/src/fix_spring_rg.cpp b/src/fix_spring_rg.cpp index 28c8969006..1d5b87c599 100644 --- a/src/fix_spring_rg.cpp +++ b/src/fix_spring_rg.cpp @@ -16,8 +16,6 @@ Paul Crozier (SNL) ------------------------------------------------------------------------- */ -#include -#include #include #include "fix_spring_rg.h" #include "atom.h" diff --git a/src/fix_spring_self.cpp b/src/fix_spring_self.cpp index 670883af41..a5aa600229 100644 --- a/src/fix_spring_self.cpp +++ b/src/fix_spring_self.cpp @@ -15,7 +15,7 @@ Contributing author: Naveen Michaud-Agrawal (Johns Hopkins University) ------------------------------------------------------------------------- */ -#include +#include #include #include "fix_spring_self.h" #include "atom.h" diff --git a/src/fix_store.cpp b/src/fix_store.cpp index 9db65d0987..a370632489 100644 --- a/src/fix_store.cpp +++ b/src/fix_store.cpp @@ -11,7 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include #include "fix_store.h" #include "atom.h" diff --git a/src/fix_store_force.cpp b/src/fix_store_force.cpp index a841714098..8afd985615 100644 --- a/src/fix_store_force.cpp +++ b/src/fix_store_force.cpp @@ -15,7 +15,6 @@ #include "fix_store_force.h" #include "atom.h" #include "update.h" -#include "group.h" #include "respa.h" #include "memory.h" #include "error.h" diff --git a/src/fix_temp_berendsen.cpp b/src/fix_temp_berendsen.cpp index 55518015c4..b4dd65b0c5 100644 --- a/src/fix_temp_berendsen.cpp +++ b/src/fix_temp_berendsen.cpp @@ -12,7 +12,6 @@ ------------------------------------------------------------------------- */ #include -#include #include #include "fix_temp_berendsen.h" #include "atom.h" diff --git a/src/fix_temp_csld.cpp b/src/fix_temp_csld.cpp index 7bdf776355..57f7104c61 100644 --- a/src/fix_temp_csld.cpp +++ b/src/fix_temp_csld.cpp @@ -16,7 +16,6 @@ ------------------------------------------------------------------------- */ #include -#include #include #include "fix_temp_csld.h" #include "atom.h" diff --git a/src/fix_temp_csvr.cpp b/src/fix_temp_csvr.cpp index 495a155113..9f8135ffc8 100644 --- a/src/fix_temp_csvr.cpp +++ b/src/fix_temp_csvr.cpp @@ -16,13 +16,12 @@ Based on code by Paolo Raiteri (Curtin U) and Giovanni Bussi (SISSA) ------------------------------------------------------------------------- */ +#include #include -#include #include #include "fix_temp_csvr.h" #include "atom.h" #include "force.h" -#include "memory.h" #include "comm.h" #include "input.h" #include "variable.h" diff --git a/src/fix_temp_rescale.cpp b/src/fix_temp_rescale.cpp index 11dfa6a5fc..378997c0c4 100644 --- a/src/fix_temp_rescale.cpp +++ b/src/fix_temp_rescale.cpp @@ -12,15 +12,12 @@ ------------------------------------------------------------------------- */ #include -#include #include #include "fix_temp_rescale.h" #include "atom.h" #include "force.h" #include "group.h" #include "update.h" -#include "domain.h" -#include "region.h" #include "comm.h" #include "input.h" #include "variable.h" diff --git a/src/fix_tmd.cpp b/src/fix_tmd.cpp index 4cbb244bc0..a0425db36c 100644 --- a/src/fix_tmd.cpp +++ b/src/fix_tmd.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include "fix_tmd.h" #include "atom.h" diff --git a/src/fix_vector.cpp b/src/fix_vector.cpp index 5657e59ab0..b7be472be6 100644 --- a/src/fix_vector.cpp +++ b/src/fix_vector.cpp @@ -18,7 +18,6 @@ #include "force.h" #include "modify.h" #include "compute.h" -#include "group.h" #include "input.h" #include "variable.h" #include "memory.h" diff --git a/src/fix_viscous.cpp b/src/fix_viscous.cpp index e845142322..cc60b1bda4 100644 --- a/src/fix_viscous.cpp +++ b/src/fix_viscous.cpp @@ -11,8 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include -#include #include #include "fix_viscous.h" #include "atom.h" diff --git a/src/fix_wall.cpp b/src/fix_wall.cpp index e84d01191d..1046efc2df 100644 --- a/src/fix_wall.cpp +++ b/src/fix_wall.cpp @@ -11,11 +11,9 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include -#include +#include #include #include "fix_wall.h" -#include "atom.h" #include "input.h" #include "variable.h" #include "domain.h" diff --git a/src/fix_wall_harmonic.cpp b/src/fix_wall_harmonic.cpp index 4dc067178a..6c6d5ec402 100644 --- a/src/fix_wall_harmonic.cpp +++ b/src/fix_wall_harmonic.cpp @@ -11,7 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include "fix_wall_harmonic.h" #include "atom.h" #include "error.h" diff --git a/src/fix_wall_reflect.cpp b/src/fix_wall_reflect.cpp index 8acba72035..edf5c40a5f 100644 --- a/src/fix_wall_reflect.cpp +++ b/src/fix_wall_reflect.cpp @@ -11,7 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include #include "fix_wall_reflect.h" #include "atom.h" diff --git a/src/fix_wall_region.cpp b/src/fix_wall_region.cpp index ff147d7446..cb1c3c2ab2 100644 --- a/src/fix_wall_region.cpp +++ b/src/fix_wall_region.cpp @@ -11,18 +11,15 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ +#include #include -#include #include #include "fix_wall_region.h" #include "atom.h" -#include "atom_vec.h" #include "domain.h" #include "region.h" #include "force.h" -#include "lattice.h" #include "update.h" -#include "output.h" #include "respa.h" #include "error.h" #include "math_const.h" diff --git a/src/force.cpp b/src/force.cpp index 2648358932..e4939a10e8 100644 --- a/src/force.cpp +++ b/src/force.cpp @@ -21,7 +21,6 @@ #include "style_improper.h" #include "style_pair.h" #include "style_kspace.h" -#include "atom.h" #include "comm.h" #include "pair.h" #include "pair_hybrid.h" @@ -32,8 +31,6 @@ #include "dihedral.h" #include "improper.h" #include "kspace.h" -#include "group.h" -#include "memory.h" #include "error.h" #include "utils.h" diff --git a/src/group.cpp b/src/group.cpp index 256bab7778..a37d209947 100644 --- a/src/group.cpp +++ b/src/group.cpp @@ -13,9 +13,8 @@ #include #include -#include #include -#include +#include #include "group.h" #include "domain.h" #include "atom.h" diff --git a/src/hashlittle.cpp b/src/hashlittle.cpp index 42109abd24..e9340a7e55 100644 --- a/src/hashlittle.cpp +++ b/src/hashlittle.cpp @@ -2,7 +2,6 @@ // from lookup3.c, by Bob Jenkins, May 2006, Public Domain // bob_jenkins@burtleburtle.net -#include #include #include diff --git a/src/image.cpp b/src/image.cpp index 3df167bbf6..ccd6d98d87 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include "image.h" #include "math_extra.h" @@ -29,7 +28,7 @@ #include "memory.h" #ifdef LAMMPS_JPEG -#include "jpeglib.h" +#include #endif #ifdef LAMMPS_PNG diff --git a/src/imbalance.h b/src/imbalance.h index 5f43c2e51d..0cc4ac844e 100644 --- a/src/imbalance.h +++ b/src/imbalance.h @@ -14,7 +14,7 @@ #ifndef LMP_IMBALANCE_H #define LMP_IMBALANCE_H -#include "pointers.h" +#include "pointers.h" // IWYU pragma: export namespace LAMMPS_NS { diff --git a/src/imbalance_var.cpp b/src/imbalance_var.cpp index e089b1df0c..ba17c06866 100644 --- a/src/imbalance_var.cpp +++ b/src/imbalance_var.cpp @@ -11,6 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ +#include #include #include "imbalance_var.h" #include "atom.h" @@ -20,9 +21,6 @@ #include "memory.h" #include "error.h" -// DEBUG -#include "update.h" - using namespace LAMMPS_NS; /* -------------------------------------------------------------------- */ diff --git a/src/improper.cpp b/src/improper.cpp index 17e2df4e59..eefe3222ee 100644 --- a/src/improper.cpp +++ b/src/improper.cpp @@ -11,7 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include "improper.h" #include "atom.h" #include "comm.h" diff --git a/src/improper_hybrid.cpp b/src/improper_hybrid.cpp index 5fdcb42a96..af1382d3eb 100644 --- a/src/improper_hybrid.cpp +++ b/src/improper_hybrid.cpp @@ -11,13 +11,12 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include +#include #include #include #include "improper_hybrid.h" #include "atom.h" #include "neighbor.h" -#include "domain.h" #include "comm.h" #include "force.h" #include "memory.h" diff --git a/src/improper_zero.cpp b/src/improper_zero.cpp index 747dd57919..3f36954a0a 100644 --- a/src/improper_zero.cpp +++ b/src/improper_zero.cpp @@ -15,13 +15,10 @@ Contributing author: Carsten Svaneborg (SDU) ------------------------------------------------------------------------- */ -#include -#include #include #include "improper_zero.h" #include "atom.h" #include "force.h" -#include "comm.h" #include "memory.h" #include "error.h" diff --git a/src/info.cpp b/src/info.cpp index 25b9879408..bb2d3c4b45 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -16,7 +16,13 @@ Richard Berger (Temple U) ------------------------------------------------------------------------- */ +#include +#include #include +#include +#include +#include +#include #include "info.h" #include "accelerator_kokkos.h" #include "atom.h" @@ -44,18 +50,12 @@ #include "error.h" #include "utils.h" -#include -#include -#include -#include - #ifdef _WIN32 #define PSAPI_VERSION 1 #include #include // requires C++-11 #include #else -#include #include #include #endif diff --git a/src/input.cpp b/src/input.cpp index 9e0ad78d9e..cbad1d78bf 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -12,7 +12,6 @@ ------------------------------------------------------------------------- */ #include -#include #include #include #include @@ -52,10 +51,6 @@ #include "memory.h" #include "utils.h" -#ifdef _OPENMP -#include -#endif - #ifdef _WIN32 #include #endif diff --git a/src/integrate.cpp b/src/integrate.cpp index d6b27e042d..545de849d5 100644 --- a/src/integrate.cpp +++ b/src/integrate.cpp @@ -11,7 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include "integrate.h" #include "update.h" #include "force.h" diff --git a/src/irregular.cpp b/src/irregular.cpp index 1865f9cbf6..2040d12d0b 100644 --- a/src/irregular.cpp +++ b/src/irregular.cpp @@ -12,7 +12,6 @@ ------------------------------------------------------------------------- */ #include -#include #include #include "irregular.h" #include "atom.h" diff --git a/src/irregular.h b/src/irregular.h index d56bcb253d..3fdfe20b36 100644 --- a/src/irregular.h +++ b/src/irregular.h @@ -14,6 +14,7 @@ #ifndef LMP_IRREGULAR_H #define LMP_IRREGULAR_H +#include #include "pointers.h" namespace LAMMPS_NS { diff --git a/src/kspace.cpp b/src/kspace.cpp index 643cf22113..b51191857d 100644 --- a/src/kspace.cpp +++ b/src/kspace.cpp @@ -11,6 +11,8 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ +#include +#include #include #include #include "kspace.h" diff --git a/src/kspace.h b/src/kspace.h index 69f4ccb433..83ce19cd87 100644 --- a/src/kspace.h +++ b/src/kspace.h @@ -14,6 +14,7 @@ #ifndef LMP_KSPACE_H #define LMP_KSPACE_H +#include #include "pointers.h" #ifdef FFT_SINGLE diff --git a/src/lammps.cpp b/src/lammps.cpp index 83a2f057ee..b73d9f1968 100644 --- a/src/lammps.cpp +++ b/src/lammps.cpp @@ -48,7 +48,6 @@ #include "output.h" #include "citeme.h" #include "accelerator_kokkos.h" -#include "accelerator_omp.h" #include "timer.h" #include "lmppython.h" #include "version.h" diff --git a/src/library.cpp b/src/library.cpp index a653b83adb..033b814865 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -15,13 +15,11 @@ // customize by adding new LAMMPS-specific functions #include +#include #include #include #include "library.h" -#include "lmptype.h" -#include "lammps.h" #include "universe.h" -#include "input.h" #include "atom_vec.h" #include "atom.h" #include "domain.h" diff --git a/src/library.h b/src/library.h index f6f8d9d75c..8b03bb3621 100644 --- a/src/library.h +++ b/src/library.h @@ -17,7 +17,9 @@ */ #include +#ifdef LAMMPS_BIGBIG #include /* for int64_t */ +#endif /* ifdefs allow this file to be included in a C program */ diff --git a/src/math_extra.h b/src/math_extra.h index 85f57224cf..09b135c641 100644 --- a/src/math_extra.h +++ b/src/math_extra.h @@ -19,9 +19,6 @@ #define LMP_MATH_EXTRA_H #include -#include -#include -#include "error.h" namespace MathExtra { diff --git a/src/memory.cpp b/src/memory.cpp index b2f8a95b17..ca7fd3ea7f 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -11,9 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include -#include #include "memory.h" #include "error.h" diff --git a/src/memory.h b/src/memory.h index c5eddc7fe7..42c9bf6aba 100644 --- a/src/memory.h +++ b/src/memory.h @@ -14,7 +14,6 @@ #ifndef LMP_MEMORY_H #define LMP_MEMORY_H -#include "lmptype.h" #include "pointers.h" namespace LAMMPS_NS { diff --git a/src/min.cpp b/src/min.cpp index 2a42a444a0..f2e1c982be 100644 --- a/src/min.cpp +++ b/src/min.cpp @@ -19,8 +19,8 @@ JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg ------------------------------------------------------------------------- */ +#include #include -#include #include #include "min.h" #include "atom.h" diff --git a/src/min_cg.cpp b/src/min_cg.cpp index 20e8cc30dd..eb8831c8f5 100644 --- a/src/min_cg.cpp +++ b/src/min_cg.cpp @@ -13,9 +13,7 @@ #include #include -#include #include "min_cg.h" -#include "atom.h" #include "update.h" #include "output.h" #include "timer.h" diff --git a/src/min_fire.cpp b/src/min_fire.cpp index a50071d562..79346341bb 100644 --- a/src/min_fire.cpp +++ b/src/min_fire.cpp @@ -11,6 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ +#include #include #include "min_fire.h" #include "universe.h" @@ -19,7 +20,6 @@ #include "update.h" #include "output.h" #include "timer.h" -#include "error.h" using namespace LAMMPS_NS; diff --git a/src/min_hftn.cpp b/src/min_hftn.cpp index 0c834fbeb4..c2c251c386 100644 --- a/src/min_hftn.cpp +++ b/src/min_hftn.cpp @@ -17,6 +17,7 @@ "Parallel Unconstrained Min", Plantenga, SAND98-8201 ------------------------------------------------------------------------- */ +#include #include #include #include "atom.h" diff --git a/src/min_linesearch.cpp b/src/min_linesearch.cpp index f93a56b09d..33a781ecfe 100644 --- a/src/min_linesearch.cpp +++ b/src/min_linesearch.cpp @@ -21,19 +21,16 @@ JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg ------------------------------------------------------------------------- */ +#include #include #include "min_linesearch.h" #include "atom.h" -#include "update.h" -#include "neighbor.h" -#include "domain.h" #include "modify.h" +#include "neighbor.h" #include "fix_minimize.h" #include "pair.h" #include "output.h" #include "thermo.h" -#include "timer.h" -#include "error.h" using namespace LAMMPS_NS; diff --git a/src/min_quickmin.cpp b/src/min_quickmin.cpp index 8b48816355..784da82686 100644 --- a/src/min_quickmin.cpp +++ b/src/min_quickmin.cpp @@ -20,7 +20,6 @@ #include "update.h" #include "output.h" #include "timer.h" -#include "error.h" using namespace LAMMPS_NS; diff --git a/src/min_sd.cpp b/src/min_sd.cpp index 5d44437ca0..d66601119b 100644 --- a/src/min_sd.cpp +++ b/src/min_sd.cpp @@ -12,9 +12,7 @@ ------------------------------------------------------------------------- */ #include -#include #include "min_sd.h" -#include "atom.h" #include "update.h" #include "output.h" #include "timer.h" diff --git a/src/minimize.cpp b/src/minimize.cpp index e27fffd74b..e1af924019 100644 --- a/src/minimize.cpp +++ b/src/minimize.cpp @@ -11,7 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include "minimize.h" #include "domain.h" #include "update.h" diff --git a/src/modify.cpp b/src/modify.cpp index 3f034bf034..61497d86db 100644 --- a/src/modify.cpp +++ b/src/modify.cpp @@ -11,7 +11,6 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include #include #include "modify.h" #include "style_compute.h" diff --git a/src/molecule.cpp b/src/molecule.cpp index 454459084a..4a3790296f 100644 --- a/src/molecule.cpp +++ b/src/molecule.cpp @@ -11,7 +11,9 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include +#include +#include +#include #include #include "molecule.h" #include "atom.h" @@ -21,12 +23,10 @@ #include "comm.h" #include "domain.h" #include "math_extra.h" -#include "math_const.h" #include "memory.h" #include "error.h" using namespace LAMMPS_NS; -using namespace MathConst; #define MAXLINE 256 #define EPSILON 1.0e-7 diff --git a/src/nbin.cpp b/src/nbin.cpp index a30b76cca0..0480c9730d 100644 --- a/src/nbin.cpp +++ b/src/nbin.cpp @@ -11,11 +11,11 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ +#include #include "nbin.h" #include "neighbor.h" #include "neigh_request.h" #include "domain.h" -#include "update.h" #include "memory.h" #include "error.h" diff --git a/src/neigh_list.cpp b/src/neigh_list.cpp index 6bdb9beae6..651b2ed70a 100644 --- a/src/neigh_list.cpp +++ b/src/neigh_list.cpp @@ -12,15 +12,13 @@ ------------------------------------------------------------------------- */ #include "neigh_list.h" +#include "my_page.h" #include "atom.h" #include "comm.h" -#include "update.h" -#include "pair.h" #include "neighbor.h" #include "neigh_request.h" #include "my_page.h" #include "memory.h" -#include "error.h" using namespace LAMMPS_NS; diff --git a/src/neigh_list.h b/src/neigh_list.h index 755a1bf134..aca11cd921 100644 --- a/src/neigh_list.h +++ b/src/neigh_list.h @@ -15,7 +15,6 @@ #define LMP_NEIGH_LIST_H #include "pointers.h" -#include "my_page.h" namespace LAMMPS_NS { diff --git a/src/neighbor.cpp b/src/neighbor.cpp index 0382624198..a2efc5919b 100644 --- a/src/neighbor.cpp +++ b/src/neighbor.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include "neighbor.h" #include "neigh_list.h" @@ -48,8 +47,6 @@ #include "error.h" #include "utils.h" -#include - using namespace LAMMPS_NS; using namespace NeighConst; diff --git a/src/neighbor.h b/src/neighbor.h index 3466dd426a..50de4b4c98 100644 --- a/src/neighbor.h +++ b/src/neighbor.h @@ -15,7 +15,6 @@ #define LMP_NEIGHBOR_H #include "pointers.h" -#include namespace LAMMPS_NS { diff --git a/src/npair_copy.cpp b/src/npair_copy.cpp index 9426d22ed3..0a522c628d 100644 --- a/src/npair_copy.cpp +++ b/src/npair_copy.cpp @@ -12,14 +12,7 @@ ------------------------------------------------------------------------- */ #include "npair_copy.h" -#include "neighbor.h" #include "neigh_list.h" -#include "atom.h" -#include "atom_vec.h" -#include "molecule.h" -#include "domain.h" -#include "my_page.h" -#include "error.h" using namespace LAMMPS_NS; diff --git a/src/npair_full_bin.cpp b/src/npair_full_bin.cpp index 94a6af129c..464dca9251 100644 --- a/src/npair_full_bin.cpp +++ b/src/npair_full_bin.cpp @@ -12,7 +12,6 @@ ------------------------------------------------------------------------- */ #include "npair_full_bin.h" -#include "neighbor.h" #include "neigh_list.h" #include "atom.h" #include "atom_vec.h" diff --git a/src/npair_full_bin_atomonly.cpp b/src/npair_full_bin_atomonly.cpp index db84733f1c..758fc7e42b 100644 --- a/src/npair_full_bin_atomonly.cpp +++ b/src/npair_full_bin_atomonly.cpp @@ -12,11 +12,9 @@ ------------------------------------------------------------------------- */ #include "npair_full_bin_atomonly.h" -#include "neighbor.h" #include "neigh_list.h" #include "atom.h" #include "atom_vec.h" -#include "domain.h" #include "my_page.h" #include "error.h" diff --git a/src/procmap.cpp b/src/procmap.cpp index 9d1ed83e73..08b60a26af 100644 --- a/src/procmap.cpp +++ b/src/procmap.cpp @@ -15,6 +15,7 @@ Contributing author (NUMA option) : Mike Brown (ORNL) ------------------------------------------------------------------------- */ +#include #include "procmap.h" #include "universe.h" #include "comm.h"