ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1386 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2008-01-17 23:46:47 +00:00
parent d5514c3194
commit f953536132
17 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MAKE/Makefile.crockett
View File

@ -6,7 +6,7 @@ SHELL = /bin/sh
# System-specific settings # System-specific settings
CC = mpiCC CC = mpiCC
CCFLAGS = -g -O -DFFT_NONE -DGZIP CCFLAGS = -g -O -DFFT_NONE -DLAMMPS_GZIP
DEPFLAGS = -M DEPFLAGS = -M
LINK = mpiCC LINK = mpiCC
LINKFLAGS = -g -O LINKFLAGS = -g -O

2
src/MAKE/Makefile.debian
View File

@ -6,7 +6,7 @@ SHELL = /bin/sh
# System-specific settings # System-specific settings
CC = g++ CC = g++
CCFLAGS = -g -O -I/usr/lib/mpich/include/ -DFFT_FFTW -DGZIP CCFLAGS = -g -O -I/usr/lib/mpich/include/ -DFFT_FFTW -DLAMMPS_GZIP
DEPFLAGS = -M DEPFLAGS = -M
LINK = g++ LINK = g++
LINKFLAGS = -g -O -L/usr/lib/mpich/lib LINKFLAGS = -g -O -L/usr/lib/mpich/lib

2
src/MAKE/Makefile.g++
View File

@ -5,7 +5,7 @@ SHELL = /bin/sh
# System-specific settings # System-specific settings
CC = g++ CC = g++
CCFLAGS = -g -O -DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK CCFLAGS = -g -O -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK
DEPFLAGS = -M DEPFLAGS = -M
LINK = g++ LINK = g++
LINKFLAGS = -g -O LINKFLAGS = -g -O

2
src/MAKE/Makefile.g++_meam
View File

@ -6,7 +6,7 @@ SHELL = /bin/sh
# System-specific settings # System-specific settings
CC = g++ CC = g++
CCFLAGS = -g -O -DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK CCFLAGS = -g -O -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK
DEPFLAGS = -M DEPFLAGS = -M
LINK = g++ LINK = g++
LINKFLAGS = -g -O -L/home/sjplimp/lammps/lib/meam \ LINKFLAGS = -g -O -L/home/sjplimp/lammps/lib/meam \

2
src/MAKE/Makefile.g++_poems
View File

@ -7,7 +7,7 @@ SHELL = /bin/sh
CC = g++ CC = g++
CCFLAGS = -g -O -I/home/sjplimp/lammps/lib/poems \ CCFLAGS = -g -O -I/home/sjplimp/lammps/lib/poems \
-DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK
DEPFLAGS = -M DEPFLAGS = -M
LINK = g++ LINK = g++
LINKFLAGS = -g -O -L/home/sjplimp/lammps/lib/poems LINKFLAGS = -g -O -L/home/sjplimp/lammps/lib/poems

2
src/MAKE/Makefile.g++_poems_meam
View File

@ -7,7 +7,7 @@ SHELL = /bin/sh
CC = g++ CC = g++
CCFLAGS = -g -O -I/home/sjplimp/lammps/lib/poems \ CCFLAGS = -g -O -I/home/sjplimp/lammps/lib/poems \
-DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK
DEPFLAGS = -M DEPFLAGS = -M
LINK = g++ LINK = g++
LINKFLAGS = -g -O -L/home/sjplimp/lammps/lib/poems \ LINKFLAGS = -g -O -L/home/sjplimp/lammps/lib/poems \

2
src/MAKE/Makefile.linux
View File

@ -5,7 +5,7 @@ SHELL = /bin/sh
# System-specific settings # System-specific settings
CC = icc CC = icc
CCFLAGS = -O -DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK CCFLAGS = -O -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK
DEPFLAGS = -M DEPFLAGS = -M
LINK = icc LINK = icc
LINKFLAGS = -O LINKFLAGS = -O

2
src/MAKE/Makefile.linux_poems_meam
View File

@ -7,7 +7,7 @@ SHELL = /bin/sh
CC = icc CC = icc
CCFLAGS = -O -I/home/sjplimp/lammps/lib/poems \ CCFLAGS = -O -I/home/sjplimp/lammps/lib/poems \
-DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK
DEPFLAGS = -M DEPFLAGS = -M
LINK = icc LINK = icc
LINKFLAGS = -O -L/home/sjplimp/lammps/lib/poems \ LINKFLAGS = -O -L/home/sjplimp/lammps/lib/poems \

2
src/MAKE/Makefile.odin
View File

@ -6,7 +6,7 @@ SHELL = /bin/sh
# System-specific settings # System-specific settings
CC = g++ CC = g++
CCFLAGS = -O -I/opt/mpich-mx/include -DFFT_NONE -DGZIP CCFLAGS = -O -I/opt/mpich-mx/include -DFFT_NONE -DLAMMPS_GZIP
DEPFLAGS = -M DEPFLAGS = -M
LINK = g++ LINK = g++
LINKFLAGS = -O -L/opt/mpich-mx/lib -L/opt/mx/lib LINKFLAGS = -O -L/opt/mpich-mx/lib -L/opt/mx/lib

2
src/MAKE/Makefile.pg
View File

@ -8,7 +8,7 @@ SHELL = /bin/sh
CC = pgCC -fast CC = pgCC -fast
CCFLAGS = -I/usr/local/mpich-1.2.6/pg/include \ CCFLAGS = -I/usr/local/mpich-1.2.6/pg/include \
-I/usr/local/include \ -I/usr/local/include \
-DFFT_FFTW -DGZIP -DFFT_FFTW -DLAMMPS_GZIP
DEPFLAGS = -M DEPFLAGS = -M
LINK = pgCC LINK = pgCC
LINKFLAGS = -L/usr/local/mpich-1.2.6/pg/lib \ LINKFLAGS = -L/usr/local/mpich-1.2.6/pg/lib \

2
src/MAKE/Makefile.pg_meam
View File

@ -8,7 +8,7 @@ SHELL = /bin/sh
CC = pgCC -fast CC = pgCC -fast
CCFLAGS = -I/usr/local/mpich-1.2.6/pg/include \ CCFLAGS = -I/usr/local/mpich-1.2.6/pg/include \
-I/usr/local/include \ -I/usr/local/include \
-DFFT_FFTW -DGZIP -DFFT_FFTW -DLAMMPS_GZIP
DEPFLAGS = -M DEPFLAGS = -M
LINK = pgCC LINK = pgCC
LINKFLAGS = -L/usr/local/mpich-1.2.6/pg/lib \ LINKFLAGS = -L/usr/local/mpich-1.2.6/pg/lib \

2
src/MAKE/Makefile.ydl
View File

@ -8,7 +8,7 @@ SHELL = /bin/sh
CC = xlc -q64 CC = xlc -q64
CCFLAGS = -g -O -I/opt/mpich/include \ CCFLAGS = -g -O -I/opt/mpich/include \
-I/usr/local/include -L/opt/mpich/lib64 \ -I/usr/local/include -L/opt/mpich/lib64 \
-DFFT_FFTW -DGZIP -DFFT_FFTW -DLAMMPS_LAMMPS_GZIP
DEPFLAGS = -M DEPFLAGS = -M
LINK = xlc -q64 LINK = xlc -q64
LINKFLAGS = -g -O -L/opt/mpich/lib64 \ LINKFLAGS = -g -O -L/opt/mpich/lib64 \

2
src/dump.cpp
View File

@ -285,7 +285,7 @@ void Dump::openfile()
if (me == 0 || multiproc) { if (me == 0 || multiproc) {
if (compressed) { if (compressed) {
#ifdef GZIP #ifdef LAMMPS_GZIP
char gzip[128]; char gzip[128];
sprintf(gzip,"gzip -6 > %s",filecurrent); sprintf(gzip,"gzip -6 > %s",filecurrent);
fp = popen(gzip,"w"); fp = popen(gzip,"w");

2
src/fix_tmd.cpp
View File

@ -529,7 +529,7 @@ void FixTMD::open(char *file)
if (suffix > file && strcmp(suffix,".gz") == 0) compressed = 1; if (suffix > file && strcmp(suffix,".gz") == 0) compressed = 1;
if (!compressed) fp = fopen(file,"r"); if (!compressed) fp = fopen(file,"r");
else { else {
#ifdef GZIP #ifdef LAMMPS_GZIP
char gunzip[128]; char gunzip[128];
sprintf(gunzip,"gunzip -c %s",file); sprintf(gunzip,"gunzip -c %s",file);
fp = popen(gunzip,"r"); fp = popen(gunzip,"r");

2
src/output.cpp
View File

@ -55,7 +55,7 @@ Output::Output(LAMMPS *lmp) : Pointers(lmp)
newarg[2] = (char *) "temp"; newarg[2] = (char *) "temp";
modify->add_compute(3,newarg); modify->add_compute(3,newarg);
newarg[0] = (char *) "thermo_pressure"; newarg[0] = (char *) "thermo_press";
newarg[1] = (char *) "all"; newarg[1] = (char *) "all";
newarg[2] = (char *) "pressure"; newarg[2] = (char *) "pressure";
newarg[3] = (char *) "thermo_temp"; newarg[3] = (char *) "thermo_temp";

2
src/read_data.cpp
View File

@ -1201,7 +1201,7 @@ void ReadData::open(char *file)
if (suffix > file && strcmp(suffix,".gz") == 0) compressed = 1; if (suffix > file && strcmp(suffix,".gz") == 0) compressed = 1;
if (!compressed) fp = fopen(file,"r"); if (!compressed) fp = fopen(file,"r");
else { else {
#ifdef GZIP #ifdef LAMMPS_GZIP
char gunzip[128]; char gunzip[128];
sprintf(gunzip,"gunzip -c %s",file); sprintf(gunzip,"gunzip -c %s",file);
fp = popen(gunzip,"r"); fp = popen(gunzip,"r");

6
src/thermo.cpp
View File

@ -125,7 +125,7 @@ Thermo::Thermo(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
internal_drot = internal_grot = 0; internal_drot = internal_grot = 0;
id_temp = (char *) "thermo_temp"; id_temp = (char *) "thermo_temp";
id_press = (char *) "thermo_pressure"; id_press = (char *) "thermo_press";
id_pe = (char *) "thermo_pe"; id_pe = (char *) "thermo_pe";
id_drot = (char *) "thermo_rotate_dipole"; id_drot = (char *) "thermo_rotate_dipole";
id_grot = (char *) "thermo_rotate_gran"; id_grot = (char *) "thermo_rotate_gran";
@ -410,12 +410,12 @@ void Thermo::modify_params(int narg, char **arg)
error->warning("Temperature for thermo pressure is not for group all"); error->warning("Temperature for thermo pressure is not for group all");
// reset id_pre of pressure to new temp ID // reset id_pre of pressure to new temp ID
// either pressure currently being used by thermo or "thermo_pressure" // either pressure currently being used by thermo or "thermo_press"
if (index_press >= 0) { if (index_press >= 0) {
icompute = modify->find_compute(id_compute[index_press]); icompute = modify->find_compute(id_compute[index_press]);
if (icompute < 0) error->all("Press ID for thermo does not exist"); if (icompute < 0) error->all("Press ID for thermo does not exist");
} else icompute = modify->find_compute((char *) "thermo_pressure"); } else icompute = modify->find_compute((char *) "thermo_press");
delete [] modify->compute[icompute]->id_pre; delete [] modify->compute[icompute]->id_pre;
modify->compute[icompute]->id_pre = new char[n]; modify->compute[icompute]->id_pre = new char[n];