diff --git a/src/MAKE/Makefile.linux b/src/MAKE/Makefile.linux index f0348b3eea9a0f470aa8ec62bab7a6d0c0602d4a..cf39084f2dd8f23010699faee47330f8a4b4144e 100755 --- a/src/MAKE/Makefile.linux +++ b/src/MAKE/Makefile.linux @@ -24,7 +24,7 @@ SIZE = size # LAMMPS ifdef settings, OPTIONAL # see possible settings in doc/Section_start.html#2_2 (step 4) -LMP_INC = -DLAMMPS_GZIP +LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG # MPI library, REQUIRED # see discussion in doc/Section_start.html#2_2 (step 5) @@ -35,7 +35,7 @@ LMP_INC = -DLAMMPS_GZIP MPI_INC = -DMPICH_SKIP_MPICXX MPI_PATH = -MPI_LIB = -lmpich -lpthread +MPI_LIB = -lmpich -lmpl -lpthread # FFT library, OPTIONAL # see discussion in doc/Section_start.html#2_2 (step 6) @@ -57,7 +57,7 @@ FFT_LIB = -lfftw JPG_INC = JPG_PATH = -JPG_LIB = +JPG_LIB = -ljpeg # --------------------------------------------------------------------- # build rules and dependencies diff --git a/src/read_data.cpp b/src/read_data.cpp index 772c3a3824655ae325071b81aac015afa3d73df5..a96a566b017486783fce76428be037818d17b30e 100644 --- a/src/read_data.cpp +++ b/src/read_data.cpp @@ -46,9 +46,6 @@ using namespace LAMMPS_NS; // customize for new sections #define NSECTIONS 23 // change when add to header::section_keywords -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) > (b) ? (a) : (b)) - /* ---------------------------------------------------------------------- */ ReadData::ReadData(LAMMPS *lmp) : Pointers(lmp)