Unverified Commit b2a7205a authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

re-order ev_init() and ev_setup() so that 'init' comes before 'setup' as requested by @sjplimp

parent 985fc86a

src/angle.h

+1 −1
Original line number Diff line number Diff line
@@ -58,11 +58,11 @@ class Angle : protected Pointers { 
  int vflag_either,vflag_global,vflag_atom;

  int maxeatom,maxvatom;



  void ev_setup(int, int, int alloc = 1);

  void ev_init(int eflag, int vflag, int alloc = 1) {

    if (eflag||vflag) ev_setup(eflag, vflag, alloc);

    else evflag = eflag_either = eflag_global = eflag_atom = vflag_either = vflag_global = vflag_atom = 0;

  }

  void ev_setup(int, int, int alloc = 1);

  void ev_tally(int, int, int, int, int, double, double *, double *,

                double, double, double, double, double, double);

};

src/bond.h

+1 −1
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ class Bond : protected Pointers { 
  int vflag_either,vflag_global,vflag_atom;

  int maxeatom,maxvatom;



  void ev_setup(int, int, int alloc = 1);

  void ev_init(int eflag, int vflag, int alloc = 1) {

    if (eflag||vflag) ev_setup(eflag, vflag, alloc);

    else evflag = eflag_either = eflag_global = eflag_atom = vflag_either = vflag_global = vflag_atom = 0;

  }

  void ev_setup(int, int, int alloc = 1);

  void ev_tally(int, int, int, int, double, double, double, double, double);

};

src/dihedral.h

+1 −1
Original line number Diff line number Diff line
@@ -56,11 +56,11 @@ class Dihedral : protected Pointers { 
  int vflag_either,vflag_global,vflag_atom;

  int maxeatom,maxvatom;



  void ev_setup(int, int, int alloc = 1);

  void ev_init(int eflag, int vflag, int alloc = 1) {

    if (eflag||vflag) ev_setup(eflag, vflag, alloc);

    else evflag = eflag_either = eflag_global = eflag_atom = vflag_either = vflag_global = vflag_atom = 0;

  }

  void ev_setup(int, int, int alloc = 1);

  void ev_tally(int, int, int, int, int, int, double,

                double *, double *, double *, double, double, double,

                double, double, double, double, double, double);

src/fix.h

+1 −1
Original line number Diff line number Diff line
@@ -223,11 +223,11 @@ class Fix : protected Pointers { 


  int dynamic;    // recount atoms for temperature computes



  void ev_setup(int, int);

  void ev_init(int eflag, int vflag) {

    if (eflag||vflag) ev_setup(eflag, vflag);

    else evflag = eflag_either = eflag_global = eflag_atom = vflag_either = vflag_global = vflag_atom = 0;

  }

  void ev_setup(int, int);

  void ev_tally(int, int *, double, double, double *);

  void v_setup(int);

  void v_tally(int, int *, double, double *);

src/improper.h

+1 −1
Original line number Diff line number Diff line
@@ -56,11 +56,11 @@ class Improper : protected Pointers { 
  int vflag_either,vflag_global,vflag_atom;

  int maxeatom,maxvatom;



  void ev_setup(int, int, int alloc = 1);

  void ev_init(int eflag, int vflag, int alloc = 1) {

    if (eflag||vflag) ev_setup(eflag, vflag, alloc);

    else evflag = eflag_either = eflag_global = eflag_atom = vflag_either = vflag_global = vflag_atom = 0;

  }

  void ev_setup(int, int, int alloc = 1);

  void ev_tally(int, int, int, int, int, int, double,

                double *, double *, double *, double, double, double,

                double, double, double, double, double, double);

CRA Git | Maintained and supported by SUSTech CRA and CCSE