Commit 49051197 authored by sjplimp's avatar sjplimp
Browse files 

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

src/MANYBODY/pair_comb.cpp

+2 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ void PairComb::coeff(int narg, char **arg) 
  // read potential file and initialize potential parameters



  read_file(arg[2]);

  setup();

  setup_params();



  n = atom->ntypes;
@@ -772,7 +772,7 @@ void PairComb::read_file(char *file) 


/* ---------------------------------------------------------------------- */



void PairComb::setup()

void PairComb::setup_params()

{

  int i,j,k,m,n;

src/MANYBODY/pair_comb.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ class PairComb : public Pair { 


  void allocate();

  virtual void read_file(char *);

  void setup();

  void setup_params();

  virtual void repulsive(Param *, double, double &, int,

                         double &, double, double);

  double zeta(Param *, double, double, double *, double *);

src/MANYBODY/pair_comb3.cpp

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ void PairComb3::coeff(int narg, char **arg) 
  // read potential file and initialize potential parameters



  read_file(arg[2]);

  setup();

  setup_params();



  n = atom->ntypes;
@@ -795,7 +795,7 @@ void PairComb3::read_file(char *file) 


/* ---------------------------------------------------------------------- */



void PairComb3::setup()

void PairComb3::setup_params()

{

  int i,j,k,m,n;

src/MANYBODY/pair_comb3.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ class PairComb3 : public Pair { 
  // initialization functions

  void allocate();

  void read_lib();

  void setup();

  void setup_params();

  virtual void read_file(char *);



  // cutoff functions

src/MANYBODY/pair_nb3b_harmonic.cpp

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ void PairNb3bHarmonic::coeff(int narg, char **arg) 
  // read potential file and initialize potential parameters



  read_file(arg[2]);

  setup();

  setup_params();



  // clear setflag since coeff() called once with I,J = * *
@@ -399,7 +399,7 @@ void PairNb3bHarmonic::read_file(char *file) 


/* ---------------------------------------------------------------------- */



void PairNb3bHarmonic::setup()

void PairNb3bHarmonic::setup_params()

{

  int i,j,k,m,n;

  double rtmp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE