Commit d0d2797b authored by charlie sievers's avatar charlie sievers
Browse files

Fixed conflicts

parent aba472df

src/fix_langevin.cpp

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ FixLangevin::FixLangevin(LAMMPS *lmp, int narg, char **arg) : 
  ascale = 0.0;

  gjfflag = 0;

  fsflag = 0;

  nvalues = 0;

  oflag = 0;

  tallyflag = 0;

  zeroflag = 0;

src/fix_langevin.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class FixLangevin : public Fix { 
  int unpack_exchange(int, double *);



 protected:

  int gjfflag,fsflag,oflag,tallyflag,zeroflag,tbiasflag;

  int gjfflag,fsflag,nvalues,oflag,tallyflag,zeroflag,tbiasflag;

  int flangevin_allocated;

  double ascale;

  double t_start,t_stop,t_period,t_target;

CRA Git | Maintained and supported by SUSTech CRA and CCSE