Commit 89753028 authored by sjplimp's avatar sjplimp
Browse files 

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

doc/pair_style_gran.html

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
</H3>

<P><B>Syntax:</B>

</P>

<PRE>pair_style style Kn, gamma_n xmu dampflag 

<PRE>pair_style style Kn gamma_n xmu dampflag 

</PRE>

<UL><LI>style = <I>gran/hertzian</I> or <I>gran/history</I> or <I>gran/no_history</I>

doc/pair_style_gran.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ pair_style gran/no_history command :h3 


[Syntax:]



pair_style style Kn, gamma_n xmu dampflag :pre

pair_style style Kn gamma_n xmu dampflag :pre



style = {gran/hertzian} or {gran/history} or {gran/no_history} :ulb,l

Kn = spring constant for particle repulsion :l

src/create_atoms.cpp

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void CreateAtoms::command(int narg, char **arg) 
  // parse arguments



  int nbasis = domain->lattice->nbasis;

  int basistype[nbasis];

  int *basistype = new int[nbasis];



  if (narg < 1) error->all("Illegal create_atoms command");

  int itype = atoi(arg[0]);
@@ -133,6 +133,8 @@ void CreateAtoms::command(int narg, char **arg) 
	for (m = 0; m < nbasis; m++)

	  add_atom(basistype[m],i+basis[m][0],j+basis[m][1],k+basis[m][2]);



  delete [] basistype;



  // new total # of atoms



  double rlocal = atom->nlocal;

CRA Git | Maintained and supported by SUSTech CRA and CCSE