jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2009-01-08 17:20:56 +00:00
parent 244861e905
commit b1ad1cf8a6
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GRANULAR/fix_pour.cpp
View File

@ -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];

6
src/GRANULAR/fix_pour.h
View File

@ -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 **);

3
src/GRANULAR/pair_gran_hertz_history.cpp
View File

@ -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;

2
src/GRANULAR/pair_gran_hooke.cpp
View File

@ -30,7 +30,7 @@ using namespace LAMMPS_NS;
/* ---------------------------------------------------------------------- */
PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHistory(lmp)
PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHookeHistory(lmp)
{
history = 0;
}

3
src/fix_ave_force.cpp
View File

@ -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;
}
/* ---------------------------------------------------------------------- */

2
src/fix_shear_history.h
View File

@ -20,7 +20,7 @@ namespace LAMMPS_NS {
class FixShearHistory : public Fix {
friend class Neighbor;
friend class PairGranHistory;
friend class PairGranHookeHistory;
friend class FixPour;
public: