Commit 74b1caf2 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

undo changes that belong to a different branch or are redundant

parent 243137d5

src/fix_controller.cpp

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void FixController::end_of_step() 


  // invoke compute if not previously invoked



  double current = 0.0;

  double current;



  if (pvwhich == COMPUTE) {

    if (pvindex == 0) {

src/neighbor.cpp

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ Neighbor::Neighbor(LAMMPS *lmp) : Pointers(lmp) 
  binatomflag = 1;

  ago = -1;



  ago = -1;



  cutneighmax = 0.0;

  cutneighsq = NULL;

  cutneighghostsq = NULL;

src/variable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ double Variable::compute_equal(int ivar) 
    error->all(FLERR,"Variable has circular dependency");

  eval_in_progress[ivar] = 1;



  double value = 0.0;

  double value;

  if (style[ivar] == EQUAL) value = evaluate(data[ivar][0],NULL);

  else if (style[ivar] == INTERNAL) value = dvalue[ivar];

  else if (style[ivar] == PYTHON) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE