tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2016-03-22 13:45:31 +00:00
parent acc29ff266
commit c1c464d033
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MANYBODY/pair_comb3.cpp
View File

@ -314,8 +314,6 @@ void PairComb3::read_lib()
char s[maxlib]; char s[maxlib];
char **words = new char*[80]; char **words = new char*[80];
MPI_Comm_rank(world,&comm->me);
// open libraray file on proc 0 // open libraray file on proc 0
if (comm->me == 0) { if (comm->me == 0) {

2
src/POEMS/fix_poems.cpp
View File

@ -938,7 +938,7 @@ void FixPOEMS::readfile(char *file)
} }
memory->destroy(line); memory->destroy(line);
fclose(fp); if (me == 0) fclose(fp);
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

5
src/Purge.list
View File

@ -13,6 +13,11 @@ style_kspace.h
style_minimize.h style_minimize.h
style_pair.h style_pair.h
style_region.h style_region.h
# deleted on 21 Mar 2016
verlet_intel.cpp
verlet_intel.h
verlet_split_intel.cpp
verlet_split_intel.h
# deleted on 15 Jan 2016 # deleted on 15 Jan 2016
pair_line_lj_omp.cpp pair_line_lj_omp.cpp
pair_line_lj_omp.h pair_line_lj_omp.h

4
src/USER-H5MD/dump_h5md.cpp
View File

@ -173,7 +173,7 @@ DumpH5MD::DumpH5MD(LAMMPS *lmp, int narg, char **arg) : Dump(lmp, narg, arg)
error->all(FLERR, "Invalid number of arguments in dump h5md"); error->all(FLERR, "Invalid number of arguments in dump h5md");
} }
if (author_name==NULL) { if (author_name==NULL) {
author_name = new char[strlen(arg[iarg]+1)]; author_name = new char[strlen(arg[iarg])+1];
strcpy(author_name, arg[iarg+1]); strcpy(author_name, arg[iarg+1]);
} else { } else {
error->all(FLERR, "Illegal dump h5md command: author argument repeated"); error->all(FLERR, "Illegal dump h5md command: author argument repeated");
@ -273,7 +273,7 @@ void DumpH5MD::openfile()
} else { } else {
datafile = h5md_create_file(filename, author_name, NULL, "lammps", LAMMPS_VERSION); datafile = h5md_create_file(filename, author_name, NULL, "lammps", LAMMPS_VERSION);
} }
group_name_length = strlen(group->names[igroup]); group_name_length = strlen(group->names[igroup])+1;
group_name = new char[group_name_length]; group_name = new char[group_name_length];
strcpy(group_name, group->names[igroup]); strcpy(group_name, group->names[igroup]);
if (create_group) { if (create_group) {

1
src/compute_bond.h
View File

@ -32,7 +32,6 @@ class ComputeBond : public Compute {
double compute_scalar(); double compute_scalar();
private: private:
int nbond;
char *bstyle; char *bstyle;
class Bond *bond; class Bond *bond;
}; };

3
src/rerun.cpp
View File

@ -65,7 +65,8 @@ void Rerun::command(int narg, char **arg)
int nskip = 1; int nskip = 1;
int startflag = 0; int startflag = 0;
int stopflag = 0; int stopflag = 0;
bigint start,stop; bigint start = -1;
bigint stop = -1;
while (iarg < narg) { while (iarg < narg) {
if (strcmp(arg[iarg],"first") == 0) { if (strcmp(arg[iarg],"first") == 0) {