From 52568d2738fbca2c21c7278ed04e6ce7fb788f53 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 28 Feb 2012 17:19:20 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7849 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/MAKE/Makefile.glory | 1 - src/MAKE/Makefile.redsky | 1 - src/MAKE/Makefile.tunnison | 1 - src/atom_vec_atomic.cpp | 2 +- src/atom_vec_charge.cpp | 2 +- src/atom_vec_ellipsoid.cpp | 2 +- src/atom_vec_hybrid.cpp | 2 +- src/atom_vec_line.cpp | 2 +- src/atom_vec_sphere.cpp | 2 +- src/atom_vec_tri.cpp | 2 +- src/balance.cpp | 2 +- src/comm.cpp | 2 +- src/compute.cpp | 2 +- src/compute_reduce.cpp | 2 +- src/create_atoms.cpp | 2 +- src/delete_atoms.cpp | 2 +- src/dump_dcd.cpp | 2 +- src/fix_ave_atom.cpp | 2 +- src/fix_ave_correlate.cpp | 2 +- src/fix_ave_histo.cpp | 2 +- src/fix_ave_spatial.cpp | 2 +- src/fix_ave_time.cpp | 2 +- src/force.cpp | 2 +- src/group.cpp | 3 +-- src/integrate.cpp | 2 +- src/memory.cpp | 2 +- src/min.cpp | 2 +- src/minimize.cpp | 2 +- src/modify.cpp | 2 +- src/neigh_bond.cpp | 2 +- src/neigh_list.cpp | 2 +- src/read_data.cpp | 2 +- src/replicate.cpp | 2 +- src/run.cpp | 2 +- src/update.cpp | 2 +- 35 files changed, 32 insertions(+), 36 deletions(-) diff --git a/src/MAKE/Makefile.glory b/src/MAKE/Makefile.glory index 0e61e441a0..689d95cae5 100644 --- a/src/MAKE/Makefile.glory +++ b/src/MAKE/Makefile.glory @@ -1,7 +1,6 @@ # glory = Linux cluster with 4-way quad cores, Intel mpicxx, native MPI, FFTW SHELL = /bin/sh -.IGNORE: # this Makefile builds LAMMPS for mvapich running on Glory # to invoke this Makefile, you need these modules loaded: diff --git a/src/MAKE/Makefile.redsky b/src/MAKE/Makefile.redsky index bc06bc8b2f..899761f9df 100644 --- a/src/MAKE/Makefile.redsky +++ b/src/MAKE/Makefile.redsky @@ -1,7 +1,6 @@ # redsky - SUN X6275 with dual socket/quad core nodes, mpic++, openmpi, FFTW SHELL = /bin/sh -.IGNORE: # this Makefile builds LAMMPS for RedSky with OpenMPI # to invoke this Makefile, you need these modules loaded: diff --git a/src/MAKE/Makefile.tunnison b/src/MAKE/Makefile.tunnison index 25426113f3..c8b1e38fe6 100644 --- a/src/MAKE/Makefile.tunnison +++ b/src/MAKE/Makefile.tunnison @@ -1,7 +1,6 @@ # tunnison - 64-bit dual-core Linux cluster, mpic++, OpenMPI-1.1, FFTW2 SHELL = /bin/sh -.IGNORE: # this Makefile builds LAMMPS for Tunnison with OpenMPI # to invoke this Makefile, you need these modules loaded: diff --git a/src/atom_vec_atomic.cpp b/src/atom_vec_atomic.cpp index e4e2dcf5ee..c1cf5b64a4 100644 --- a/src/atom_vec_atomic.cpp +++ b/src/atom_vec_atomic.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "atom_vec_atomic.h" #include "atom.h" diff --git a/src/atom_vec_charge.cpp b/src/atom_vec_charge.cpp index 81fc7a8ef8..fb61208fb7 100644 --- a/src/atom_vec_charge.cpp +++ b/src/atom_vec_charge.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "atom_vec_charge.h" #include "atom.h" diff --git a/src/atom_vec_ellipsoid.cpp b/src/atom_vec_ellipsoid.cpp index 4baff5b602..66ca54dfc6 100755 --- a/src/atom_vec_ellipsoid.cpp +++ b/src/atom_vec_ellipsoid.cpp @@ -15,7 +15,7 @@ Contributing author: Mike Brown (SNL) ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "atom_vec_ellipsoid.h" #include "math_extra.h" diff --git a/src/atom_vec_hybrid.cpp b/src/atom_vec_hybrid.cpp index b6b1dabdea..42e66cde71 100644 --- a/src/atom_vec_hybrid.cpp +++ b/src/atom_vec_hybrid.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "atom_vec_hybrid.h" diff --git a/src/atom_vec_line.cpp b/src/atom_vec_line.cpp index f98170533c..71370f7d6a 100644 --- a/src/atom_vec_line.cpp +++ b/src/atom_vec_line.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "math.h" #include "stdlib.h" #include "string.h" diff --git a/src/atom_vec_sphere.cpp b/src/atom_vec_sphere.cpp index 96b2d766d8..ff4dbce8f4 100644 --- a/src/atom_vec_sphere.cpp +++ b/src/atom_vec_sphere.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "math.h" #include "stdlib.h" #include "string.h" diff --git a/src/atom_vec_tri.cpp b/src/atom_vec_tri.cpp index 0f3fbe161a..c5275e4d2e 100644 --- a/src/atom_vec_tri.cpp +++ b/src/atom_vec_tri.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "math.h" #include "stdlib.h" #include "string.h" diff --git a/src/balance.cpp b/src/balance.cpp index e39795ed63..775fda0e80 100644 --- a/src/balance.cpp +++ b/src/balance.cpp @@ -11,8 +11,8 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "mpi.h" #include "lmptype.h" +#include "mpi.h" #include "math.h" #include "stdlib.h" #include "string.h" diff --git a/src/comm.cpp b/src/comm.cpp index 49ba0cad71..b9a94d612c 100644 --- a/src/comm.cpp +++ b/src/comm.cpp @@ -15,7 +15,7 @@ Contributing author (triclinic) : Pieter in 't Veld (SNL) ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "mpi.h" #include "math.h" #include "string.h" diff --git a/src/compute.cpp b/src/compute.cpp index b33fe7595e..594131ccff 100644 --- a/src/compute.cpp +++ b/src/compute.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "mpi.h" #include "stdlib.h" #include "string.h" diff --git a/src/compute_reduce.cpp b/src/compute_reduce.cpp index 3872661a67..ac2271ccb7 100644 --- a/src/compute_reduce.cpp +++ b/src/compute_reduce.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "string.h" #include "stdlib.h" #include "compute_reduce.h" diff --git a/src/create_atoms.cpp b/src/create_atoms.cpp index ff717cfdd2..fad4a7f65e 100644 --- a/src/create_atoms.cpp +++ b/src/create_atoms.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "math.h" #include "stdlib.h" #include "string.h" diff --git a/src/delete_atoms.cpp b/src/delete_atoms.cpp index 9ed147e068..1b2c87b2ab 100644 --- a/src/delete_atoms.cpp +++ b/src/delete_atoms.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "delete_atoms.h" diff --git a/src/dump_dcd.cpp b/src/dump_dcd.cpp index a9d048f8df..699be9faa8 100644 --- a/src/dump_dcd.cpp +++ b/src/dump_dcd.cpp @@ -16,7 +16,7 @@ Axel Kohlmeyer (Temple U), support for groups ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "math.h" #include "inttypes.h" #include "stdio.h" diff --git a/src/fix_ave_atom.cpp b/src/fix_ave_atom.cpp index b698ee24b2..29ae10491e 100644 --- a/src/fix_ave_atom.cpp +++ b/src/fix_ave_atom.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "fix_ave_atom.h" diff --git a/src/fix_ave_correlate.cpp b/src/fix_ave_correlate.cpp index 6956965092..be14f53ea8 100644 --- a/src/fix_ave_correlate.cpp +++ b/src/fix_ave_correlate.cpp @@ -17,7 +17,7 @@ Reese Jones (Sandia) ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "fix_ave_correlate.h" diff --git a/src/fix_ave_histo.cpp b/src/fix_ave_histo.cpp index 22ce073534..5bfdc64f27 100644 --- a/src/fix_ave_histo.cpp +++ b/src/fix_ave_histo.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "fix_ave_histo.h" diff --git a/src/fix_ave_spatial.cpp b/src/fix_ave_spatial.cpp index ea541fb5f3..7360818982 100644 --- a/src/fix_ave_spatial.cpp +++ b/src/fix_ave_spatial.cpp @@ -15,7 +15,7 @@ Contributing author: Pieter in 't Veld (SNL) ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "fix_ave_spatial.h" diff --git a/src/fix_ave_time.cpp b/src/fix_ave_time.cpp index 3dea04e518..080722f251 100644 --- a/src/fix_ave_time.cpp +++ b/src/fix_ave_time.cpp @@ -15,7 +15,7 @@ Contributing author: Pieter in 't Veld (SNL) ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "fix_ave_time.h" diff --git a/src/force.cpp b/src/force.cpp index 9e4c7eaef6..5090460e94 100644 --- a/src/force.cpp +++ b/src/force.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "ctype.h" diff --git a/src/group.cpp b/src/group.cpp index 87553843a2..7c52a5d368 100644 --- a/src/group.cpp +++ b/src/group.cpp @@ -11,9 +11,8 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" -#include "math.h" #include "mpi.h" +#include "math.h" #include "stdio.h" #include "string.h" #include "stdlib.h" diff --git a/src/integrate.cpp b/src/integrate.cpp index 6de4df26c3..8406f99549 100644 --- a/src/integrate.cpp +++ b/src/integrate.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "integrate.h" #include "update.h" diff --git a/src/memory.cpp b/src/memory.cpp index 4819303df2..e4db1713e4 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdio.h" #include "stdlib.h" #include "string.h" diff --git a/src/min.cpp b/src/min.cpp index 4f60e44fbd..4c17940e26 100644 --- a/src/min.cpp +++ b/src/min.cpp @@ -19,7 +19,7 @@ JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "math.h" #include "stdlib.h" #include "string.h" diff --git a/src/minimize.cpp b/src/minimize.cpp index 8f8f9d6546..d744f8602c 100644 --- a/src/minimize.cpp +++ b/src/minimize.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "minimize.h" #include "domain.h" diff --git a/src/modify.cpp b/src/modify.cpp index 09f3a3ce29..688154f5ef 100644 --- a/src/modify.cpp +++ b/src/modify.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdio.h" #include "string.h" #include "modify.h" diff --git a/src/neigh_bond.cpp b/src/neigh_bond.cpp index f9ff7f07e0..20933badea 100644 --- a/src/neigh_bond.cpp +++ b/src/neigh_bond.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "neighbor.h" #include "atom.h" #include "force.h" diff --git a/src/neigh_list.cpp b/src/neigh_list.cpp index 963ee03cf5..02a30e6205 100644 --- a/src/neigh_list.cpp +++ b/src/neigh_list.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "neigh_list.h" #include "atom.h" #include "comm.h" diff --git a/src/read_data.cpp b/src/read_data.cpp index 31addac3a5..567bda4195 100644 --- a/src/read_data.cpp +++ b/src/read_data.cpp @@ -12,8 +12,8 @@ ------------------------------------------------------------------------- */ #include "lmptype.h" -#include "math.h" #include "mpi.h" +#include "math.h" #include "string.h" #include "stdlib.h" #include "ctype.h" diff --git a/src/replicate.cpp b/src/replicate.cpp index c99407d394..9c84a9733c 100644 --- a/src/replicate.cpp +++ b/src/replicate.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "replicate.h" diff --git a/src/run.cpp b/src/run.cpp index 001320f6fd..4c2b5b31ac 100644 --- a/src/run.cpp +++ b/src/run.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "stdlib.h" #include "string.h" #include "run.h" diff --git a/src/update.cpp b/src/update.cpp index 7a4b124ece..ef08c5d6d1 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -11,7 +11,7 @@ See the README file in the top-level LAMMPS directory. ------------------------------------------------------------------------- */ -#include "lmptype.h" +//#include "lmptype.h" #include "string.h" #include "stdlib.h" #include "update.h"