Commit b1ad1cf8 authored by sjplimp's avatar sjplimp
Browse files 

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2349 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 244861e9

src/GRANULAR/fix_pour.cpp

+2 −1
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ void FixPour::init() 
  // check if a shear history fix exists



  fix_history = NULL;

  if (force->pair_match("gran/history") || force->pair_match("gran/hertzian"))

  if (force->pair_match("gran/hooke/history") || 

      force->pair_match("gran/hertz/history"))

    for (int i = 0; i < modify->nfix; i++)

      if (strcmp(modify->fix[i]->style,"SHEAR_HISTORY") == 0)

	fix_history = (FixShearHistory *) modify->fix[i];

src/GRANULAR/fix_pour.h

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
namespace LAMMPS_NS {



class FixPour : public Fix {

  friend class PairGranHistory;

  friend class PairGranHertzian;

  friend class PairGranNoHistory;

  friend class PairGranHertzHistory;

  friend class PairGranHooke;

  friend class PairGranHookeHistory;



 public:

  FixPour(class LAMMPS *, int, char **);

src/GRANULAR/pair_gran_hertz_history.cpp

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ using namespace LAMMPS_NS; 


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



PairGranHertzHistory::PairGranHertzHistory(LAMMPS *lmp) : PairGranHistory(lmp)

PairGranHertzHistory::PairGranHertzHistory(LAMMPS *lmp) :

  PairGranHookeHistory(lmp)

{

  no_virial_compute = 1;

  history = 1;

src/GRANULAR/pair_gran_hooke.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ using namespace LAMMPS_NS; 


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



PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHistory(lmp)

PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHookeHistory(lmp)

{

  history = 0;

}

src/fix_ave_force.cpp

+1 −2
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ FixAveForce::FixAveForce(LAMMPS *lmp, int narg, char **arg) : 
  if (strcmp(arg[5],"NULL") == 0) zflag = 0;

  else zvalue = atof(arg[5]);



  foriginal_all[0] = foriginal_all[1] = 

    foriginal_all[2] = foriginal_all[3] = 0.0;

  foriginal_all[0] = foriginal_all[1] = foriginal_all[2] = 0.0;

}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE