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

sync with GH

Browse Source 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15562 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
sjplimp
2016-09-08 20:37:31 +00:00
parent b190abea39
commit 1dd7a13d82
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/SHOCK/fix_append_atoms.h
View File

@ -79,8 +79,7 @@ must be of type m (shrink/minimum).
E: Bad fix ID in fix append/atoms command
The value of the fix_id for keyword spatial must start with the suffix
f_.
The value of the fix_id for keyword spatial must start with 'f_'.
E: Invalid basis setting in fix append/atoms command

1
src/USER-MISC/fix_ttm_mod.cpp
View File

@ -282,7 +282,6 @@ FixTTMMod::FixTTMMod(LAMMPS *lmp, int narg, char **arg) :
if (me == 0) read_initial_electron_temperatures(fpr);
MPI_Bcast(&T_electron[0][0][0],total_nnodes,MPI_DOUBLE,0,world);
fclose(fpr);
fclose(fpr_2);
}
/* ---------------------------------------------------------------------- */

17
src/fix_shear_history.cpp
View File

@ -29,13 +29,13 @@
using namespace LAMMPS_NS;
using namespace FixConst;
enum{NPARTNER,PERPARTNER};
enum{DEFAULT,NPARTNER,PERPARTNER};
/* ---------------------------------------------------------------------- */
FixShearHistory::FixShearHistory(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg),
npartner(NULL), partner(NULL), shearpartner(NULL), ipage(NULL), dpage(NULL)
npartner(NULL), partner(NULL), shearpartner(NULL), pair(NULL), ipage(NULL), dpage(NULL)
{
if (narg != 4) error->all(FLERR,"Illegal fix SHEAR_HISTORY commmand");
@ -71,6 +71,7 @@ FixShearHistory::FixShearHistory(LAMMPS *lmp, int narg, char **arg) :
maxtouch = 0;
nlocal_neigh = nall_neigh = 0;
commflag = DEFAULT;
}
/* ---------------------------------------------------------------------- */
@ -87,6 +88,14 @@ FixShearHistory::~FixShearHistory()
memory->destroy(npartner);
memory->sfree(partner);
memory->sfree(shearpartner);
// to better detect use-after-delete errors
pair = NULL;
npartner = NULL;
partner = NULL;
shearpartner = NULL;
delete [] ipage;
delete [] dpage;
}
@ -609,7 +618,7 @@ int FixShearHistory::pack_reverse_comm(int n, int first, double *buf)
m += dnum;
}
}
}
} else error->all(FLERR,"Unsupported comm mode in shear history");
return m;
}
@ -640,7 +649,7 @@ void FixShearHistory::unpack_reverse_comm(int n, int *list, double *buf)
m += dnum;
}
}
}
} else error->all(FLERR,"Unsupported comm mode in shear history");
}
/* ----------------------------------------------------------------------