Unverified Commit c00f2adb authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1544 from akohlmey/collected-small-fixes 

Collected small changes and bugfixes for the next patch release
parents e123b6f0 6fc5810b

doc/src/if.txt

+1 −2
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ Boolean expression is FALSE, then no commands are executed. 
The syntax for Boolean expressions is described below.



Each command (t1, f1, e1, etc) can be any valid LAMMPS input script

command, except an "include"_include.html command, which is not

allowed.  If the command is more than one word, it must enclosed in

command.  If the command is more than one word, it must enclosed in

quotes, so it will be treated as a single argument, as in the examples

above.

src/ASPHERE/compute_temp_asphere.cpp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ ComputeTempAsphere::ComputeTempAsphere(LAMMPS *lmp, int narg, char **arg) : 


  if (mode == ROTATE) extra_dof = 0;



  vector = new double[6];

  vector = new double[size_vector];



}

src/BODY/compute_temp_body.cpp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ ComputeTempBody::ComputeTempBody(LAMMPS *lmp, int narg, char **arg) : 
    } else error->all(FLERR,"Illegal compute temp/body command");

  }



  vector = new double[6];

  vector = new double[size_vector];



}

src/CORESHELL/compute_temp_cs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ComputeTempCS::ComputeTempCS(LAMMPS *lmp, int narg, char **arg) : 


  // allocate memory



  vector = new double[6];

  vector = new double[size_vector];

  maxatom = 0;

  vint = NULL;

src/QEQ/fix_qeq_shielded.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void FixQEqShielded::init() 


void FixQEqShielded::extract_reax()

{

  Pair *pair = force->pair_match("reax/c",1);

  Pair *pair = force->pair_match("^reax/c",0);

  if (pair == NULL) error->all(FLERR,"No pair reax/c for fix qeq/shielded");

  int tmp;

  chi = (double *) pair->extract("chi",tmp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE