From e5af9db84c7aee6f86e8cb1598fd99e65c4689d0 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sun, 7 Jul 2019 11:49:13 -0400 Subject: [PATCH] clean up includes in MC and MISC package --- src/MC/fix_atom_swap.cpp | 11 ++--------- src/MC/fix_bond_break.cpp | 4 ---- src/MC/fix_bond_create.cpp | 3 --- src/MC/fix_gcmc.cpp | 1 - src/MC/fix_tfmc.cpp | 1 - src/MC/pair_dsmc.cpp | 4 +--- src/MISC/compute_msd_nongauss.cpp | 3 +-- src/MISC/compute_ti.cpp | 1 - src/MISC/dump_xtc.cpp | 1 - src/MISC/fix_deposit.cpp | 2 +- src/MISC/fix_efield.cpp | 3 +-- src/MISC/fix_evaporate.cpp | 4 +--- src/MISC/fix_gld.cpp | 5 +---- src/MISC/fix_oneway.cpp | 1 - src/MISC/fix_orient_bcc.cpp | 1 - src/MISC/fix_orient_fcc.cpp | 1 - src/MISC/fix_thermal_conductivity.cpp | 2 -- src/MISC/fix_ttm.cpp | 2 -- src/MISC/fix_viscosity.cpp | 3 +-- src/MISC/pair_nm_cut.cpp | 3 +-- src/MISC/pair_nm_cut_coul_cut.cpp | 3 +-- src/MISC/pair_nm_cut_coul_long.cpp | 6 +----- src/MISC/xdr_compat.cpp | 1 - src/MISC/xdr_compat.h | 1 - 24 files changed, 12 insertions(+), 55 deletions(-) diff --git a/src/MC/fix_atom_swap.cpp b/src/MC/fix_atom_swap.cpp index c14efcca46..9a4a0b6a7f 100644 --- a/src/MC/fix_atom_swap.cpp +++ b/src/MC/fix_atom_swap.cpp @@ -17,13 +17,12 @@ ------------------------------------------------------------------------- */ #include "fix_atom_swap.h" +#include #include +#include #include -#include #include #include "atom.h" -#include "atom_vec.h" -#include "atom_vec_hybrid.h" #include "update.h" #include "modify.h" #include "fix.h" @@ -40,18 +39,12 @@ #include "dihedral.h" #include "improper.h" #include "kspace.h" -#include "math_const.h" #include "memory.h" #include "error.h" -#include "thermo.h" -#include "output.h" #include "neighbor.h" -#include -using namespace std; using namespace LAMMPS_NS; using namespace FixConst; -using namespace MathConst; /* ---------------------------------------------------------------------- */ diff --git a/src/MC/fix_bond_break.cpp b/src/MC/fix_bond_break.cpp index 1b07395f1e..2ff0e4126f 100644 --- a/src/MC/fix_bond_break.cpp +++ b/src/MC/fix_bond_break.cpp @@ -12,18 +12,14 @@ ------------------------------------------------------------------------- */ #include "fix_bond_break.h" -#include #include #include -#include #include "update.h" #include "respa.h" #include "atom.h" -#include "atom_vec.h" #include "force.h" #include "comm.h" #include "neighbor.h" -#include "domain.h" #include "random_mars.h" #include "memory.h" #include "error.h" diff --git a/src/MC/fix_bond_create.cpp b/src/MC/fix_bond_create.cpp index d2d93b67f6..3f63a22d60 100644 --- a/src/MC/fix_bond_create.cpp +++ b/src/MC/fix_bond_create.cpp @@ -12,14 +12,11 @@ ------------------------------------------------------------------------- */ #include "fix_bond_create.h" -#include #include #include -#include #include "update.h" #include "respa.h" #include "atom.h" -#include "atom_vec.h" #include "force.h" #include "pair.h" #include "comm.h" diff --git a/src/MC/fix_gcmc.cpp b/src/MC/fix_gcmc.cpp index 8fe6042c2e..1050fd4712 100644 --- a/src/MC/fix_gcmc.cpp +++ b/src/MC/fix_gcmc.cpp @@ -21,7 +21,6 @@ #include #include "atom.h" #include "atom_vec.h" -#include "atom_vec_hybrid.h" #include "molecule.h" #include "update.h" #include "modify.h" diff --git a/src/MC/fix_tfmc.cpp b/src/MC/fix_tfmc.cpp index 46c5e592ae..e57f1cdf4a 100644 --- a/src/MC/fix_tfmc.cpp +++ b/src/MC/fix_tfmc.cpp @@ -22,7 +22,6 @@ #include #include "atom.h" #include "force.h" -#include "update.h" #include "group.h" #include "random_mars.h" #include "comm.h" diff --git a/src/MC/pair_dsmc.cpp b/src/MC/pair_dsmc.cpp index cf48706133..43bffa7e8d 100644 --- a/src/MC/pair_dsmc.cpp +++ b/src/MC/pair_dsmc.cpp @@ -16,10 +16,8 @@ ------------------------------------------------------------------------- */ #include "pair_dsmc.h" +#include #include -#include -#include -#include #include #include "atom.h" #include "comm.h" diff --git a/src/MISC/compute_msd_nongauss.cpp b/src/MISC/compute_msd_nongauss.cpp index e02dd633cb..6123bf49af 100644 --- a/src/MISC/compute_msd_nongauss.cpp +++ b/src/MISC/compute_msd_nongauss.cpp @@ -16,13 +16,12 @@ ------------------------------------------------------------------------- */ #include "compute_msd_nongauss.h" -#include +#include #include "atom.h" #include "update.h" #include "group.h" #include "domain.h" #include "fix_store.h" -#include "error.h" using namespace LAMMPS_NS; diff --git a/src/MISC/compute_ti.cpp b/src/MISC/compute_ti.cpp index 266263785f..06188de238 100644 --- a/src/MISC/compute_ti.cpp +++ b/src/MISC/compute_ti.cpp @@ -20,7 +20,6 @@ #include #include "atom.h" #include "update.h" -#include "modify.h" #include "domain.h" #include "force.h" #include "pair.h" diff --git a/src/MISC/dump_xtc.cpp b/src/MISC/dump_xtc.cpp index 7abe4c4093..1a2b71ab6d 100644 --- a/src/MISC/dump_xtc.cpp +++ b/src/MISC/dump_xtc.cpp @@ -24,7 +24,6 @@ #include "dump_xtc.h" #include -#include #include #include #include diff --git a/src/MISC/fix_deposit.cpp b/src/MISC/fix_deposit.cpp index 22a144da60..c9d4958594 100644 --- a/src/MISC/fix_deposit.cpp +++ b/src/MISC/fix_deposit.cpp @@ -12,8 +12,8 @@ ------------------------------------------------------------------------- */ #include "fix_deposit.h" +#include #include -#include #include #include "atom.h" #include "atom_vec.h" diff --git a/src/MISC/fix_efield.cpp b/src/MISC/fix_efield.cpp index 87ece82f57..5a13b93b91 100644 --- a/src/MISC/fix_efield.cpp +++ b/src/MISC/fix_efield.cpp @@ -17,9 +17,8 @@ ------------------------------------------------------------------------- */ #include "fix_efield.h" -#include +#include #include -#include #include "atom.h" #include "update.h" #include "domain.h" diff --git a/src/MISC/fix_evaporate.cpp b/src/MISC/fix_evaporate.cpp index e2c7844853..d868254c50 100644 --- a/src/MISC/fix_evaporate.cpp +++ b/src/MISC/fix_evaporate.cpp @@ -12,8 +12,7 @@ ------------------------------------------------------------------------- */ #include "fix_evaporate.h" -#include -#include +#include #include #include "atom.h" #include "atom_vec.h" @@ -25,7 +24,6 @@ #include "force.h" #include "group.h" #include "random_park.h" -#include "random_mars.h" #include "memory.h" #include "error.h" diff --git a/src/MISC/fix_gld.cpp b/src/MISC/fix_gld.cpp index 265ee4fb09..380c038e4a 100644 --- a/src/MISC/fix_gld.cpp +++ b/src/MISC/fix_gld.cpp @@ -17,17 +17,14 @@ ------------------------------------------------------------------------- */ #include "fix_gld.h" +#include #include -#include #include -#include "math_extra.h" #include "atom.h" #include "force.h" #include "update.h" #include "respa.h" #include "comm.h" -#include "input.h" -#include "variable.h" #include "random_mars.h" #include "memory.h" #include "error.h" diff --git a/src/MISC/fix_oneway.cpp b/src/MISC/fix_oneway.cpp index fcf5a7a0bd..68a27b68be 100644 --- a/src/MISC/fix_oneway.cpp +++ b/src/MISC/fix_oneway.cpp @@ -22,7 +22,6 @@ #include "error.h" #include "force.h" #include "region.h" -#include "error.h" using namespace LAMMPS_NS; using namespace FixConst; diff --git a/src/MISC/fix_orient_bcc.cpp b/src/MISC/fix_orient_bcc.cpp index a300631658..1453ceb317 100644 --- a/src/MISC/fix_orient_bcc.cpp +++ b/src/MISC/fix_orient_bcc.cpp @@ -30,7 +30,6 @@ #include "neigh_list.h" #include "neigh_request.h" #include "comm.h" -#include "output.h" #include "force.h" #include "math_const.h" #include "citeme.h" diff --git a/src/MISC/fix_orient_fcc.cpp b/src/MISC/fix_orient_fcc.cpp index d898f95d2c..082ecaf459 100644 --- a/src/MISC/fix_orient_fcc.cpp +++ b/src/MISC/fix_orient_fcc.cpp @@ -27,7 +27,6 @@ #include "neigh_list.h" #include "neigh_request.h" #include "comm.h" -#include "output.h" #include "force.h" #include "math_const.h" #include "citeme.h" diff --git a/src/MISC/fix_thermal_conductivity.cpp b/src/MISC/fix_thermal_conductivity.cpp index 8da303c8ab..d0add6fecb 100644 --- a/src/MISC/fix_thermal_conductivity.cpp +++ b/src/MISC/fix_thermal_conductivity.cpp @@ -17,10 +17,8 @@ ------------------------------------------------------------------------- */ #include "fix_thermal_conductivity.h" -#include #include #include -#include #include "atom.h" #include "force.h" #include "domain.h" diff --git a/src/MISC/fix_ttm.cpp b/src/MISC/fix_ttm.cpp index 06de732de6..eb9eb2620d 100644 --- a/src/MISC/fix_ttm.cpp +++ b/src/MISC/fix_ttm.cpp @@ -20,12 +20,10 @@ #include #include #include -#include #include "atom.h" #include "force.h" #include "update.h" #include "domain.h" -#include "region.h" #include "respa.h" #include "comm.h" #include "random_mars.h" diff --git a/src/MISC/fix_viscosity.cpp b/src/MISC/fix_viscosity.cpp index 52107954c2..d5a97cd4b0 100644 --- a/src/MISC/fix_viscosity.cpp +++ b/src/MISC/fix_viscosity.cpp @@ -17,10 +17,9 @@ ------------------------------------------------------------------------- */ #include "fix_viscosity.h" -#include #include +#include #include -#include #include "atom.h" #include "domain.h" #include "modify.h" diff --git a/src/MISC/pair_nm_cut.cpp b/src/MISC/pair_nm_cut.cpp index 9b8c36da3a..a084491a78 100644 --- a/src/MISC/pair_nm_cut.cpp +++ b/src/MISC/pair_nm_cut.cpp @@ -16,9 +16,8 @@ ------------------------------------------------------------------------- */ #include "pair_nm_cut.h" +#include #include -#include -#include #include #include "atom.h" #include "comm.h" diff --git a/src/MISC/pair_nm_cut_coul_cut.cpp b/src/MISC/pair_nm_cut_coul_cut.cpp index 069c363817..df8a34062a 100644 --- a/src/MISC/pair_nm_cut_coul_cut.cpp +++ b/src/MISC/pair_nm_cut_coul_cut.cpp @@ -16,9 +16,8 @@ ------------------------------------------------------------------------- */ #include "pair_nm_cut_coul_cut.h" +#include #include -#include -#include #include #include "atom.h" #include "comm.h" diff --git a/src/MISC/pair_nm_cut_coul_long.cpp b/src/MISC/pair_nm_cut_coul_long.cpp index b3d42b05f8..4109fb0d9e 100644 --- a/src/MISC/pair_nm_cut_coul_long.cpp +++ b/src/MISC/pair_nm_cut_coul_long.cpp @@ -16,19 +16,15 @@ ------------------------------------------------------------------------- */ #include "pair_nm_cut_coul_long.h" +#include #include -#include -#include #include #include "atom.h" #include "comm.h" #include "force.h" #include "kspace.h" -#include "update.h" -#include "integrate.h" #include "neighbor.h" #include "neigh_list.h" -#include "neigh_request.h" #include "math_const.h" #include "memory.h" #include "error.h" diff --git a/src/MISC/xdr_compat.cpp b/src/MISC/xdr_compat.cpp index e124d52d7b..9806b0bbd2 100644 --- a/src/MISC/xdr_compat.cpp +++ b/src/MISC/xdr_compat.cpp @@ -1,6 +1,5 @@ #include "xdr_compat.h" #include -#include #include /* This file is needed for systems, that do not provide XDR support diff --git a/src/MISC/xdr_compat.h b/src/MISC/xdr_compat.h index 3062235080..5dfa01e0e8 100644 --- a/src/MISC/xdr_compat.h +++ b/src/MISC/xdr_compat.h @@ -3,7 +3,6 @@ #include #include -#include #ifdef __cplusplus extern "C" {